From 8904cee4121e76f5e4b363bdfd457fbd1165fa97 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Thu, 21 Sep 2023 07:05:10 -0700 Subject: [PATCH] JUTResFont (#1940) --- .../drawChar_scale__10JUTResFontFffffib.s | 271 ------------------ .../loadImage__10JUTResFontFi11_GXTexMapID.s | 96 ------- include/JSystem/JUtility/JUTResFont.h | 6 +- libs/JSystem/JUtility/JUTResFont.cpp | 199 +++++-------- 4 files changed, 81 insertions(+), 491 deletions(-) delete mode 100644 asm/JSystem/JUtility/JUTResFont/drawChar_scale__10JUTResFontFffffib.s delete mode 100644 asm/JSystem/JUtility/JUTResFont/loadImage__10JUTResFontFi11_GXTexMapID.s diff --git a/asm/JSystem/JUtility/JUTResFont/drawChar_scale__10JUTResFontFffffib.s b/asm/JSystem/JUtility/JUTResFont/drawChar_scale__10JUTResFontFffffib.s deleted file mode 100644 index 452595dd3ad..00000000000 --- a/asm/JSystem/JUtility/JUTResFont/drawChar_scale__10JUTResFontFffffib.s +++ /dev/null @@ -1,271 +0,0 @@ -lbl_802DF7C4: -/* 802DF7C4 94 21 FF 50 */ stwu r1, -0xb0(r1) -/* 802DF7C8 7C 08 02 A6 */ mflr r0 -/* 802DF7CC 90 01 00 B4 */ stw r0, 0xb4(r1) -/* 802DF7D0 DB E1 00 A0 */ stfd f31, 0xa0(r1) -/* 802DF7D4 F3 E1 00 A8 */ psq_st f31, 168(r1), 0, 0 /* qr0 */ -/* 802DF7D8 DB C1 00 90 */ stfd f30, 0x90(r1) -/* 802DF7DC F3 C1 00 98 */ psq_st f30, 152(r1), 0, 0 /* qr0 */ -/* 802DF7E0 DB A1 00 80 */ stfd f29, 0x80(r1) -/* 802DF7E4 F3 A1 00 88 */ psq_st f29, 136(r1), 0, 0 /* qr0 */ -/* 802DF7E8 DB 81 00 70 */ stfd f28, 0x70(r1) -/* 802DF7EC F3 81 00 78 */ psq_st f28, 120(r1), 0, 0 /* qr0 */ -/* 802DF7F0 DB 61 00 60 */ stfd f27, 0x60(r1) -/* 802DF7F4 F3 61 00 68 */ psq_st f27, 104(r1), 0, 0 /* qr0 */ -/* 802DF7F8 DB 41 00 50 */ stfd f26, 0x50(r1) -/* 802DF7FC F3 41 00 58 */ psq_st f26, 88(r1), 0, 0 /* qr0 */ -/* 802DF800 39 61 00 50 */ addi r11, r1, 0x50 -/* 802DF804 48 08 29 D1 */ bl _savegpr_27 -/* 802DF808 7C 7E 1B 78 */ mr r30, r3 -/* 802DF80C FF 40 08 90 */ fmr f26, f1 -/* 802DF810 FF 60 10 90 */ fmr f27, f2 -/* 802DF814 FF C0 18 90 */ fmr f30, f3 -/* 802DF818 FF 80 20 90 */ fmr f28, f4 -/* 802DF81C 7C BB 2B 78 */ mr r27, r5 -/* 802DF820 38 A0 00 00 */ li r5, 0 -/* 802DF824 38 C1 00 08 */ addi r6, r1, 8 -/* 802DF828 48 00 03 C1 */ bl loadFont__10JUTResFontFi11_GXTexMapIDPQ27JUTFont6TWidth -/* 802DF82C 88 1E 00 05 */ lbz r0, 5(r30) -/* 802DF830 28 00 00 00 */ cmplwi r0, 0 -/* 802DF834 40 82 00 0C */ bne lbl_802DF840 -/* 802DF838 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 802DF83C 40 82 00 0C */ bne lbl_802DF848 -lbl_802DF840: -/* 802DF840 FF E0 D0 90 */ fmr f31, f26 -/* 802DF844 48 00 00 58 */ b lbl_802DF89C -lbl_802DF848: -/* 802DF848 7F C3 F3 78 */ mr r3, r30 -/* 802DF84C 81 9E 00 00 */ lwz r12, 0(r30) -/* 802DF850 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 802DF854 7D 89 03 A6 */ mtctr r12 -/* 802DF858 4E 80 04 21 */ bctrl -/* 802DF85C C8 22 C5 F8 */ lfd f1, lit_649(r2) -/* 802DF860 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802DF864 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DF868 3C 60 43 30 */ lis r3, 0x4330 -/* 802DF86C 90 61 00 10 */ stw r3, 0x10(r1) -/* 802DF870 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802DF874 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802DF878 EC 5E 00 24 */ fdivs f2, f30, f0 -/* 802DF87C 88 01 00 08 */ lbz r0, 8(r1) -/* 802DF880 C8 22 C6 00 */ lfd f1, lit_651(r2) -/* 802DF884 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802DF888 90 61 00 18 */ stw r3, 0x18(r1) -/* 802DF88C C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802DF890 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802DF894 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 802DF898 EF FA 00 28 */ fsubs f31, f26, f0 -lbl_802DF89C: -/* 802DF89C 7F C3 F3 78 */ mr r3, r30 -/* 802DF8A0 81 9E 00 00 */ lwz r12, 0(r30) -/* 802DF8A4 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 802DF8A8 7D 89 03 A6 */ mtctr r12 -/* 802DF8AC 4E 80 04 21 */ bctrl -/* 802DF8B0 C8 42 C5 F8 */ lfd f2, lit_649(r2) -/* 802DF8B4 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802DF8B8 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802DF8BC 3C 60 43 30 */ lis r3, 0x4330 -/* 802DF8C0 90 61 00 18 */ stw r3, 0x18(r1) -/* 802DF8C4 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802DF8C8 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802DF8CC EC 3E 00 24 */ fdivs f1, f30, f0 -/* 802DF8D0 80 1E 00 08 */ lwz r0, 8(r30) -/* 802DF8D4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802DF8D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DF8DC 90 61 00 10 */ stw r3, 0x10(r1) -/* 802DF8E0 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802DF8E4 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802DF8E8 EF A0 00 72 */ fmuls f29, f0, f1 -/* 802DF8EC 88 1E 00 05 */ lbz r0, 5(r30) -/* 802DF8F0 28 00 00 00 */ cmplwi r0, 0 -/* 802DF8F4 40 82 00 B8 */ bne lbl_802DF9AC -/* 802DF8F8 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 802DF8FC 40 82 00 60 */ bne lbl_802DF95C -/* 802DF900 7F C3 F3 78 */ mr r3, r30 -/* 802DF904 81 9E 00 00 */ lwz r12, 0(r30) -/* 802DF908 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 802DF90C 7D 89 03 A6 */ mtctr r12 -/* 802DF910 4E 80 04 21 */ bctrl -/* 802DF914 C8 42 C5 F8 */ lfd f2, lit_649(r2) -/* 802DF918 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802DF91C 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802DF920 3C 80 43 30 */ lis r4, 0x4330 -/* 802DF924 90 81 00 18 */ stw r4, 0x18(r1) -/* 802DF928 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802DF92C EC 00 10 28 */ fsubs f0, f0, f2 -/* 802DF930 EC 3E 00 24 */ fdivs f1, f30, f0 -/* 802DF934 88 61 00 09 */ lbz r3, 9(r1) -/* 802DF938 88 01 00 08 */ lbz r0, 8(r1) -/* 802DF93C 7C 03 02 14 */ add r0, r3, r0 -/* 802DF940 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802DF944 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DF948 90 81 00 10 */ stw r4, 0x10(r1) -/* 802DF94C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802DF950 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802DF954 EF A0 00 72 */ fmuls f29, f0, f1 -/* 802DF958 48 00 00 54 */ b lbl_802DF9AC -lbl_802DF95C: -/* 802DF95C 7F C3 F3 78 */ mr r3, r30 -/* 802DF960 81 9E 00 00 */ lwz r12, 0(r30) -/* 802DF964 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 802DF968 7D 89 03 A6 */ mtctr r12 -/* 802DF96C 4E 80 04 21 */ bctrl -/* 802DF970 C8 22 C5 F8 */ lfd f1, lit_649(r2) -/* 802DF974 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802DF978 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802DF97C 3C 60 43 30 */ lis r3, 0x4330 -/* 802DF980 90 61 00 18 */ stw r3, 0x18(r1) -/* 802DF984 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802DF988 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802DF98C EC 5E 00 24 */ fdivs f2, f30, f0 -/* 802DF990 88 01 00 09 */ lbz r0, 9(r1) -/* 802DF994 C8 22 C6 00 */ lfd f1, lit_651(r2) -/* 802DF998 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DF99C 90 61 00 10 */ stw r3, 0x10(r1) -/* 802DF9A0 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802DF9A4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802DF9A8 EF A0 00 B2 */ fmuls f29, f0, f2 -lbl_802DF9AC: -/* 802DF9AC EF DF F0 2A */ fadds f30, f31, f30 -/* 802DF9B0 7F C3 F3 78 */ mr r3, r30 -/* 802DF9B4 81 9E 00 00 */ lwz r12, 0(r30) -/* 802DF9B8 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802DF9BC 7D 89 03 A6 */ mtctr r12 -/* 802DF9C0 4E 80 04 21 */ bctrl -/* 802DF9C4 C8 22 C5 F8 */ lfd f1, lit_649(r2) -/* 802DF9C8 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802DF9CC 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802DF9D0 3C 00 43 30 */ lis r0, 0x4330 -/* 802DF9D4 90 01 00 18 */ stw r0, 0x18(r1) -/* 802DF9D8 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802DF9DC EC 00 08 28 */ fsubs f0, f0, f1 -/* 802DF9E0 EF 5C 00 24 */ fdivs f26, f28, f0 -/* 802DF9E4 7F C3 F3 78 */ mr r3, r30 -/* 802DF9E8 81 9E 00 00 */ lwz r12, 0(r30) -/* 802DF9EC 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802DF9F0 7D 89 03 A6 */ mtctr r12 -/* 802DF9F4 4E 80 04 21 */ bctrl -/* 802DF9F8 C8 22 C5 F8 */ lfd f1, lit_649(r2) -/* 802DF9FC 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802DFA00 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DFA04 3C 00 43 30 */ lis r0, 0x4330 -/* 802DFA08 90 01 00 10 */ stw r0, 0x10(r1) -/* 802DFA0C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802DFA10 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802DFA14 EC 00 06 B2 */ fmuls f0, f0, f26 -/* 802DFA18 EF 5B 00 28 */ fsubs f26, f27, f0 -/* 802DFA1C 7F C3 F3 78 */ mr r3, r30 -/* 802DFA20 81 9E 00 00 */ lwz r12, 0(r30) -/* 802DFA24 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802DFA28 7D 89 03 A6 */ mtctr r12 -/* 802DFA2C 4E 80 04 21 */ bctrl -/* 802DFA30 C8 22 C5 F8 */ lfd f1, lit_649(r2) -/* 802DFA34 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802DFA38 90 01 00 24 */ stw r0, 0x24(r1) -/* 802DFA3C 3C 00 43 30 */ lis r0, 0x4330 -/* 802DFA40 90 01 00 20 */ stw r0, 0x20(r1) -/* 802DFA44 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 802DFA48 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802DFA4C EF 9C 00 24 */ fdivs f28, f28, f0 -/* 802DFA50 7F C3 F3 78 */ mr r3, r30 -/* 802DFA54 81 9E 00 00 */ lwz r12, 0(r30) -/* 802DFA58 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 802DFA5C 7D 89 03 A6 */ mtctr r12 -/* 802DFA60 4E 80 04 21 */ bctrl -/* 802DFA64 C8 22 C5 F8 */ lfd f1, lit_649(r2) -/* 802DFA68 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802DFA6C 90 01 00 2C */ stw r0, 0x2c(r1) -/* 802DFA70 3C 00 43 30 */ lis r0, 0x4330 -/* 802DFA74 90 01 00 28 */ stw r0, 0x28(r1) -/* 802DFA78 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 802DFA7C EC 00 08 28 */ fsubs f0, f0, f1 -/* 802DFA80 EC 00 07 32 */ fmuls f0, f0, f28 -/* 802DFA84 EF 7B 00 2A */ fadds f27, f27, f0 -/* 802DFA88 80 BE 00 1C */ lwz r5, 0x1c(r30) -/* 802DFA8C 54 A4 78 20 */ slwi r4, r5, 0xf -/* 802DFA90 80 7E 00 58 */ lwz r3, 0x58(r30) -/* 802DFA94 A0 1E 00 66 */ lhz r0, 0x66(r30) -/* 802DFA98 54 00 10 3A */ slwi r0, r0, 2 -/* 802DFA9C 7C 63 00 2E */ lwzx r3, r3, r0 -/* 802DFAA0 A0 C3 00 1A */ lhz r6, 0x1a(r3) -/* 802DFAA4 7F E4 33 D6 */ divw r31, r4, r6 -/* 802DFAA8 80 9E 00 20 */ lwz r4, 0x20(r30) -/* 802DFAAC 54 80 78 20 */ slwi r0, r4, 0xf -/* 802DFAB0 A0 E3 00 1C */ lhz r7, 0x1c(r3) -/* 802DFAB4 7F A0 3B D6 */ divw r29, r0, r7 -/* 802DFAB8 A0 03 00 0C */ lhz r0, 0xc(r3) -/* 802DFABC 7C 05 02 14 */ add r0, r5, r0 -/* 802DFAC0 54 00 78 20 */ slwi r0, r0, 0xf -/* 802DFAC4 7F 80 33 D6 */ divw r28, r0, r6 -/* 802DFAC8 A0 03 00 0E */ lhz r0, 0xe(r3) -/* 802DFACC 7C 04 02 14 */ add r0, r4, r0 -/* 802DFAD0 54 00 78 20 */ slwi r0, r0, 0xf -/* 802DFAD4 7F 60 3B D6 */ divw r27, r0, r7 -/* 802DFAD8 38 60 00 00 */ li r3, 0 -/* 802DFADC 38 80 00 09 */ li r4, 9 -/* 802DFAE0 38 A0 00 01 */ li r5, 1 -/* 802DFAE4 38 C0 00 04 */ li r6, 4 -/* 802DFAE8 38 E0 00 00 */ li r7, 0 -/* 802DFAEC 48 07 BA D9 */ bl GXSetVtxAttrFmt -/* 802DFAF0 38 60 00 80 */ li r3, 0x80 -/* 802DFAF4 38 80 00 00 */ li r4, 0 -/* 802DFAF8 38 A0 00 04 */ li r5, 4 -/* 802DFAFC 48 07 CC 69 */ bl GXBegin -/* 802DFB00 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */ -/* 802DFB04 D3 E3 80 00 */ stfs f31, 0x8000(r3) /* 0xCC008000@l */ -/* 802DFB08 D3 43 80 00 */ stfs f26, -0x8000(r3) -/* 802DFB0C C0 02 C5 F0 */ lfs f0, lit_647(r2) -/* 802DFB10 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802DFB14 80 1E 00 0C */ lwz r0, 0xc(r30) -/* 802DFB18 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802DFB1C B3 E3 80 00 */ sth r31, -0x8000(r3) -/* 802DFB20 B3 A3 80 00 */ sth r29, -0x8000(r3) -/* 802DFB24 D3 C3 80 00 */ stfs f30, -0x8000(r3) -/* 802DFB28 D3 43 80 00 */ stfs f26, -0x8000(r3) -/* 802DFB2C C0 02 C5 F0 */ lfs f0, lit_647(r2) -/* 802DFB30 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802DFB34 80 1E 00 10 */ lwz r0, 0x10(r30) -/* 802DFB38 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802DFB3C B3 83 80 00 */ sth r28, -0x8000(r3) -/* 802DFB40 B3 A3 80 00 */ sth r29, -0x8000(r3) -/* 802DFB44 D3 C3 80 00 */ stfs f30, -0x8000(r3) -/* 802DFB48 D3 63 80 00 */ stfs f27, -0x8000(r3) -/* 802DFB4C C0 02 C5 F0 */ lfs f0, lit_647(r2) -/* 802DFB50 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802DFB54 80 1E 00 18 */ lwz r0, 0x18(r30) -/* 802DFB58 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802DFB5C B3 83 80 00 */ sth r28, -0x8000(r3) -/* 802DFB60 B3 63 80 00 */ sth r27, -0x8000(r3) -/* 802DFB64 D3 E3 80 00 */ stfs f31, -0x8000(r3) -/* 802DFB68 D3 63 80 00 */ stfs f27, -0x8000(r3) -/* 802DFB6C C0 02 C5 F0 */ lfs f0, lit_647(r2) -/* 802DFB70 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802DFB74 80 1E 00 14 */ lwz r0, 0x14(r30) -/* 802DFB78 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802DFB7C B3 E3 80 00 */ sth r31, -0x8000(r3) -/* 802DFB80 B3 63 80 00 */ sth r27, -0x8000(r3) -/* 802DFB84 38 60 00 00 */ li r3, 0 -/* 802DFB88 38 80 00 09 */ li r4, 9 -/* 802DFB8C 38 A0 00 01 */ li r5, 1 -/* 802DFB90 38 C0 00 03 */ li r6, 3 -/* 802DFB94 38 E0 00 00 */ li r7, 0 -/* 802DFB98 48 07 BA 2D */ bl GXSetVtxAttrFmt -/* 802DFB9C FC 20 E8 90 */ fmr f1, f29 -/* 802DFBA0 E3 E1 00 A8 */ psq_l f31, 168(r1), 0, 0 /* qr0 */ -/* 802DFBA4 CB E1 00 A0 */ lfd f31, 0xa0(r1) -/* 802DFBA8 E3 C1 00 98 */ psq_l f30, 152(r1), 0, 0 /* qr0 */ -/* 802DFBAC CB C1 00 90 */ lfd f30, 0x90(r1) -/* 802DFBB0 E3 A1 00 88 */ psq_l f29, 136(r1), 0, 0 /* qr0 */ -/* 802DFBB4 CB A1 00 80 */ lfd f29, 0x80(r1) -/* 802DFBB8 E3 81 00 78 */ psq_l f28, 120(r1), 0, 0 /* qr0 */ -/* 802DFBBC CB 81 00 70 */ lfd f28, 0x70(r1) -/* 802DFBC0 E3 61 00 68 */ psq_l f27, 104(r1), 0, 0 /* qr0 */ -/* 802DFBC4 CB 61 00 60 */ lfd f27, 0x60(r1) -/* 802DFBC8 E3 41 00 58 */ psq_l f26, 88(r1), 0, 0 /* qr0 */ -/* 802DFBCC CB 41 00 50 */ lfd f26, 0x50(r1) -/* 802DFBD0 39 61 00 50 */ addi r11, r1, 0x50 -/* 802DFBD4 48 08 26 4D */ bl _restgpr_27 -/* 802DFBD8 80 01 00 B4 */ lwz r0, 0xb4(r1) -/* 802DFBDC 7C 08 03 A6 */ mtlr r0 -/* 802DFBE0 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802DFBE4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTResFont/loadImage__10JUTResFontFi11_GXTexMapID.s b/asm/JSystem/JUtility/JUTResFont/loadImage__10JUTResFontFi11_GXTexMapID.s deleted file mode 100644 index dcbadeb9387..00000000000 --- a/asm/JSystem/JUtility/JUTResFont/loadImage__10JUTResFontFi11_GXTexMapID.s +++ /dev/null @@ -1,96 +0,0 @@ -lbl_802DFF60: -/* 802DFF60 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802DFF64 7C 08 02 A6 */ mflr r0 -/* 802DFF68 90 01 00 24 */ stw r0, 0x24(r1) -/* 802DFF6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DFF70 48 08 22 69 */ bl _savegpr_28 -/* 802DFF74 7C 7C 1B 78 */ mr r28, r3 -/* 802DFF78 7C BD 2B 78 */ mr r29, r5 -/* 802DFF7C 3B E0 00 00 */ li r31, 0 -/* 802DFF80 38 60 00 00 */ li r3, 0 -/* 802DFF84 A0 FC 00 62 */ lhz r7, 0x62(r28) -/* 802DFF88 7C E9 03 A6 */ mtctr r7 -/* 802DFF8C 2C 07 00 00 */ cmpwi r7, 0 -/* 802DFF90 40 81 00 38 */ ble lbl_802DFFC8 -lbl_802DFF94: -/* 802DFF94 80 BC 00 58 */ lwz r5, 0x58(r28) -/* 802DFF98 7C A5 18 2E */ lwzx r5, r5, r3 -/* 802DFF9C A0 C5 00 08 */ lhz r6, 8(r5) -/* 802DFFA0 7C 06 20 00 */ cmpw r6, r4 -/* 802DFFA4 41 81 00 18 */ bgt lbl_802DFFBC -/* 802DFFA8 A0 05 00 0A */ lhz r0, 0xa(r5) -/* 802DFFAC 7C 04 00 00 */ cmpw r4, r0 -/* 802DFFB0 41 81 00 0C */ bgt lbl_802DFFBC -/* 802DFFB4 7C 86 20 50 */ subf r4, r6, r4 -/* 802DFFB8 48 00 00 10 */ b lbl_802DFFC8 -lbl_802DFFBC: -/* 802DFFBC 3B FF 00 01 */ addi r31, r31, 1 -/* 802DFFC0 38 63 00 04 */ addi r3, r3, 4 -/* 802DFFC4 42 00 FF D0 */ bdnz lbl_802DFF94 -lbl_802DFFC8: -/* 802DFFC8 7C 1F 38 00 */ cmpw r31, r7 -/* 802DFFCC 41 82 00 E0 */ beq lbl_802E00AC -/* 802DFFD0 80 7C 00 58 */ lwz r3, 0x58(r28) -/* 802DFFD4 57 E6 10 3A */ slwi r6, r31, 2 -/* 802DFFD8 7C A3 30 2E */ lwzx r5, r3, r6 -/* 802DFFDC A0 65 00 16 */ lhz r3, 0x16(r5) -/* 802DFFE0 A0 05 00 18 */ lhz r0, 0x18(r5) -/* 802DFFE4 7C 03 01 D6 */ mullw r0, r3, r0 -/* 802DFFE8 7F C4 03 D6 */ divw r30, r4, r0 -/* 802DFFEC 7C 1E 01 D6 */ mullw r0, r30, r0 -/* 802DFFF0 7C 80 20 50 */ subf r4, r0, r4 -/* 802DFFF4 7C E4 1B D6 */ divw r7, r4, r3 -/* 802DFFF8 7C 07 19 D6 */ mullw r0, r7, r3 -/* 802DFFFC 7C 60 20 50 */ subf r3, r0, r4 -/* 802E0000 A0 05 00 0C */ lhz r0, 0xc(r5) -/* 802E0004 7C 03 01 D6 */ mullw r0, r3, r0 -/* 802E0008 90 1C 00 1C */ stw r0, 0x1c(r28) -/* 802E000C 80 7C 00 58 */ lwz r3, 0x58(r28) -/* 802E0010 7C 63 30 2E */ lwzx r3, r3, r6 -/* 802E0014 A0 03 00 0E */ lhz r0, 0xe(r3) -/* 802E0018 7C 07 01 D6 */ mullw r0, r7, r0 -/* 802E001C 90 1C 00 20 */ stw r0, 0x20(r28) -/* 802E0020 80 1C 00 44 */ lwz r0, 0x44(r28) -/* 802E0024 7C 1E 00 00 */ cmpw r30, r0 -/* 802E0028 40 82 00 10 */ bne lbl_802E0038 -/* 802E002C A0 1C 00 66 */ lhz r0, 0x66(r28) -/* 802E0030 7C 1F 00 00 */ cmpw r31, r0 -/* 802E0034 41 82 00 6C */ beq lbl_802E00A0 -lbl_802E0038: -/* 802E0038 80 7C 00 58 */ lwz r3, 0x58(r28) -/* 802E003C 7C E3 30 2E */ lwzx r7, r3, r6 -/* 802E0040 38 7C 00 24 */ addi r3, r28, 0x24 -/* 802E0044 80 07 00 10 */ lwz r0, 0x10(r7) -/* 802E0048 7C 9E 01 D6 */ mullw r4, r30, r0 -/* 802E004C 38 84 00 20 */ addi r4, r4, 0x20 -/* 802E0050 7C 87 22 14 */ add r4, r7, r4 -/* 802E0054 A0 A7 00 1A */ lhz r5, 0x1a(r7) -/* 802E0058 A0 C7 00 1C */ lhz r6, 0x1c(r7) -/* 802E005C A0 E7 00 14 */ lhz r7, 0x14(r7) -/* 802E0060 39 00 00 00 */ li r8, 0 -/* 802E0064 39 20 00 00 */ li r9, 0 -/* 802E0068 39 40 00 00 */ li r10, 0 -/* 802E006C 48 07 DD D5 */ bl GXInitTexObj -/* 802E0070 38 7C 00 24 */ addi r3, r28, 0x24 -/* 802E0074 38 80 00 01 */ li r4, 1 -/* 802E0078 38 A0 00 01 */ li r5, 1 -/* 802E007C C0 22 C5 F0 */ lfs f1, lit_647(r2) -/* 802E0080 FC 40 08 90 */ fmr f2, f1 -/* 802E0084 FC 60 08 90 */ fmr f3, f1 -/* 802E0088 38 C0 00 00 */ li r6, 0 -/* 802E008C 38 E0 00 00 */ li r7, 0 -/* 802E0090 39 00 00 00 */ li r8, 0 -/* 802E0094 48 07 E0 41 */ bl GXInitTexObjLOD -/* 802E0098 93 DC 00 44 */ stw r30, 0x44(r28) -/* 802E009C B3 FC 00 66 */ sth r31, 0x66(r28) -lbl_802E00A0: -/* 802E00A0 38 7C 00 24 */ addi r3, r28, 0x24 -/* 802E00A4 7F A4 EB 78 */ mr r4, r29 -/* 802E00A8 48 07 E3 6D */ bl GXLoadTexObj -lbl_802E00AC: -/* 802E00AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E00B0 48 08 21 75 */ bl _restgpr_28 -/* 802E00B4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802E00B8 7C 08 03 A6 */ mtlr r0 -/* 802E00BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E00C0 4E 80 00 20 */ blr diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h index 4e5a0579435..097a4fa3d3b 100644 --- a/include/JSystem/JUtility/JUTResFont.h +++ b/include/JSystem/JUtility/JUTResFont.h @@ -55,8 +55,8 @@ public: // some types uncertain, may need to be fixed /* 0x1C */ int mWidth; /* 0x20 */ int mHeight; - /* 0x24 */ _GXTexObj field_0x24; - /* 0x44 */ int field_0x44; + /* 0x24 */ GXTexObj mTexObj; + /* 0x44 */ int mTexPageIdx; /* 0x48 */ const ResFONT* mResFont; /* 0x4C */ ResFONT::INF1* mInf1Ptr; /* 0x50 */ void** mMemBlocks; @@ -68,7 +68,7 @@ public: /* 0x64 */ u16 mMap1BlockNum; /* 0x66 */ u16 field_0x66; /* 0x68 */ u16 mMaxCode; - /* 0x6C */ IsLeadByte_func* mIsLeadByte; + /* 0x6C */ const IsLeadByte_func* mIsLeadByte; }; #endif /* JUTRESFONT_H */ diff --git a/libs/JSystem/JUtility/JUTResFont.cpp b/libs/JSystem/JUtility/JUTResFont.cpp index 9a3f5f85168..5f64ab5513e 100644 --- a/libs/JSystem/JUtility/JUTResFont.cpp +++ b/libs/JSystem/JUtility/JUTResFont.cpp @@ -5,10 +5,14 @@ #include "JSystem/JUtility/JUTResFont.h" #include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JSupport/JSupport.h" +#include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" #include "dol2asm.h" #include "dolphin/gx/GX.h" +#define suAboutEncoding_ 3 + // // Forward References: // @@ -103,10 +107,10 @@ JUTResFont::JUTResFont() { } /* 802DEF94-802DF000 2D98D4 006C+00 0/0 10/10 0/0 .text __ct__10JUTResFontFPC7ResFONTP7JKRHeap */ -JUTResFont::JUTResFont(ResFONT const* param_0, JKRHeap* param_1) { +JUTResFont::JUTResFont(const ResFONT* pFont, JKRHeap* pHeap) { initialize_state(); JUTFont::initialize_state(); - initiate(param_0, param_1); + initiate(pFont, pHeap); } /* 802DF000-802DF08C 2D9940 008C+00 1/0 2/2 0/0 .text __dt__10JUTResFontFv */ @@ -130,40 +134,39 @@ void JUTResFont::initialize_state() { mpWidthBlocks = NULL; mpGlyphBlocks = NULL; mpMapBlocks = NULL; - mWidth = NULL; - mHeight = NULL; - field_0x44 = -1; + mWidth = 0; + mHeight = 0; + mTexPageIdx = -1; } /* 802DF0DC-802DF13C 2D9A1C 0060+00 1/1 0/0 0/0 .text initiate__10JUTResFontFPC7ResFONTP7JKRHeap */ -bool JUTResFont::initiate(ResFONT const* param_0, JKRHeap* param_1) { - if (!protected_initiate(param_0, param_1)) { +bool JUTResFont::initiate(const ResFONT* pFont, JKRHeap* pHeap) { + if (!protected_initiate(pFont, pHeap)) { deleteMemBlocks_ResFont(); initialize_state(); JUTFont::initialize_state(); mValid = false; return false; - } else { - return true; } + return true; } /* 802DF13C-802DF248 2D9A7C 010C+00 1/1 0/0 0/0 .text * protected_initiate__10JUTResFontFPC7ResFONTP7JKRHeap */ -bool JUTResFont::protected_initiate(ResFONT const* param_0, JKRHeap* param_1) { +bool JUTResFont::protected_initiate(const ResFONT* pFont, JKRHeap* pHeap) { void** p; delete_and_initialize(); JUTFont::initialize_state(); - if (!param_0) { + if (!pFont) { return false; } - mResFont = param_0; + mResFont = pFont; mValid = true; countBlock(); - mMemBlocks = new (param_1, 0) void*[mWid1BlockNum + mGly1BlockNum + mMap1BlockNum]; + mMemBlocks = new (pHeap, 0) void*[mWid1BlockNum + mGly1BlockNum + mMap1BlockNum]; p = mMemBlocks; if (!mMemBlocks) { @@ -232,14 +235,16 @@ void JUTResFont::setBlock() { widthNum = 0; glyphNum = 0; mapNum = 0; - mMaxCode = -1; + mMaxCode = -1; BlockHeader* data = (BlockHeader*)mResFont->data; for (u32 i = 0; i < mResFont->numBlocks; i++, data = (BlockHeader*)data->getNext()) { switch (data->magic) { case 'INF1': mInf1Ptr = (ResFONT::INF1*)data; - mIsLeadByte = (IsLeadByte_func*)&saoAboutEncoding_[mInf1Ptr->fontType]; + u32 u = mInf1Ptr->fontType; + JUT_ASSERT(244, u < suAboutEncoding_); + mIsLeadByte = &saoAboutEncoding_[u]; break; case 'WID1': @@ -288,8 +293,8 @@ void JUTResFont::setGX() { /* 802DF584-802DF7C4 2D9EC4 0240+00 1/0 1/0 0/0 .text * setGX__10JUTResFontFQ28JUtility6TColorQ28JUtility6TColor */ -void JUTResFont::setGX(JUtility::TColor param_0, JUtility::TColor param_1) { - if (param_0 == 0 && param_1 == -1) { +void JUTResFont::setGX(JUtility::TColor col1, JUtility::TColor col2) { + if (col1 == 0 && col2 == -1) { setGX(); } else { GXSetNumChans(1); @@ -298,8 +303,8 @@ void JUTResFont::setGX(JUtility::TColor param_0, JUtility::TColor param_1) { GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL); GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT_NULL, GX_DF_NONE, GX_AF_NONE); - GXSetTevColor(GX_TEVREG0, param_0); - GXSetTevColor(GX_TEVREG1, param_1); + GXSetTevColor(GX_TEVREG0, col1); + GXSetTevColor(GX_TEVREG1, col2); GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_C0, GX_CC_C1, GX_CC_TEXC, GX_CC_ZERO); GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_A0, GX_CA_A1, GX_CA_TEXA, GX_CA_ZERO); GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); @@ -320,37 +325,23 @@ void JUTResFont::setGX(JUtility::TColor param_0, JUtility::TColor param_1) { } } -/* ############################################################################################## */ -/* 80455FF0-80455FF8 0045F0 0004+04 2/2 0/0 0/0 .sdata2 @647 */ -SECTION_SDATA2 static f32 lit_647[1 + 1 /* padding */] = { - 0.0f, - /* padding */ - 0.0f, -}; - -/* 80455FF8-80456000 0045F8 0008+00 1/1 0/0 0/0 .sdata2 @649 */ -SECTION_SDATA2 static f64 lit_649 = 4503601774854144.0 /* cast s32 to float */; - -/* 80456000-80456008 004600 0008+00 1/1 0/0 0/0 .sdata2 @651 */ -SECTION_SDATA2 static f64 lit_651 = 4503599627370496.0 /* cast u32 to float */; - /* 802DF7C4-802DFBE8 2DA104 0424+00 1/0 1/0 0/0 .text drawChar_scale__10JUTResFontFffffib */ -#ifdef NONMATCHING -// still missing a bunch of stuff f32 JUTResFont::drawChar_scale(f32 pos_x, f32 pos_y, f32 scale_x, f32 scale_y, int str_int, bool flag) { - JUTFont::TWidth width; - f32 width_val; - f32 pos_height, ascent, ascent_val, scaled_height; - f32 sca_wid; + f32 x1; + f32 y1; + f32 scaled_height; + f32 x2; + JUT_ASSERT(378, mValid); + JUTFont::TWidth width; loadFont(str_int, GX_TEXMAP0, &width); if ((mFixed) || (!flag)) { - width_val = pos_x; + x1 = pos_x; } else { - width_val = (pos_x - width.field_0x0 * (scale_x / getCellWidth())); + x1 = (pos_x - width.field_0x0 * (scale_x / getCellWidth())); } f32 retval = mFixedWidth * (scale_x / getCellWidth()); if (mFixed == false) { @@ -360,83 +351,66 @@ f32 JUTResFont::drawChar_scale(f32 pos_x, f32 pos_y, f32 scale_x, f32 scale_y, i retval = width.field_0x1 * (scale_x / getCellWidth()); } } - sca_wid = width_val + scale_x; - ascent_val = pos_y - getAscent() * (scale_y / getHeight()); + x2 = x1 + scale_x; + y1 = pos_y - getAscent() * (scale_y / getHeight()); scaled_height = scale_y / getHeight(); f32 descent = getDescent(); - f32 ascent_calc = descent * ascent_val; - f32 deshei = descent * scaled_height + pos_y; + f32 y2 = descent * scaled_height + pos_y; - ResFONT::GLY1* used_glyphs = mpGlyphBlocks[field_0x66]; - u16 tex_width = used_glyphs->textureWidth; - u16 tex_height = used_glyphs->textureHeight; - int t_width = mWidth; - int t_height = mHeight; - int shift_width = (t_width + used_glyphs->cellHeight) << 15; - int div_width = (t_width << 15) / tex_width; - int div_height = (t_height << 15) / tex_height; - u16 sumWidth = t_width + used_glyphs->cellWidth; - int shift_height = t_height + used_glyphs->cellHeight << 15; - u16 sumHeight = t_height + used_glyphs->cellHeight; - s32 width_ratio = shift_width / tex_width; - s32 height_ratio = shift_height / tex_height; + s32 u1 = (mWidth * 0x8000) / mpGlyphBlocks[field_0x66]->textureWidth; + s32 v1 = (mHeight * 0x8000) / mpGlyphBlocks[field_0x66]->textureHeight; + s32 u2 = ((mWidth + mpGlyphBlocks[field_0x66]->cellWidth) * 0x8000) / mpGlyphBlocks[field_0x66]->textureWidth; + s32 v2 = ((mHeight + mpGlyphBlocks[field_0x66]->cellHeight) * 0x8000) / mpGlyphBlocks[field_0x66]->textureHeight; GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); GXBegin(GX_QUADS, GX_VTXFMT0, 4); - GXPosition3f32(width_val, ascent_val, 0.0f); + // Bottom Left + GXPosition3f32(x1, y1, 0.0f); GXColor1u32(mColor1); - i_GXTexCoord2u16(div_width, div_height); + i_GXTexCoord2u16(u1, v1); - GXPosition3f32(sca_wid, ascent_val, 0.0f); + // Bottom Right + GXPosition3f32(x2, y1, 0.0f); GXColor1u32(mColor2); - i_GXTexCoord2u16(width_ratio, div_height); + i_GXTexCoord2u16(u2, v1); - GXPosition3f32(sca_wid, deshei, 0.0f); + // Top Right + GXPosition3f32(x2, y2, 0.0f); GXColor1u32(mColor4); - i_GXTexCoord2u16(width_ratio, height_ratio); + i_GXTexCoord2u16(u2, v2); - GXPosition3f32(width_val, deshei, 0.0f); + // Top Left + GXPosition3f32(x1, y2, 0.0f); GXColor1u32(mColor3); - i_GXTexCoord2u16(div_width, height_ratio); + i_GXTexCoord2u16(u1, v2); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0); return retval; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 JUTResFont::drawChar_scale(f32 param_0, f32 param_1, f32 param_2, f32 param_3, int param_4, - bool param_5) { - nofralloc -#include "asm/JSystem/JUtility/JUTResFont/drawChar_scale__10JUTResFontFffffib.s" -} -#pragma pop -#endif /* 802DFBE8-802DFC64 2DA528 007C+00 1/1 0/0 0/0 .text * loadFont__10JUTResFontFi11_GXTexMapIDPQ27JUTFont6TWidth */ -void JUTResFont::loadFont(int param_0, _GXTexMapID param_1, JUTFont::TWidth* param_2) { - if (param_2 != 0) { - getWidthEntry(param_0, param_2); +void JUTResFont::loadFont(int code, GXTexMapID texMapID, JUTFont::TWidth* pDstWidth) { + if (pDstWidth != 0) { + getWidthEntry(code, pDstWidth); } - int code = getFontCode(param_0); - loadImage(code, param_1); + int fontCode = getFontCode(code); + loadImage(fontCode, texMapID); } /* 802DFC64-802DFD0C 2DA5A4 00A8+00 1/0 1/0 0/0 .text * getWidthEntry__10JUTResFontCFiPQ27JUTFont6TWidth */ -void JUTResFont::getWidthEntry(int param_0, JUTFont::TWidth* i_width) const { - int code = getFontCode(param_0); +void JUTResFont::getWidthEntry(int code, JUTFont::TWidth* i_width) const { + int fontCode = getFontCode(code); i_width->field_0x0 = 0; i_width->field_0x1 = mInf1Ptr->width; for (int i = 0; i < mWid1BlockNum; i++) { - if (mpWidthBlocks[i]->startCode <= code && code <= mpWidthBlocks[i]->endCode) { - u8* ptr = &mpWidthBlocks[i]->mChunkNum[(code - mpWidthBlocks[i]->startCode) * 2]; + if (mpWidthBlocks[i]->startCode <= fontCode && fontCode <= mpWidthBlocks[i]->endCode) { + u8* ptr = &mpWidthBlocks[i]->mChunkNum[(fontCode - mpWidthBlocks[i]->startCode) * 2]; i_width->field_0x0 = ptr[0]; i_width->field_0x1 = ptr[1]; break; @@ -445,10 +419,7 @@ void JUTResFont::getWidthEntry(int param_0, JUTFont::TWidth* i_width) const { } /* 802DFD0C-802DFD58 2DA64C 004C+00 1/0 1/0 0/0 .text getCellWidth__10JUTResFontCFv */ -// regalloc int JUTResFont::getCellWidth() const { - u16 width; - if (mpGlyphBlocks) { ResFONT::GLY1* glyphBlock = *mpGlyphBlocks; if (glyphBlock) { @@ -461,8 +432,6 @@ int JUTResFont::getCellWidth() const { /* 802DFD58-802DFDA4 2DA698 004C+00 1/0 1/0 0/0 .text getCellHeight__10JUTResFontCFv */ s32 JUTResFont::getCellHeight() const { - u16 height; - if (mpGlyphBlocks) { ResFONT::GLY1* glyphBlock = *mpGlyphBlocks; if (glyphBlock) { @@ -474,8 +443,8 @@ s32 JUTResFont::getCellHeight() const { } /* 802DFDA4-802DFDD8 2DA6E4 0034+00 1/0 1/0 0/0 .text isLeadByte__10JUTResFontCFi */ -bool JUTResFont::isLeadByte(int param_0) const { - return (*mIsLeadByte)(param_0); +bool JUTResFont::isLeadByte(int chr) const { + return (*mIsLeadByte)(chr); } /* ############################################################################################## */ @@ -494,18 +463,18 @@ static const u16 halftofull[95] = { /* 802DFDD8-802DFF60 2DA718 0188+00 2/2 0/0 0/0 .text getFontCode__10JUTResFontCFi */ #ifdef NONMATCHING // regalloc -int JUTResFont::getFontCode(int param_0) const { +int JUTResFont::getFontCode(int chr) const { int ret = mInf1Ptr->defaultCode; - if ((getFontType() == 2) && (mMaxCode >= 0x8000U) && (param_0 >= 0x20) && (param_0 < 0x7FU)) { - param_0 = halftofull[param_0 - 32]; + if ((getFontType() == 2) && (mMaxCode >= 0x8000U) && (chr >= 0x20) && (chr < 0x7FU)) { + chr = halftofull[chr - 32]; } for (int i = 0; i < mMap1BlockNum; i++) { - if ((mpMapBlocks[i]->startCode <= param_0) && (param_0 <= mpMapBlocks[i]->endCode)) { + if ((mpMapBlocks[i]->startCode <= chr) && (chr <= mpMapBlocks[i]->endCode)) { if (mpMapBlocks[i]->mappingMethod == 0) { - ret = param_0 - mpMapBlocks[i]->endCode; + ret = chr - mpMapBlocks[i]->endCode; break; } else if (mpMapBlocks[i]->mappingMethod == 2) { - ret = *(&mpMapBlocks[i]->mLeading + ((param_0 - mpMapBlocks[i]->endCode))); + ret = *(&mpMapBlocks[i]->mLeading + (chr - mpMapBlocks[i]->endCode)); break; } else if (mpMapBlocks[i]->mappingMethod == 3) { u16* leading_temp = &mpMapBlocks[i]->mLeading; @@ -515,12 +484,12 @@ int JUTResFont::getFontCode(int param_0) const { while (phi_r6_2 >= phi_r5) { int temp_r7 = (phi_r6_2 + phi_r5) / 2; - if (param_0 < leading_temp[temp_r7 * 2]) { + if (chr < leading_temp[temp_r7 * 2]) { phi_r6_2 = temp_r7 - 1; continue; } - if (param_0 > leading_temp[temp_r7 * 2]) { + if (chr > leading_temp[temp_r7 * 2]) { phi_r5 = temp_r7 + 1; continue; } @@ -533,7 +502,7 @@ int JUTResFont::getFontCode(int param_0) const { if (mpMapBlocks[i]->numEntries == 1) { phi_r5_2 = &mpMapBlocks[i]->mLeading; } - ret = convertSjis(param_0, phi_r5_2); + ret = convertSjis(chr, phi_r5_2); break; } break; @@ -553,8 +522,6 @@ asm int JUTResFont::getFontCode(int param_0) const { #endif /* 802DFF60-802E00C4 2DA8A0 0164+00 1/0 0/0 0/0 .text loadImage__10JUTResFontFi11_GXTexMapID */ -// Matches with literals -#ifdef NONMATCHING void JUTResFont::loadImage(int code, GXTexMapID id){ int i = 0; for (; i < mGly1BlockNum; i++) @@ -577,33 +544,23 @@ void JUTResFont::loadImage(int code, GXTexMapID id){ mWidth = cellCol * mpGlyphBlocks[i]->cellWidth; mHeight = cellRow * mpGlyphBlocks[i]->cellHeight; - if (pageIdx != field_0x44 || i != field_0x66) + if (pageIdx != mTexPageIdx || i != field_0x66) { - GXInitTexObj(&field_0x24, &mpGlyphBlocks[i]->data[pageIdx * mpGlyphBlocks[i]->textureSize], mpGlyphBlocks[i]->textureWidth, + GXInitTexObj(&mTexObj, &mpGlyphBlocks[i]->data[pageIdx * mpGlyphBlocks[i]->textureSize], mpGlyphBlocks[i]->textureWidth, mpGlyphBlocks[i]->textureHeight, (GXTexFmt)mpGlyphBlocks[i]->textureFormat, GX_CLAMP, GX_CLAMP, 0); - GXInitTexObjLOD(&field_0x24, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, 0U, 0U, GX_ANISO_1); - field_0x44 = pageIdx; + GXInitTexObjLOD(&mTexObj, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, 0U, 0U, GX_ANISO_1); + mTexPageIdx = pageIdx; field_0x66 = i; } - GXLoadTexObj(&field_0x24, id); + GXLoadTexObj(&mTexObj, id); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTResFont::loadImage(int param_0, _GXTexMapID param_1) { - nofralloc -#include "asm/JSystem/JUtility/JUTResFont/loadImage__10JUTResFontFi11_GXTexMapID.s" -} -#pragma pop -#endif /* 802E00C4-802E0108 2DAA04 0044+00 1/1 0/0 0/0 .text convertSjis__10JUTResFontCFiPUs */ int JUTResFont::convertSjis(int inChr, u16* inLead) const { - int tmp = inChr >> 8 & 0xFF; - int tmp2 = (u8)inChr - 0x40; + int tmp = JSUHiByte(inChr); + int tmp2 = JSULoByte(inChr) - 0x40; if (0x40 <= tmp2) { tmp2--;