diff --git a/include/JSystem/JUtility/TColor.h b/include/JSystem/JUtility/TColor.h index 19719d2fd83..d256af3bf35 100644 --- a/include/JSystem/JUtility/TColor.h +++ b/include/JSystem/JUtility/TColor.h @@ -31,6 +31,11 @@ public: void set(u32 u32Color) { *(u32*)&mColor = u32Color; } void set(_GXColor gxColor) { mColor = gxColor; } + u8 R() const { return mColor.r; } + u8 G() const { return mColor.g; } + u8 B() const { return mColor.b; } + u8 A() const { return mColor.a; } + private: _GXColor mColor; }; diff --git a/libs/JSystem/JUtility/JUTDirectPrint.cpp b/libs/JSystem/JUtility/JUTDirectPrint.cpp index 61f59887d09..44854a5f8e8 100644 --- a/libs/JSystem/JUtility/JUTDirectPrint.cpp +++ b/libs/JSystem/JUtility/JUTDirectPrint.cpp @@ -366,14 +366,10 @@ void JUTDirectPrint::drawString_f(u16 position_x, u16 position_y, char const* fo /* 802E4798-802E47C8 2DF0D8 0030+00 0/0 2/2 0/0 .text * setCharColor__14JUTDirectPrintFQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTDirectPrint::setCharColor(JUtility::TColor param_0) { - nofralloc -#include "asm/JSystem/JUtility/JUTDirectPrint/setCharColor__14JUTDirectPrintFQ28JUtility6TColor.s" +void JUTDirectPrint::setCharColor(JUtility::TColor color) { + setCharColor(color.R(), color.G(), color.B()); } -#pragma pop + /* ############################################################################################## */ /* 80456060-80456068 004660 0008+00 1/1 0/0 0/0 .sdata2 @503 */