diff options
Diffstat (limited to 'src/JSystem/J2DGraph/J2DPrint.cpp')
| -rw-r--r-- | src/JSystem/J2DGraph/J2DPrint.cpp | 636 |
1 files changed, 331 insertions, 305 deletions
diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/src/JSystem/J2DGraph/J2DPrint.cpp index 22f7893e3b..d1bc81352c 100644 --- a/src/JSystem/J2DGraph/J2DPrint.cpp +++ b/src/JSystem/J2DGraph/J2DPrint.cpp @@ -1,18 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: J2DPrint -// - #include "JSystem/J2DGraph/J2DPrint.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTFont.h" -#include "stdio.h" -#include "stdlib.h" +#include <stdio.h> +#include <stdlib.h> #include "global.h" -/* ############################################################################################## */ /* 80451580-80451584 000A80 0004+00 3/3 0/0 0/0 .sbss mStrBuff__8J2DPrint */ -const u8* J2DPrint::mStrBuff; +char* J2DPrint::mStrBuff; /* 80451584-80451588 000A84 0004+00 1/1 0/0 0/0 .sbss None */ static bool sStrBufInitialized; @@ -24,61 +18,68 @@ size_t J2DPrint::mStrBuffSize; static u8 data_8045158C[4]; /* 802F42F0-802F4394 2EEC30 00A4+00 1/1 0/0 0/0 .text J2DPrint_print_alpha_va */ -f32 J2DPrint_print_alpha_va(J2DPrint* pPrint, u8 param_1, const char* fmt, va_list args) { +f32 J2DPrint_print_alpha_va(J2DPrint* pPrint, u8 alpha, const char* fmt, va_list args) { pPrint->initchar(); - s32 tmp = vsnprintf((char*)J2DPrint::mStrBuff, J2DPrint::mStrBuffSize, fmt, args); + s32 length = vsnprintf(J2DPrint::mStrBuff, J2DPrint::mStrBuffSize, fmt, args); J2DPrint::TSize size; - if (tmp < 0) { + if (length < 0) { return 0.0f; - } else if (tmp >= J2DPrint::mStrBuffSize) { - tmp = J2DPrint::mStrBuffSize - 1; + } else if (length >= J2DPrint::mStrBuffSize) { + length = J2DPrint::mStrBuffSize - 1; data_8045158C[0] = 1; } - pPrint->parse(J2DPrint::mStrBuff, tmp, 0x80000000 - 1, NULL, size, param_1, true); + + pPrint->parse((u8*)J2DPrint::mStrBuff, length, 0x80000000 - 1, NULL, size, alpha, true); return size.field_0x0; } +J2DPrint::J2DPrint(JUTFont* pFont, JUtility::TColor charColor, JUtility::TColor gradColor) { + private_initiate(pFont, 0.0f, 0.0f, charColor, gradColor, 0, 0xFFFFFFFF, true); +} + /* 802F4394-802F4420 2EECD4 008C+00 0/0 6/6 0/0 .text * __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor */ -J2DPrint::J2DPrint(JUTFont* pFont, f32 param_1, f32 param_2, JUtility::TColor param_3, - JUtility::TColor param_4, JUtility::TColor param_5, JUtility::TColor param_6) { - private_initiate(pFont, param_1, param_2, param_3, param_4, param_5, param_6, false); +J2DPrint::J2DPrint(JUTFont* pFont, f32 charSpacing, f32 lineSpacing, JUtility::TColor charColor, + JUtility::TColor gradColor, JUtility::TColor blackColor, JUtility::TColor whiteColor) { + private_initiate(pFont, charSpacing, lineSpacing, charColor, gradColor, blackColor, whiteColor, false); } /* 802F4420-802F4468 2EED60 0048+00 1/0 6/6 0/0 .text __dt__8J2DPrintFv */ J2DPrint::~J2DPrint() {} +void J2DPrint::initiate() { + if (mFont != NULL) { + mFont->setGX(mBlackColor, mWhiteColor); + } +} + /* 802F4468-802F4658 2EEDA8 01F0+00 1/1 0/0 0/0 .text * private_initiate__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorb */ -void J2DPrint::private_initiate(JUTFont* pFont, f32 param_1, f32 param_2, JUtility::TColor param_3, - JUtility::TColor param_4, JUtility::TColor param_5, - JUtility::TColor param_6, bool param_7) { +void J2DPrint::private_initiate(JUTFont* pFont, f32 charSpacing, f32 lineSpacing, JUtility::TColor charColor, + JUtility::TColor gradColor, JUtility::TColor blackColor, + JUtility::TColor whiteColor, bool param_7) { if (mStrBuff == NULL) { - setBuffer(0x400); // r4 + setBuffer(0x400); } + mFont = pFont; - field_0x48 = param_1; - field_0x4c = 32.0f; + mCharSpacing = charSpacing; + mLineSpacing = 32.0f; if (mFont != NULL) { - f32 temp; - if (param_7 == false) { - temp = param_2; - } else { - temp = mFont->getLeading(); - } - field_0x4c = temp; + mLineSpacing = param_7 == false ? lineSpacing : mFont->getLeading(); } field_0x5a = 1; locate(0.0f, 0.0f); - mCharColor = param_3; - mGradColor = param_4; - field_0x38 = param_5; - field_0x3c = param_6; + + mCharColor = charColor; + mGradColor = gradColor; + mBlackColor = blackColor; + mWhiteColor = whiteColor; if (mFont == NULL) { field_0x58 = 80; @@ -88,251 +89,273 @@ void J2DPrint::private_initiate(JUTFont* pFont, f32 param_1, f32 param_2, JUtili if (mFont != NULL) { setFontSize(); - mFont->setGX(field_0x38, field_0x3c); + mFont->setGX(mBlackColor, mWhiteColor); } + initchar(); } /* 802F4658-802F46C4 2EEF98 006C+00 1/1 1/1 0/0 .text setBuffer__8J2DPrintFUl */ u8* J2DPrint::setBuffer(size_t size) { - u8* tmp = (u8*)mStrBuff; + JUT_ASSERT(335, size > 0); + + u8* u8Buff = (u8*)mStrBuff; if (sStrBufInitialized) { delete mStrBuff; } - mStrBuff = new (JKRHeap::sSystemHeap, 0) u8[size]; + mStrBuff = new (JKRGetSystemHeap(), 0) char[size]; mStrBuffSize = size; sStrBufInitialized = true; - return tmp; + return u8Buff; } /* 802F46C4-802F475C 2EF004 0098+00 1/1 0/0 0/0 .text setFontSize__8J2DPrintFv */ void J2DPrint::setFontSize() { - if (mFont) { + if (mFont != NULL) { mFontSizeX = mFont->getCellWidth(); mFontSizeY = mFont->getCellHeight(); } } /* 802F475C-802F4778 2EF09C 001C+00 2/2 2/2 0/0 .text locate__8J2DPrintFff */ -void J2DPrint::locate(f32 param_0, f32 param_1) { - field_0x24 = param_0; - field_0x28 = param_1; - field_0x2c = param_0; - mCursorV = param_1; +void J2DPrint::locate(f32 cursorH, f32 cursorV) { + field_0x24 = cursorH; + field_0x28 = cursorV; + mCursorH = cursorH; + mCursorV = cursorV; field_0x34 = 0.0f; } /* 802F4778-802F4828 2EF0B8 00B0+00 0/0 2/2 0/0 .text print__8J2DPrintFffUcPCce */ -void J2DPrint::print(f32 param_0, f32 param_1, u8 param_2, char const* fmt, ...) { - locate(param_0, param_1); +f32 J2DPrint::print(f32 cursorH, f32 cursorV, u8 alpha, char const* fmt, ...) { + locate(cursorH, cursorV); va_list args; va_start(args, fmt); - J2DPrint_print_alpha_va(this, param_2, fmt, args); + f32 var_f31 = print_va(alpha, fmt, args); va_end(args); + + return var_f31; } /* 802F4828-802F4B4C 2EF168 0324+00 0/0 4/4 0/0 .text * printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc */ -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) { +void J2DPrint::printReturn(char const* pString, f32 param_1, f32 param_2, + J2DTextBoxHBinding hBind, J2DTextBoxVBinding vBind, f32 param_5, + f32 param_6, u8 alpha) { if (mFont != NULL) { initchar(); - field_0x24 = field_0x2c; + field_0x24 = mCursorH; field_0x28 = mCursorV; - size_t sVar6 = strlen(param_0); - if (sVar6 >= mStrBuffSize) { - sVar6 = mStrBuffSize - 1; + + size_t length = strlen(pString); + if (length >= mStrBuffSize) { + length = mStrBuffSize - 1; data_8045158C[0] = 1; } + + f32 var_f26 = mLineSpacing; + u16 local_2b0[260]; - TSize aTStack_2b8; - f32 dVar10 = parse((const u8*)param_0, sVar6, param_1, local_2b0, aTStack_2b8, - param_7, false); + TSize size; + f32 var_f31 = parse((u8*)pString, length, param_1, local_2b0, size, alpha, false); f32 dVar12 = mFont->getAscent()*(mFontSizeY / mFont->getCellHeight()); - f32 dVar13 = dVar10 + dVar12; - switch (param_4) - { + var_f31 += dVar12; + + switch (vBind) { case VBIND_TOP: break; case VBIND_BOTTOM: - param_6 += (s32)(param_2 - dVar13 - 0.5f); + param_6 += (s32)(param_2 - var_f31 - 0.5f); break; case VBIND_CENTER: - param_6 += (s32)(param_2 - dVar13 - 0.5f) / 2; + param_6 += (s32)(param_2 - var_f31 - 0.5f) / 2; default: break; } - for (int iVar8 = 0; local_2b0[iVar8] != 0xffff; iVar8++) { - switch (param_3) { - case VBIND_TOP: - local_2b0[iVar8] = 0; + for (int i = 0; local_2b0[i] != 0xFFFF; i++) { + switch (hBind) { + case HBIND_LEFT: + local_2b0[i] = 0; break; - case VBIND_BOTTOM: - local_2b0[iVar8] = param_1 - local_2b0[iVar8]; + case HBIND_RIGHT: + local_2b0[i] = param_1 - local_2b0[i]; break; - case VBIND_CENTER: - f32 fVar1 = (local_2b0[iVar8]); - fVar1 = param_1 - fVar1; - f32 ratio = 0.5f; - local_2b0[iVar8] = fVar1 * ratio; + case HBIND_CENTER: + local_2b0[i] = (param_1 - local_2b0[i]) / 2; break; - } } + initchar(); - field_0x2c += param_5; + + mCursorH += param_5; mCursorV += param_6 + dVar12; - field_0x24 = field_0x2c; + field_0x24 = mCursorH; field_0x28 = mCursorV; - parse((const u8*)param_0, sVar6, param_1, local_2b0, aTStack_2b8, param_7, true); + parse((u8*)pString, length, param_1, local_2b0, size, alpha, true); } } /* 802F4B4C-802F52E8 2EF48C 079C+00 2/2 0/0 0/0 .text * parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb */ -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) { +f32 J2DPrint::parse(const u8* pString, int length, int param_2, u16* param_3, + TSize& size, u8 alpha, bool param_6) { if (mFont == NULL) { return 0.0f; } - const u8* local_a4 = param_0; - u16 r29 = 0; - f32 f30 = field_0x2c; - f32 f28 = mCursorV; - f32 f31 = f30; - f32 local_a8 = f28; - int r27 = *(param_0++); - f32 f29 = field_0x2c; - f32 local_ac = field_0x2c; + + const u8* pStringStart = pString; + u16 someIndex = 0; + + f32 prevCursorH = mCursorH; + f32 prevCursorV = mCursorV; + f32 f31 = prevCursorH; + f32 local_a8 = prevCursorV; + int iCharacter = *(pString++); + + f32 f29 = mCursorH; + f32 local_ac = mCursorH; 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; + + local_b8.a = local_b8.a * alpha / 0xFF; + local_bc.a = local_bc.a * alpha / 0xFF; mFont->setGradColor(local_b8, field_0x22 ? local_bc : local_b8); + do { - bool local_f0 = false; + bool b2ByteCharacter = false; bool r25; - if (mFont->isLeadByte(r27)) { - r27 = (r27 << 8) | (*(param_0++)); - local_f0 = true; + if (mFont->isLeadByte(iCharacter)) { + iCharacter = (iCharacter << 8) | *(pString++); + b2ByteCharacter = true; } - if (r27 == 0 || ((u32)param_0 - (u32)local_a4) > param_1) { - if (param_6 == 0 && param_3 != NULL) { - param_3[r29] = 0.5f + f31; + if (iCharacter == 0 || ((u32)pString - (u32)pStringStart) > length) { + if (!param_6 && param_3 != NULL) { + param_3[someIndex] = 0.5f + f31; } - r29++; + someIndex++; break; } else { r25 = true; - local_c0 = field_0x2c; - if (r27 < 0x20) { - if (r27 == 0x1b) { - u16 local_e8 = doEscapeCode(¶m_0, param_5); - if (local_e8 == 'HM') { - if ((param_6 == 0) && (param_3 != NULL)) { - param_3[r29] = 0.5f + f31; + local_c0 = mCursorH; + if (iCharacter < ' ') { + if (iCharacter == '\x1B') { + u16 code = doEscapeCode(&pString, alpha); + if (code == 'HM') { + if (!param_6 && param_3 != NULL) { + param_3[someIndex] = 0.5f + f31; } - field_0x2c = f30; - mCursorV = f28; - r29++; - if (r29 == 0x100) { + + mCursorH = prevCursorH; + mCursorV = prevCursorV; + + someIndex++; + if (someIndex == 0x100) { break; } + f31 = 0.0f; } - if (local_e8) { + + if (code != 0) { r25 = false; } } else { - doCtrlCode(r27); + doCtrlCode(iCharacter); r25 = false; - if (r27 == 10) { - if ((!param_6) && (param_3 != NULL)) { - param_3[r29] = 0.5f + f31; + if (iCharacter == 10) { + if (!param_6 && param_3 != NULL) { + param_3[someIndex] = 0.5f + f31; } - r29++; - if (r29 == 0x100) { + + someIndex++; + if (someIndex == 0x100) { break; } + f31 = 0.0f; } } - } else if (local_f0 && ((u32)param_0 - (u32)local_a4 > (u32)param_1)) { - if ((!param_6) && (param_3 != NULL)) { - param_3[r29] = 0.5f + f31; + } else if (b2ByteCharacter && ((u32)pString - (u32)pStringStart > (u32)length)) { + if (!param_6 && param_3 != NULL) { + param_3[someIndex] = 0.5f + f31; } - r29++; + someIndex++; break; } else { if (mFont->isFixed()) { field_0x34 = mFont->getFixedWidth(); } else { - JUTFont::TWidth uStack_ec; - mFont->getWidthEntry(r27, &uStack_ec); - field_0x34 = uStack_ec.field_0x1; + JUTFont::TWidth width; + mFont->getWidthEntry(iCharacter, &width); + field_0x34 = width.field_0x1; } - field_0x34 *= field_0x18 / mFont->getCellWidth(); - f32 fVar6 = ((field_0x2c + field_0x34) - field_0x24); + field_0x34 *= mScaleX / mFont->getCellWidth(); + + f32 fVar6 = ((mCursorH + field_0x34) - field_0x24); fVar6 = 10000.0f * fVar6; f32 local_c8 = s32(fVar6) / 10000.0f; - if (local_c8 > param_2 && field_0x2c > f30) { - u32 local_e4; - if (local_f0) { - local_e4 = 2; + if (local_c8 > param_2 && mCursorH > prevCursorH) { + u32 characterSize; + if (b2ByteCharacter) { + characterSize = 2; } else { - local_e4 = 1; + characterSize = 1; } - param_0 -= local_e4; + + pString -= characterSize; mCursorV += field_0x14; + if (!param_6 && (param_3 != NULL)) { - param_3[r29] = 0.5f + f31; + param_3[someIndex] = 0.5f + f31; } - r29++; - if (r29 == 0x100) { + + someIndex++; + if (someIndex == 0x100) { break; } - field_0x2c = field_0x24; + + mCursorH = field_0x24; f31 = 0.0f; r25 = false; } else { if (param_6) { if (param_3 != NULL) { - mFont->drawChar_scale(field_0x2c + (f32)(s16)param_3[r29], mCursorV, - (s32)field_0x18, (s32)field_0x1c, r27, true); + mFont->drawChar_scale(mCursorH + (f32)(s16)param_3[someIndex], mCursorV, (s32)mScaleX, (s32)mScaleY, iCharacter, true); } else { - mFont->drawChar_scale(field_0x2c, mCursorV, - (s32)field_0x18, (s32)field_0x1c, r27, true); + mFont->drawChar_scale(mCursorH, mCursorV, (s32)mScaleX, (s32)mScaleY, iCharacter, true); } } - field_0x2c += field_0x34; + mCursorH += field_0x34; } } } if (r25) { - if (field_0x2c - f30 > f31) { - f31 = field_0x2c - f30; + if (mCursorH - prevCursorH > f31) { + f31 = mCursorH - prevCursorH; } - field_0x2c += field_0x10; + mCursorH += field_0x10; field_0x34 += field_0x10; - f32 local_cc = (field_0x1c / mFont->getHeight()) * mFont->getDescent(); + + f32 local_cc = (mScaleY / mFont->getHeight()) * mFont->getDescent(); if (local_a8 < mCursorV + local_cc) { local_a8 = mCursorV + local_cc; } - if (field_0x2c > local_ac) { - local_ac = field_0x2c; + if (mCursorH > local_ac) { + local_ac = mCursorH; } - if (field_0x2c < f29) { - f29 = field_0x2c; + if (mCursorH < f29) { + f29 = mCursorH; } if (local_c0 < f29) { f29 = local_c0; @@ -344,257 +367,260 @@ f32 J2DPrint::parse(u8 const* param_0, int param_1, int param_2, u16* param_3, local_b0 = mCursorV; } } - r27 = *(param_0++); + + iCharacter = *(pString++); } while (true); if (param_3 != NULL) { - param_3[r29] = 0xffff; + param_3[someIndex] = 0xFFFF; } - param_4.field_0x0 = local_ac - f29; - param_4.field_0x4 = local_b4 - local_b0 + mFont->getLeading(); + + size.field_0x0 = local_ac - f29; + size.field_0x4 = local_b4 - local_b0 + mFont->getLeading(); + if (!param_6) { - field_0x2c = f30; - mCursorV = f28; + mCursorH = prevCursorH; + mCursorV = prevCursorV; } - return local_a8 - f28; + + return local_a8 - prevCursorV; } /* 802F52E8-802F5410 2EFC28 0128+00 2/1 0/0 0/0 .text doCtrlCode__8J2DPrintFi */ -void J2DPrint::doCtrlCode(int param_0) { - switch (param_0) { - case 8: - field_0x2c -= field_0x34; +void J2DPrint::doCtrlCode(int iCharacter) { + switch (iCharacter) { + case '\b': + mCursorH -= field_0x34; field_0x34 = 0.0f; break; - case 9: + case '\t': if (field_0x20 > 0) { - f32 fVar1 = field_0x2c; - field_0x2c = field_0x20 + field_0x20 * ((int)field_0x2c / field_0x20); - field_0x34 = field_0x2c - fVar1; + f32 fVar1 = mCursorH; + mCursorH = field_0x20 + field_0x20 * ((int)mCursorH / field_0x20); + field_0x34 = mCursorH - fVar1; } break; - case 10: + case '\n': field_0x34 = 0.0f; - field_0x2c = field_0x24; + mCursorH = field_0x24; mCursorV += field_0x14; break; - case 0xd: + case '\r': field_0x34 = 0.0f; - field_0x2c = field_0x24; + mCursorH = field_0x24; break; - case 0x1c: - field_0x2c += 1.0f; + case '\x1C': + mCursorH += 1.0f; break; - case 0x1d: - field_0x2c -= 1.0f; + case '\x1D': + mCursorH -= 1.0f; break; - case 0x1e: + case '\x1E': mCursorV -= 1.0f; break; - case 0x1f: + case '\x1F': mCursorV += + 1.0f; } } /* 802F5410-802F594C 2EFD50 053C+00 1/1 0/0 0/0 .text doEscapeCode__8J2DPrintFPPCUcUc */ -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; +u16 J2DPrint::doEscapeCode(const u8** ppu8String, u8 alpha) { + const u8* pStringStart = *ppu8String; + u16 code = 0; + + u16 codeLower; + for (int i = 0; i < 2; i++) { + if (mFont->isLeadByte(**ppu8String)) { + codeLower = ((**ppu8String) << 8) | (*ppu8String)[1]; + (*ppu8String) += 2; } else { - uVar3 = **param_0; - (*param_0)++; + codeLower = **ppu8String; + (*ppu8String)++; } - if (uVar3 >= 0x80 || uVar3 < 0x20) { - *param_0 = puVar9; + + if (codeLower >= 0x80 || codeLower < 0x20) { + *ppu8String = pStringStart; return 0; } - uVar11 = ((uVar11) << 8) | uVar3; + + code = (code << 8) | codeLower; } 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); + f32 scaleNumber; + + switch(code) { + case 'CU': // Cursor Up + mCursorV -= getNumberF32(ppu8String, 1.0f, 0.0f, 10); break; - case 'CD': - mCursorV += getNumberF32(param_0, 1.0f, 0.0f, 10); + case 'CD': // Cursor Down + mCursorV += getNumberF32(ppu8String, 1.0f, 0.0f, 10); break; - case 'CL': - field_0x2c -= getNumberF32(param_0, 1.0f, 0.0f, 10); + case 'CL': // Cursor Left + mCursorH -= getNumberF32(ppu8String, 1.0f, 0.0f, 10); break; - case 'CR': - field_0x2c += getNumberF32(param_0, 1.0f, 0.0f, 10); + case 'CR': // Cursor Right + mCursorH += getNumberF32(ppu8String, 1.0f, 0.0f, 10); break; - case 'LU': + case 'LU': // Line Up? mCursorV -= field_0x14; break; - case 'LD': + case 'LD': // Line Down? mCursorV += field_0x14; break; - case 'ST': - s32 val = getNumberS32(param_0, field_0x20, field_0x20, 10); - if (val > 0) { - field_0x20 = val; + case 'ST': { + s32 number = getNumberS32(ppu8String, field_0x20, field_0x20, 10); + if (number > 0) { + field_0x20 = number; } break; - case 'CC': - field_0x8 = getNumberS32(param_0, *(u32*)&mCharColor, *(u32*)&field_0x8, 16); + } + case 'CC': { // Character Color + field_0x8 = getNumberS32(ppu8String, (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); + local_40.a = local_40.a * alpha / 0xff; + local_44.a = local_44.a * alpha / 0xff; + + mFont->setGradColor(local_40, field_0x22 != 0 ? local_44 : local_40); break; - case 'GC': - field_0xc = getNumberS32(param_0, *(u32*)&mGradColor, *(u32*)&field_0xc, 16); + } + case 'GC': { // Gradient Color + field_0xc = getNumberS32(ppu8String, (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); + local_40.a = local_40.a * alpha / 0xFF; + local_44.a = local_44.a * alpha / 0xFF; + + mFont->setGradColor(local_40, field_0x22 != 0 ? local_44 : local_40); break; - case 'FX': - f32 dVar13 = getNumberF32(param_0, mFontSizeX, field_0x18, 10); - if (dVar13 >= 0) { - field_0x18 = dVar13; + } + case 'FX': { // Font Scale X + scaleNumber = getNumberF32(ppu8String, mFontSizeX, mScaleX, 10); + if (scaleNumber >= 0) { + mScaleX = scaleNumber; } break; - case 'FY': - f32 dVar14 = getNumberF32(param_0, mFontSizeY, field_0x1c, 10); - if (dVar14 >= 0) { - field_0x1c = dVar14; + } + case 'FY': { // Font Scale Y + scaleNumber = getNumberF32(ppu8String, mFontSizeY, mScaleY, 10); + if (scaleNumber >= 0) { + mScaleY = scaleNumber; } break; - case 'SH': - field_0x10 = getNumberF32(param_0, field_0x48, field_0x10, 10); + } + case 'SH': // Space Horizontal? + field_0x10 = getNumberF32(ppu8String, mCharSpacing, field_0x10, 10); break; - case 'SV': - field_0x14 = getNumberF32(param_0, field_0x4c, field_0x14, 10); + case 'SV': // Space Vertical? + field_0x14 = getNumberF32(ppu8String, mLineSpacing, 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); + case 'GM': { + field_0x22 = getNumberS32(ppu8String, field_0x22 == 0, field_0x22, 10); + local_40.a = local_40.a * alpha / 0xFF; + local_44.a = local_44.a * alpha / 0xFF; + + mFont->setGradColor(local_40, field_0x22 != 0 ? local_44 : local_40); break; + } case 'HM': break; default: - *param_0 = puVar9; - uVar11 = 0; + *ppu8String = pStringStart; + code = 0; break; } - return uVar11; + + return code; } /* 802F594C-802F59C0 2F028C 0074+00 3/3 0/0 0/0 .text initchar__8J2DPrintFv */ void J2DPrint::initchar() { field_0x8 = mCharColor; field_0xc = mGradColor; - field_0x10 = field_0x48; - field_0x14 = field_0x4c; + field_0x10 = mCharSpacing; + field_0x14 = mLineSpacing; field_0x22 = field_0x5a; field_0x20 = field_0x58; - field_0x18 = mFontSizeX; - field_0x1c = mFontSizeY; + mScaleX = mFontSizeX; + mScaleY = mFontSizeY; } /* 802F59C0-802F5AC4 2F0300 0104+00 1/1 0/0 0/0 .text getNumberS32__8J2DPrintFPPCUclli */ -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; +s32 J2DPrint::getNumberS32(const u8** ppu8String, s32 defaultValue, s32 errorValue, int base) { + const u8* pStringStart = *ppu8String; + if (**ppu8String != '[') { + return defaultValue; } - (*param_0)++; - uVar2 = 0; - char* local_28; + + (*ppu8String)++; + + s32 number = 0; + char* pEnd; if (base == 10) { - uVar2 = strtol((char*)*param_0, &local_28, base); + number = strtol((char*)*ppu8String, &pEnd, 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; + number = strtoul((char*)*ppu8String, &pEnd, base); + if ((u32)pEnd - (u32)*ppu8String != 8) { + if ((u32)pEnd - (u32)*ppu8String == 6) { + number = (number << 8) | 0xFF; } else { - *param_0 = puVar1; - return param_2; + *ppu8String = pStringStart; + return errorValue; } } } - if (local_28[0] != ']') { - *param_0 = puVar1; - return param_2; + + if (pEnd[0] != ']') { + *ppu8String = pStringStart; + return errorValue; } else { - if ((char*)*param_0 == (char*)local_28) { - *param_0 = (const u8*)local_28 + 1; - return param_1; + if ((char*)*ppu8String == pEnd) { + *ppu8String = (const u8*)pEnd + 1; + return defaultValue; } else { - *param_0 = (const u8*)local_28 + 1; + *ppu8String = (const u8*)pEnd + 1; } } - return uVar2; + + return number; } /* 802F5AC4-802F5BF8 2F0404 0134+00 1/1 0/0 0/0 .text getNumberF32__8J2DPrintFPPCUcffi */ -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; +f32 J2DPrint::getNumberF32(const u8** ppu8String, f32 defaultValue, f32 errorValue, int base) { + const u8* pStringStart = *ppu8String; + if (**ppu8String != '[') { + return defaultValue; } - (*param_0)++; - uVar2 = 0; - char* local_28; + + (*ppu8String)++; + + s32 number = 0; + char* pEnd; if (base == 10) { - uVar2 = strtol((char*)*param_0, &local_28, base); + number = strtol((char*)*ppu8String, &pEnd, 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; + number = strtoul((char*)*ppu8String, &pEnd, base); + if ((u32)pEnd - (u32)*ppu8String != 8) { + if ((u32)pEnd - (u32)*ppu8String == 6) { + number = (number << 8) | 0xFF; } else { - *param_0 = puVar1; - return param_2; + *ppu8String = pStringStart; + return errorValue; } } } - if (local_28[0] != ']') { - *param_0 = puVar1; - return param_2; + + if (pEnd[0] != ']') { + *ppu8String = pStringStart; + return errorValue; } else { - if ((char*)*param_0 == (char*)local_28) { - *param_0 = (const u8*)local_28 + 1; - return param_1; + if ((char*)*ppu8String == pEnd) { + *ppu8String = (const u8*)pEnd + 1; + return defaultValue; } else { - *param_0 = (const u8*)local_28 + 1; + *ppu8String = (const u8*)pEnd + 1; } } - return uVar2; -}
\ No newline at end of file + + return number; +} |