dol2asm OK

libs/JSystem/JUtility/JUTFont.cpp

@@ -1,53 +1,107 @@
-#include "JSystem/JUtility/JUTFont/JUTFont.h"
+// 
+// Generated By: dol2asm
+// Translation Unit: JUTFont
+// 
 
-JUTFont::JUTFont() : mColor1(), mColor2(), mColor3(), mColor4() {
-    unk4 = 0;
+#include "dol2asm.h"
+#include "dolphin/types.h"
+#include "JSystem/JUtility/JUTFont.h"
+
+// 
+// Types:
+// 
+
+struct JUtility {
+	struct TColor {
+	};
+
+};
+
+struct JUTFont {
+	/* 802DECF8 */ JUTFont();
+	/* 802DED24 */ void initialize_state();
+	/* 802DED70 */ void setCharColor(JUtility::TColor);
+	/* 802DEDC4 */ void setGradColor(JUtility::TColor, JUtility::TColor);
+	/* 802DEE28 */ void drawString_size_scale(f32, f32, f32, f32, char const*, u32, bool);
+};
+
+// 
+// Forward References:
+// 
+
+
+extern "C" void __ct__7JUTFontFv();
+extern "C" void initialize_state__7JUTFontFv();
+extern "C" void setCharColor__7JUTFontFQ28JUtility6TColor();
+extern "C" void setGradColor__7JUTFontFQ28JUtility6TColorQ28JUtility6TColor();
+extern "C" void drawString_size_scale__7JUTFontFffffPCcUlb();
+
+// 
+// External References:
+// 
+
+extern "C" extern void* __vt__7JUTFont[17];
+
+extern "C" void _savegpr_27();
+extern "C" void _restgpr_27();
+extern "C" extern void* __vt__7JUTFont[17];
+
+// 
+// Declarations:
+// 
+
+/* 802DECF8-802DED24 002C+00 s=0 e=2 z=0  None .text      __ct__7JUTFontFv                                             */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm JUTFont::JUTFont() {
+	nofralloc
+#include "asm/JSystem/JUtility/JUTFont/__ct__7JUTFontFv.s"
 }
+#pragma pop
 
-void JUTFont::initialize_state() {
-    setCharColor(JUtility::TColor());
-    unk5 = false;
-    unk8 = 0;
-    unk4 = false;
+
+/* 802DED24-802DED70 004C+00 s=0 e=9 z=0  None .text      initialize_state__7JUTFontFv                                 */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void JUTFont::initialize_state() {
+	nofralloc
+#include "asm/JSystem/JUtility/JUTFont/initialize_state__7JUTFontFv.s"
 }
+#pragma pop
 
-void JUTFont::setCharColor(JUtility::TColor col1) {
-    mColor1 = col1;
-    mColor2 = col1;
-    mColor3 = col1;
-    mColor4 = col1;
+
+/* 802DED70-802DEDC4 0054+00 s=1 e=3 z=0  None .text      setCharColor__7JUTFontFQ28JUtility6TColor                    */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void JUTFont::setCharColor(JUtility::TColor param_0) {
+	nofralloc
+#include "asm/JSystem/JUtility/JUTFont/setCharColor__7JUTFontFQ28JUtility6TColor.s"
 }
+#pragma pop
 
-void JUTFont::setGradColor(JUtility::TColor col1, JUtility::TColor col2) {
-    mColor1 = col1;
-    mColor2 = col1;
-    mColor3 = col2;
-    mColor4 = col2;
+
+/* 802DEDC4-802DEE28 0064+00 s=0 e=2 z=0  None .text      setGradColor__7JUTFontFQ28JUtility6TColorQ28JUtility6TColor  */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void JUTFont::setGradColor(JUtility::TColor param_0, JUtility::TColor param_1) {
+	nofralloc
+#include "asm/JSystem/JUtility/JUTFont/setGradColor__7JUTFontFQ28JUtility6TColorQ28JUtility6TColor.s"
 }
+#pragma pop
 
-#ifdef NONMATCHING  // regalloc
-f32 JUTFont::drawString_size_scale(f32 a1, f32 a2, f32 a3, f32 a4, const char* str, u32 usz,
-                                   bool a7) {
-    f32 temp = a1;
 
-    for (; usz > 0; usz--, str++) {
-        u32 b = *(u8*)str;
-        if (isLeadByte(b)) {
-            str++;
-            b = (b << 8 | *(u8*)str);
-            usz--;
-        }
-
-        a1 += drawChar_scale(temp, a2, a3, a4, b, a7);
-        a7 = 1;
-    }
-
-    return a1 - temp;
+/* 802DEE28-802DEF48 0120+00 s=0 e=3 z=0  None .text      drawString_size_scale__7JUTFontFffffPCcUlb                   */
+#pragma push
+#pragma optimization_level 0
+#pragma optimizewithasm off
+asm void JUTFont::drawString_size_scale(f32 param_0, f32 param_1, f32 param_2, f32 param_3, char const* param_4, u32 param_5, bool param_6) {
+	nofralloc
+#include "asm/JSystem/JUtility/JUTFont/drawString_size_scale__7JUTFontFffffPCcUlb.s"
 }
-#else
-asm f32 JUTFont::drawString_size_scale(f32 a1, f32 a2, f32 a3, f32 a4, const char* a5, u32 usz,
-                                       bool a7) {
-    nofralloc
-#include "JSystem/JUtility/JUTFont/asm/drawString_size_scale.s"
-}
-#endif
+#pragma pop
+
+