From aae8d823efd58be2add3f9f05d8c74c11d71c236 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Wed, 19 Jul 2023 09:25:56 +0300 Subject: [PATCH] Work on J2DPrint (#374) --- Progress.md | 8 +- .../getNumberS32__8J2DPrintFPPCUclli.s | 73 --- .../getCellHeight__10JUTResFontCFv.s | 22 - include/JSystem/J2DGraph/J2DPrint.h | 12 +- include/JSystem/JUtility/JUTFont.h | 8 +- include/JSystem/JUtility/JUTResFont.h | 6 +- libs/JSystem/J2DGraph/J2DPrint.cpp | 481 +++++++++++++++++- libs/JSystem/JUtility/JUTCacheFont.cpp | 4 +- libs/JSystem/JUtility/JUTResFont.cpp | 14 +- 9 files changed, 492 insertions(+), 136 deletions(-) delete mode 100644 asm/JSystem/J2DGraph/J2DPrint/getNumberS32__8J2DPrintFPPCUclli.s delete mode 100644 asm/JSystem/JUtility/JUTResFont/getCellHeight__10JUTResFontCFv.s diff --git a/Progress.md b/Progress.md index e09d900cc66..326447716e8 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 28.946900% | 1041088 | 3596544 +.text | 28.956242% | 1041424 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 36.437292% | 1465024 | 4020672 +Total | 36.445649% | 1465360 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 36.437292% | 1465024 | 4020672 +main.dol | 36.445649% | 1465360 | 4020672 RELs | 33.847533% | 3892576 | 11500324 -Total | 34.518403% | 5357600 | 15520996 +Total | 34.520568% | 5357936 | 15520996 ## RELs diff --git a/asm/JSystem/J2DGraph/J2DPrint/getNumberS32__8J2DPrintFPPCUclli.s b/asm/JSystem/J2DGraph/J2DPrint/getNumberS32__8J2DPrintFPPCUclli.s deleted file mode 100644 index 9e762e99835..00000000000 --- a/asm/JSystem/J2DGraph/J2DPrint/getNumberS32__8J2DPrintFPPCUclli.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_802F59C0: -/* 802F59C0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F59C4 7C 08 02 A6 */ mflr r0 -/* 802F59C8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F59CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F59D0 48 06 C8 09 */ bl _savegpr_28 -/* 802F59D4 7C 9E 23 78 */ mr r30, r4 -/* 802F59D8 7C BF 2B 78 */ mr r31, r5 -/* 802F59DC 7C DC 33 78 */ mr r28, r6 -/* 802F59E0 83 A4 00 00 */ lwz r29, 0(r4) -/* 802F59E4 88 1D 00 00 */ lbz r0, 0(r29) -/* 802F59E8 2C 00 00 5B */ cmpwi r0, 0x5b -/* 802F59EC 41 82 00 0C */ beq lbl_802F59F8 -/* 802F59F0 7F E3 FB 78 */ mr r3, r31 -/* 802F59F4 48 00 00 B8 */ b lbl_802F5AAC -lbl_802F59F8: -/* 802F59F8 38 1D 00 01 */ addi r0, r29, 1 -/* 802F59FC 90 1E 00 00 */ stw r0, 0(r30) -/* 802F5A00 38 60 00 00 */ li r3, 0 -/* 802F5A04 2C 07 00 0A */ cmpwi r7, 0xa -/* 802F5A08 40 82 00 18 */ bne lbl_802F5A20 -/* 802F5A0C 80 7E 00 00 */ lwz r3, 0(r30) -/* 802F5A10 38 81 00 08 */ addi r4, r1, 8 -/* 802F5A14 7C E5 3B 78 */ mr r5, r7 -/* 802F5A18 48 07 31 E9 */ bl strtol -/* 802F5A1C 48 00 00 50 */ b lbl_802F5A6C -lbl_802F5A20: -/* 802F5A20 2C 07 00 10 */ cmpwi r7, 0x10 -/* 802F5A24 40 82 00 48 */ bne lbl_802F5A6C -/* 802F5A28 80 7E 00 00 */ lwz r3, 0(r30) -/* 802F5A2C 38 81 00 08 */ addi r4, r1, 8 -/* 802F5A30 7C E5 3B 78 */ mr r5, r7 -/* 802F5A34 48 07 32 BD */ bl strtoul -/* 802F5A38 80 9E 00 00 */ lwz r4, 0(r30) -/* 802F5A3C 80 01 00 08 */ lwz r0, 8(r1) -/* 802F5A40 7C 04 00 50 */ subf r0, r4, r0 -/* 802F5A44 28 00 00 08 */ cmplwi r0, 8 -/* 802F5A48 41 82 00 24 */ beq lbl_802F5A6C -/* 802F5A4C 28 00 00 06 */ cmplwi r0, 6 -/* 802F5A50 40 82 00 10 */ bne lbl_802F5A60 -/* 802F5A54 54 60 40 2E */ slwi r0, r3, 8 -/* 802F5A58 60 03 00 FF */ ori r3, r0, 0xff -/* 802F5A5C 48 00 00 10 */ b lbl_802F5A6C -lbl_802F5A60: -/* 802F5A60 93 BE 00 00 */ stw r29, 0(r30) -/* 802F5A64 7F 83 E3 78 */ mr r3, r28 -/* 802F5A68 48 00 00 44 */ b lbl_802F5AAC -lbl_802F5A6C: -/* 802F5A6C 80 81 00 08 */ lwz r4, 8(r1) -/* 802F5A70 88 04 00 00 */ lbz r0, 0(r4) -/* 802F5A74 2C 00 00 5D */ cmpwi r0, 0x5d -/* 802F5A78 41 82 00 10 */ beq lbl_802F5A88 -/* 802F5A7C 93 BE 00 00 */ stw r29, 0(r30) -/* 802F5A80 7F 83 E3 78 */ mr r3, r28 -/* 802F5A84 48 00 00 28 */ b lbl_802F5AAC -lbl_802F5A88: -/* 802F5A88 80 1E 00 00 */ lwz r0, 0(r30) -/* 802F5A8C 7C 00 20 40 */ cmplw r0, r4 -/* 802F5A90 40 82 00 14 */ bne lbl_802F5AA4 -/* 802F5A94 38 04 00 01 */ addi r0, r4, 1 -/* 802F5A98 90 1E 00 00 */ stw r0, 0(r30) -/* 802F5A9C 7F E3 FB 78 */ mr r3, r31 -/* 802F5AA0 48 00 00 0C */ b lbl_802F5AAC -lbl_802F5AA4: -/* 802F5AA4 38 04 00 01 */ addi r0, r4, 1 -/* 802F5AA8 90 1E 00 00 */ stw r0, 0(r30) -lbl_802F5AAC: -/* 802F5AAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F5AB0 48 06 C7 75 */ bl _restgpr_28 -/* 802F5AB4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F5AB8 7C 08 03 A6 */ mtlr r0 -/* 802F5ABC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F5AC0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTResFont/getCellHeight__10JUTResFontCFv.s b/asm/JSystem/JUtility/JUTResFont/getCellHeight__10JUTResFontCFv.s deleted file mode 100644 index d2852ed7e1a..00000000000 --- a/asm/JSystem/JUtility/JUTResFont/getCellHeight__10JUTResFontCFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_802DFD58: -/* 802DFD58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DFD5C 7C 08 02 A6 */ mflr r0 -/* 802DFD60 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DFD64 80 83 00 58 */ lwz r4, 0x58(r3) -/* 802DFD68 28 04 00 00 */ cmplwi r4, 0 -/* 802DFD6C 41 82 00 18 */ beq lbl_802DFD84 -/* 802DFD70 80 84 00 00 */ lwz r4, 0(r4) -/* 802DFD74 28 04 00 00 */ cmplwi r4, 0 -/* 802DFD78 41 82 00 0C */ beq lbl_802DFD84 -/* 802DFD7C A0 64 00 0E */ lhz r3, 0xe(r4) -/* 802DFD80 48 00 00 14 */ b lbl_802DFD94 -lbl_802DFD84: -/* 802DFD84 81 83 00 00 */ lwz r12, 0(r3) -/* 802DFD88 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802DFD8C 7D 89 03 A6 */ mtctr r12 -/* 802DFD90 4E 80 04 21 */ bctrl -lbl_802DFD94: -/* 802DFD94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DFD98 7C 08 03 A6 */ mtlr r0 -/* 802DFD9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DFDA0 4E 80 00 20 */ blr diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h index e47e59b6463..de9dd592eb1 100644 --- a/include/JSystem/J2DGraph/J2DPrint.h +++ b/include/JSystem/J2DGraph/J2DPrint.h @@ -23,12 +23,12 @@ public: /* 802F4778 */ void print(f32, f32, u8, char const*, ...); /* 802F4828 */ void printReturn(char const*, f32, f32, J2DTextBoxHBinding, J2DTextBoxVBinding, f32, f32, u8); - /* 802F4B4C */ void parse(u8 const*, int, int, u16*, J2DPrint::TSize&, u8, bool); + /* 802F4B4C */ f32 parse(u8 const*, int, int, u16*, J2DPrint::TSize&, u8, bool); /* 802F52E8 */ void doCtrlCode(int); - /* 802F5410 */ void doEscapeCode(u8 const**, u8); + /* 802F5410 */ u16 doEscapeCode(u8 const**, u8); /* 802F594C */ void initchar(); - /* 802F59C0 */ void getNumberS32(u8 const**, s32, s32, int); - /* 802F5AC4 */ void getNumberF32(u8 const**, f32, f32, int); + /* 802F59C0 */ s32 getNumberS32(u8 const**, s32, s32, int); + /* 802F5AC4 */ f32 getNumberF32(u8 const**, f32, f32, int); /* 802F4420 */ virtual ~J2DPrint(); @@ -65,7 +65,7 @@ private: /* 0x18 */ f32 field_0x18; /* 0x1C */ f32 field_0x1c; /* 0x20 */ s16 field_0x20; - /* 0x22 */ u8 field_0x22; + /* 0x22 */ bool field_0x22; /* 0x24 */ f32 field_0x24; /* 0x28 */ f32 field_0x28; /* 0x2C */ f32 field_0x2c; @@ -80,7 +80,7 @@ private: /* 0x50 */ f32 mFontSizeX; /* 0x54 */ f32 mFontSizeY; /* 0x58 */ s16 field_0x58; - /* 0x5A */ u8 field_0x5a; + /* 0x5A */ bool field_0x5a; }; // Size: 0x5C f32 J2DPrint_print_alpha_va(J2DPrint*, u8, const char*, va_list); diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h index dc6037c0f7f..f730095b14a 100644 --- a/include/JSystem/JUtility/JUTFont.h +++ b/include/JSystem/JUtility/JUTFont.h @@ -71,13 +71,13 @@ public: /* 0x10 */ virtual void setGX(JUtility::TColor col1, JUtility::TColor col2); /* 0x14 */ virtual f32 drawChar_scale(f32 a1, f32 a2, f32 a3, f32 a4, int a5, bool a6) = 0; /* 0x18 */ virtual int getLeading() const = 0; - /* 0x1C */ virtual u16 getAscent() const = 0; - /* 0x20 */ virtual u16 getDescent() const = 0; + /* 0x1C */ virtual s32 getAscent() const = 0; + /* 0x20 */ virtual s32 getDescent() const = 0; /* 0x24 */ virtual s32 getHeight() const = 0; /* 0x28 */ virtual s32 getWidth() const = 0; /* 0x2C */ virtual void getWidthEntry(int i_no, TWidth* width) const = 0; /* 0x30 */ virtual int getCellWidth() const; - /* 0x34 */ virtual u16 getCellHeight() const; + /* 0x34 */ virtual s32 getCellHeight() const; /* 0x38 */ virtual u16 getFontType() const = 0; /* 0x3C */ virtual ResFONT* getResFont() const = 0; /* 0x40 */ virtual bool isLeadByte(int a1) const = 0; @@ -112,6 +112,8 @@ public: } bool isValid() const { return mValid; } + bool isFixed() const { return mFixed; } + int getFixedWidth() const { return mFixedWidth; } /* 0x04 */ bool mValid; /* 0x05 */ bool mFixed; diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h index 3187947f2e0..4242ec7835f 100644 --- a/include/JSystem/JUtility/JUTResFont.h +++ b/include/JSystem/JUtility/JUTResFont.h @@ -21,13 +21,13 @@ public: /* 802DF584 */ virtual void setGX(JUtility::TColor, JUtility::TColor); /* 802DF7C4 */ virtual f32 drawChar_scale(f32, f32, f32, f32, int, bool); /* 802DDFEC */ virtual int getLeading() const; - /* 802DE004 */ virtual u16 getAscent() const; - /* 802DE010 */ virtual u16 getDescent() const; + /* 802DE004 */ virtual s32 getAscent() const; + /* 802DE010 */ virtual s32 getDescent() const; /* 802DE01C */ virtual s32 getHeight() const; /* 802DDFF8 */ virtual s32 getWidth() const; /* 802DFC64 */ virtual void getWidthEntry(int, JUTFont::TWidth*) const; /* 802DFD0C */ virtual int getCellWidth() const; - /* 802DFD58 */ virtual u16 getCellHeight() const; + /* 802DFD58 */ virtual s32 getCellHeight() const; /* 802DDFE0 */ virtual u16 getFontType() const; /* 802DDFD8 */ virtual ResFONT* getResFont() const; /* 802DFDA4 */ virtual bool isLeadByte(int) const; diff --git a/libs/JSystem/J2DGraph/J2DPrint.cpp b/libs/JSystem/J2DGraph/J2DPrint.cpp index a2f63fa488c..498b1fcb76f 100644 --- a/libs/JSystem/J2DGraph/J2DPrint.cpp +++ b/libs/JSystem/J2DGraph/J2DPrint.cpp @@ -5,6 +5,7 @@ #include "JSystem/J2DGraph/J2DPrint.h" #include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JUtility/JUTFont.h" #include "MSL_C/stdio.h" #include "MSL_C/stdlib.h" #include "MSL_C/string.h" @@ -275,6 +276,65 @@ SECTION_SDATA2 static f64 lit_791 = 4503599627370496.0 /* cast u32 to float */; /* 802F4828-802F4B4C 2EF168 0324+00 0/0 4/4 0/0 .text * printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc */ +// Matches with literals +#ifdef NONMATCHING +void J2DPrint::printReturn(char const* param_0, f32 param_1, f32 param_2, + J2DTextBoxHBinding param_3, J2DTextBoxVBinding param_4, f32 param_5, + f32 param_6, u8 param_7) { + if (mFont != NULL) { + initchar(); + field_0x24 = field_0x2c; + field_0x28 = mCursorV; + size_t sVar6 = strlen(param_0); + if (sVar6 >= mStrBuffSize) { + sVar6 = mStrBuffSize - 1; + data_8045158C[0] = 1; + } + u16 local_2b0[260]; + TSize aTStack_2b8; + f32 dVar10 = parse((const u8*)param_0, sVar6, param_1, local_2b0, aTStack_2b8, + param_7, false); + f32 dVar12 = mFont->getAscent()*(mFontSizeY / mFont->getCellHeight()); + f32 dVar13 = dVar10 + dVar12; + switch (param_4) + { + case VBIND_TOP: + break; + case VBIND_BOTTOM: + param_6 += (s32)(param_2 - dVar13 - 0.5f); + break; + case VBIND_CENTER: + param_6 += (s32)(param_2 - dVar13 - 0.5f) / 2; + default: + break; + } + + for (int iVar8 = 0; local_2b0[iVar8] != 0xffff; iVar8++) { + switch (param_3) { + case VBIND_TOP: + local_2b0[iVar8] = 0; + break; + case VBIND_BOTTOM: + local_2b0[iVar8] = param_1 - local_2b0[iVar8]; + break; + case VBIND_CENTER: + f32 fVar1 = (local_2b0[iVar8]); + fVar1 = param_1 - fVar1; + f32 ratio = 0.5f; + local_2b0[iVar8] = fVar1 * ratio; + break; + + } + } + initchar(); + field_0x2c += param_5; + mCursorV += param_6 + dVar12; + field_0x24 = field_0x2c; + field_0x28 = mCursorV; + parse((const u8*)param_0, sVar6, param_1, local_2b0, aTStack_2b8, param_7, true); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -285,6 +345,7 @@ asm void J2DPrint::printReturn(char const* param_0, f32 param_1, f32 param_2, #include "asm/JSystem/J2DGraph/J2DPrint/printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc.s" } #pragma pop +#endif /* ############################################################################################## */ /* 804561E8-804561EC 0047E8 0004+00 1/1 0/0 0/0 .sdata2 @913 */ @@ -292,21 +353,235 @@ SECTION_SDATA2 static f32 lit_913 = 10000.0f; /* 802F4B4C-802F52E8 2EF48C 079C+00 2/2 0/0 0/0 .text * parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb */ +// Mostly regalloc +#ifdef NONMATCHING +f32 J2DPrint::parse(u8 const* param_0, int param_1, int param_2, u16* param_3, + J2DPrint::TSize& param_4, u8 param_5, bool param_6) { + if (mFont == NULL) { + return 0.0f; + } + u16 uVar13 = 0; + f32 dVar18 = (double)field_0x2c; + f32 dVar16 = mCursorV; + f32 dVar19 = dVar18; + f32 f28 = dVar16; + u8 const* local_f8 = param_0 + 1; + int uVar12 = *param_0; + f32 tmpf = field_0x2c; + f32 dVar17 = tmpf; + f32 local_ac = tmpf; + f32 local_b0 = mCursorV; + f32 local_b4 = mCursorV; + JUtility::TColor local_b8 = field_0x8; + JUtility::TColor local_bc = field_0xc; + f32 local_c0; + local_b8.a = local_b8.a * param_5 / 0xff; + local_bc.a = local_bc.a * param_5 / 0xff; + JUtility::TColor* local_d8; + if (field_0x22) { + local_d8 = &local_bc; + } else { + local_d8 = &local_b8; + } + mFont->setGradColor(local_bc, *local_d8); + bool bVar1; + do { + u8 local_f0 = 0; + if (mFont->isLeadByte(uVar12)) { + uVar12 = (uVar12 << 8) | (*(++local_f8)); + local_f0 = 1; + } + + if (uVar12 == 0 || ((u32)param_1 > (u32)local_f8 - (u32)param_0)) { + if (param_6 == 0 && param_3 != NULL) { + param_3[uVar13] = 0.5f + dVar19; + } + uVar13++; + break; + } else { + bVar1 = true; + local_c0 = field_0x2c; + if (uVar12 < 0x20) { + if (uVar12 == 0x1b) { + u16 local_e8 = doEscapeCode(&local_f8, param_5); + if (local_e8 == 'HM') { + if ((param_6 == 0) && (param_3 != NULL)) { + param_3[uVar13] = 0.5f + dVar19; + } + field_0x2c = dVar18; + mCursorV = dVar16; + uVar13++; + if (uVar13 == 0x100) { + break; + } + dVar19 = 0.0f; + } + if (local_e8) { + bVar1 = false; + } + } else { + doCtrlCode(uVar12); + bVar1 = false; + if (uVar12 == 10) { + if ((!param_6) && (param_3 != NULL)) { + param_3[uVar13] = 0.5f + dVar19; + } + uVar13++; + if (uVar13 == 0x100) { + break; + } + dVar19 = 0.0f; + } + } + } else if (local_f0 && ((u32)local_f8 - (u32)param_0 > (u32)param_1)) { + if ((!param_6) && (param_3 != NULL)) { + param_3[uVar13] = 0.5f + dVar19; + } + uVar13++; + break; + } else { + if (mFont->isFixed()) { + field_0x34 = mFont->getFixedWidth(); + } else { + JUTFont::TWidth uStack_ec; + mFont->getWidthEntry(uVar12, &uStack_ec); + field_0x34 = uStack_ec.field_0x1; + } + + field_0x34 *= field_0x18 / mFont->getCellWidth(); + f32 fVar6 = ((field_0x2c + field_0x34) - field_0x24); + fVar6 = 10000.0f * fVar6; + f32 local_90 = ((s32)fVar6) / 10000.0f; + if (local_90 > param_2 && field_0x2c > dVar18) { + u32 local_e4; + if (local_f0) { + local_e4 = 2; + } else { + local_e4 = 1; + } + local_f8 -= local_e4; + mCursorV += field_0x14; + if (!param_6 && (param_3 != NULL)) { + param_3[uVar13] = 0.5f + dVar19; + } + uVar13++; + if (uVar13 == 0x100) { + break; + } + field_0x2c = field_0x24; + dVar19 = 0.0f; + bVar1 = false; + } else { + if (param_6) { + if (param_3 != NULL) { + mFont->drawChar_scale(field_0x2c + (f32)(s16)param_3[uVar13], mCursorV, + (s32)field_0x18, (s32)field_0x1c, uVar12, true); + } else { + mFont->drawChar_scale(field_0x2c, mCursorV, + (s32)field_0x18, (s32)field_0x1c, uVar12, true); + } + } + field_0x2c += field_0x34; + } + } + } + + if (bVar1) { + if (field_0x2c - dVar18 > dVar19) { + dVar19 = field_0x2c - dVar18; + } + field_0x2c += field_0x10; + field_0x34 += field_0x10; + f32 local_cc = mCursorV + (field_0x1c / mFont->getHeight()) * mFont->getDescent(); + if (f28 < local_cc) { + f28 = local_cc; + } + if (field_0x2c > local_ac) { + local_ac = field_0x2c; + } + if (field_0x2c < dVar17) { + dVar17 = field_0x2c; + } + if (local_c0 < dVar17) { + dVar17 = local_c0; + } + if (local_b4 > mCursorV) { + local_b4 = mCursorV; + } + if (mCursorV < local_b0) { + local_b0 = mCursorV; + } + } + local_f8++; + uVar12 = *local_f8; + } while (true); + + if (param_3 != NULL) { + param_3[uVar13] = 0xffff; + } + param_4.field_0x0 = local_ac - dVar17; + param_4.field_0x4 = local_b4 - local_b0 + mFont->getLeading(); + if (!param_6) { + field_0x2c = dVar18; + mCursorV = dVar16; + } + return f28 - dVar16; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DPrint::parse(u8 const* param_0, int param_1, int param_2, u16* param_3, +asm f32 J2DPrint::parse(u8 const* param_0, int param_1, int param_2, u16* param_3, J2DPrint::TSize& param_4, u8 param_5, bool param_6) { nofralloc #include "asm/JSystem/J2DGraph/J2DPrint/parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb.s" } #pragma pop +#endif /* ############################################################################################## */ /* 804561EC-804561F0 0047EC 0004+00 2/2 0/0 0/0 .sdata2 @937 */ SECTION_SDATA2 static f32 lit_937 = 1.0f; /* 802F52E8-802F5410 2EFC28 0128+00 2/1 0/0 0/0 .text doCtrlCode__8J2DPrintFi */ +// Matches with literals +#ifdef NONMATCHING +void J2DPrint::doCtrlCode(int param_0) { + switch (param_0) { + case 8: + field_0x2c -= field_0x34; + field_0x34 = 0.0f; + break; + case 9: + if (field_0x20 > 0) { + f32 fVar1 = field_0x2c; + field_0x2c = field_0x20 + field_0x20 * ((int)field_0x2c / field_0x20); + field_0x34 = field_0x2c - fVar1; + } + break; + case 10: + field_0x34 = 0.0f; + field_0x2c = field_0x24; + mCursorV += field_0x14; + break; + case 0xd: + field_0x34 = 0.0f; + field_0x2c = field_0x24; + break; + case 0x1c: + field_0x2c += 1.0f; + break; + case 0x1d: + field_0x2c -= 1.0f; + break; + case 0x1e: + mCursorV -= 1.0f; + break; + case 0x1f: + mCursorV += + 1.0f; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -315,16 +590,136 @@ asm void J2DPrint::doCtrlCode(int param_0) { #include "asm/JSystem/J2DGraph/J2DPrint/doCtrlCode__8J2DPrintFi.s" } #pragma pop +#endif /* 802F5410-802F594C 2EFD50 053C+00 1/1 0/0 0/0 .text doEscapeCode__8J2DPrintFPPCUcUc */ +// Matches with literals +#ifdef NONMATCHING +u16 J2DPrint::doEscapeCode(u8 const** param_0, u8 param_1) { + u8 const* puVar9 = *param_0; + u16 uVar11 = 0; + u16 uVar3; + for (int iVar10 = 0; iVar10 < 2; iVar10++) { + if (mFont->isLeadByte(**param_0)) { + uVar3 = ((**param_0) << 8) | (*param_0)[1]; + (*param_0) += 2; + } else { + uVar3 = **param_0; + (*param_0)++; + } + if (uVar3 >= 0x80 || uVar3 < 0x20) { + *param_0 = puVar9; + return 0; + } + uVar11 = ((uVar11) << 8) | uVar3; + } + + JUtility::TColor local_40 = field_0x8; + JUtility::TColor local_44 = field_0xc; + switch(uVar11) { + case 'CU': + mCursorV -= getNumberF32(param_0, 1.0f, 0.0f, 10); + break; + case 'CD': + mCursorV += getNumberF32(param_0, 1.0f, 0.0f, 10); + break; + case 'CL': + field_0x2c -= getNumberF32(param_0, 1.0f, 0.0f, 10); + break; + case 'CR': + field_0x2c += getNumberF32(param_0, 1.0f, 0.0f, 10); + break; + case 'LU': + mCursorV -= field_0x14; + break; + case 'LD': + mCursorV += field_0x14; + break; + case 'ST': + s32 val = getNumberS32(param_0, field_0x20, field_0x20, 10); + if (val > 0) { + field_0x20 = val; + } + break; + case 'CC': + field_0x8 = getNumberS32(param_0, *(u32*)&mCharColor, *(u32*)&field_0x8, 16); + local_40 = field_0x8; + local_40.a = local_40.a * param_1 / 0xff; + local_44.a = local_44.a * param_1 / 0xff; + JUtility::TColor* local_68; + if (field_0x22 != 0) { + local_68 = &local_44; + } + else { + local_68 = &local_40; + } + mFont->setGradColor(local_40, *local_68); + break; + case 'GC': + field_0xc = getNumberS32(param_0, *(u32*)&mGradColor, *(u32*)&field_0xc, 16); + local_44 = field_0xc; + local_40.a = local_40.a * param_1 / 0xff; + local_44.a = local_44.a * param_1 / 0xff; + JUtility::TColor* local_74; + if (field_0x22 != 0) { + local_74 = &local_44; + } + else { + local_74 = &local_40; + } + mFont->setGradColor(local_40, *local_74); + break; + case 'FX': + f32 dVar13 = getNumberF32(param_0, mFontSizeX, field_0x18, 10); + if (dVar13 >= 0) { + field_0x18 = dVar13; + } + break; + case 'FY': + f32 dVar14 = getNumberF32(param_0, mFontSizeY, field_0x1c, 10); + if (dVar14 >= 0) { + field_0x1c = dVar14; + } + break; + case 'SH': + field_0x10 = getNumberF32(param_0, field_0x48, field_0x10, 10); + break; + case 'SV': + field_0x14 = getNumberF32(param_0, field_0x4c, field_0x14, 10); + break; + case 'GM': + s32 isZero = getNumberS32(param_0, field_0x22 == 0, field_0x22, 10) == 0; + field_0x22 = isZero == 0; + local_40.a = local_40.a * param_1 / 0xff; + local_44.a = local_44.a * param_1 / 0xff; + JUtility::TColor* local_80; + if (field_0x22 != 0) { + local_80 = &local_44; + } + else { + local_80 = &local_40; + } + mFont->setGradColor(local_40, *local_80); + break; + case 'HM': + break; + default: + *param_0 = puVar9; + uVar11 = 0; + break; + } + return uVar11; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DPrint::doEscapeCode(u8 const** param_0, u8 param_1) { +asm u16 J2DPrint::doEscapeCode(u8 const** param_0, u8 param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DPrint/doEscapeCode__8J2DPrintFPPCUcUc.s" } #pragma pop +#endif /* 802F594C-802F59C0 2F028C 0074+00 3/3 0/0 0/0 .text initchar__8J2DPrintFv */ void J2DPrint::initchar() { @@ -339,21 +734,87 @@ void J2DPrint::initchar() { } /* 802F59C0-802F5AC4 2F0300 0104+00 1/1 0/0 0/0 .text getNumberS32__8J2DPrintFPPCUclli */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPrint::getNumberS32(u8 const** param_0, s32 param_1, s32 param_2, int param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPrint/getNumberS32__8J2DPrintFPPCUclli.s" +s32 J2DPrint::getNumberS32(u8 const** param_0, s32 param_1, s32 param_2, int base) { + const u8* puVar1 = *param_0; + s32 uVar2 = param_1; + if (*puVar1 != '[') { + return param_1; + } + (*param_0)++; + uVar2 = 0; + char* local_28; + if (base == 10) { + uVar2 = strtol((char*)*param_0, &local_28, base); + } else if (base == 16) { + uVar2 = strtoul((char*)*param_0, &local_28, base); + if ((u32)local_28 - (u32)*param_0 != 8) { + if ((u32)local_28 - (u32)*param_0 == 6) { + uVar2 = (uVar2 << 8) | 0xff; + } else { + *param_0 = puVar1; + return param_2; + } + } + } + if (local_28[0] != ']') { + *param_0 = puVar1; + return param_2; + } else { + if ((char*)*param_0 == (char*)local_28) { + *param_0 = (const u8*)local_28 + 1; + return param_1; + } else { + *param_0 = (const u8*)local_28 + 1; + } + } + return uVar2; } -#pragma pop /* 802F5AC4-802F5BF8 2F0404 0134+00 1/1 0/0 0/0 .text getNumberF32__8J2DPrintFPPCUcffi */ +// Matches with literals +#ifdef NONMATCHING +f32 J2DPrint::getNumberF32(u8 const** param_0, f32 param_1, f32 param_2, int base) { + const u8* puVar1 = *param_0; + s32 uVar2 = param_1; + if (*puVar1 != '[') { + return param_1; + } + (*param_0)++; + uVar2 = 0; + char* local_28; + if (base == 10) { + uVar2 = strtol((char*)*param_0, &local_28, base); + } else if (base == 16) { + uVar2 = strtoul((char*)*param_0, &local_28, base); + if ((u32)local_28 - (u32)*param_0 != 8) { + if ((u32)local_28 - (u32)*param_0 == 6) { + uVar2 = (uVar2 << 8) | 0xff; + } else { + *param_0 = puVar1; + return param_2; + } + } + } + if (local_28[0] != ']') { + *param_0 = puVar1; + return param_2; + } else { + if ((char*)*param_0 == (char*)local_28) { + *param_0 = (const u8*)local_28 + 1; + return param_1; + } else { + *param_0 = (const u8*)local_28 + 1; + } + } + return uVar2; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DPrint::getNumberF32(u8 const** param_0, f32 param_1, f32 param_2, int param_3) { +asm f32 J2DPrint::getNumberF32(u8 const** param_0, f32 param_1, f32 param_2, int param_3) { nofralloc #include "asm/JSystem/J2DGraph/J2DPrint/getNumberF32__8J2DPrintFPPCUcffi.s" } #pragma pop +#endif \ No newline at end of file diff --git a/libs/JSystem/JUtility/JUTCacheFont.cpp b/libs/JSystem/JUtility/JUTCacheFont.cpp index 1130e67295a..c8011770aae 100644 --- a/libs/JSystem/JUtility/JUTCacheFont.cpp +++ b/libs/JSystem/JUtility/JUTCacheFont.cpp @@ -512,7 +512,7 @@ asm s32 JUTResFont::getWidth() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm u16 JUTResFont::getAscent() const { +asm s32 JUTResFont::getAscent() const { nofralloc #include "asm/JSystem/JUtility/JUTCacheFont/getAscent__10JUTResFontCFv.s" } @@ -522,7 +522,7 @@ asm u16 JUTResFont::getAscent() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm u16 JUTResFont::getDescent() const { +asm s32 JUTResFont::getDescent() const { nofralloc #include "asm/JSystem/JUtility/JUTCacheFont/getDescent__10JUTResFontCFv.s" } diff --git a/libs/JSystem/JUtility/JUTResFont.cpp b/libs/JSystem/JUtility/JUTResFont.cpp index b8377e442c5..874bd88e41e 100644 --- a/libs/JSystem/JUtility/JUTResFont.cpp +++ b/libs/JSystem/JUtility/JUTResFont.cpp @@ -429,9 +429,7 @@ int JUTResFont::getCellWidth() const { } /* 802DFD58-802DFDA4 2DA698 004C+00 1/0 1/0 0/0 .text getCellHeight__10JUTResFontCFv */ -#ifdef NONMATCHING -// casting issue on the return -int JUTResFont::getCellHeight() const { +s32 JUTResFont::getCellHeight() const { u16 height; if (mpGlyphBlocks) { @@ -443,16 +441,6 @@ int JUTResFont::getCellHeight() const { return getHeight(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u16 JUTResFont::getCellHeight() const { - nofralloc -#include "asm/JSystem/JUtility/JUTResFont/getCellHeight__10JUTResFontCFv.s" -} -#pragma pop -#endif /* 802DFDA4-802DFDD8 2DA6E4 0034+00 1/0 1/0 0/0 .text isLeadByte__10JUTResFontCFi */ bool JUTResFont::isLeadByte(int param_0) const {