Match some screen functions

Author: TheOnlyZac

config/symbol_addrs.txt

@@ -191,6 +191,11 @@ g_difficultyEasy = 0x261e90; // size:0x5c
 g_difficulty = 0x261ef0; // size:0x20
 
 
+// P2/font.c
+
+g_pfont = 0x26227C; // size:0x4
+
+
 // P2/frm.c
 StartupFrame__Fv = 0x15E810; // type:func
 OpenFrame__Fv = 0x15E9F0; // type:func
@@ -337,7 +342,7 @@ PostBlotLoad__FP4BLOT = 0x1AA268; // type:func
 UpdateBlot__FP4BLOT = 0x1AA298; // type:func
 SetBlotAchzDraw__FP4BLOTPc = 0x1AA4F0; // type:func
 SetBlotRgba__FP4BLOTUi = 0x1AA5A0; // type:func
-SetBlotFontScale__FP4BLOTf = 0x1AA788; // type:func
+SetBlotFontScale__FfP4BLOT = 0x1AA788; // type:func
 DrawBlot__FP4BLOT = 0x1AA790; // type:func
 DtAppearBlot__FP4BLOT = 0x1AA898; // type:func
 DtVisibleBlot__FP4BLOT = 0x1AA8A0; // type:func

include/binoc.h

@@ -41,6 +41,14 @@ struct RGBA
     uchar bGreen;
     uchar bBlue;
     uchar bAlpha;
+
+    inline void operator=(const int rgba)
+    {
+        bRed = (rgba >> 24) & 0xFF;
+        bGreen = (rgba >> 16) & 0xFF;
+        bBlue = (rgba >> 8) & 0xFF;
+        bAlpha = rgba & 0xFF;
+    }
 };
 
 class CTextBox
@@ -57,7 +65,7 @@ class CTextBox
     float m_y;
     float m_dx;
     float m_dy;
-    struct RGBA m_rgba;
+    RGBA m_rgba;
     enum JH m_jh;
     enum JV m_jv;
 };

include/font.h

@@ -26,4 +26,6 @@ class CFont
     float m_ryScale;
 };
 
+extern CFont *g_pfont;
+
 #endif // FONT_H

src/P2/screen.c

@@ -1,4 +1,6 @@
 #include <screen.h>
+#include <clock.h>
+#include <font.h>
 
 INCLUDE_ASM(const s32, "P2/screen", StartupScreen__Fv);
 
@@ -16,31 +18,58 @@ INCLUDE_ASM(const s32, "P2/screen", DrawBlots__Fv);
 
 INCLUDE_ASM(const s32, "P2/screen", InitBlot__FP4BLOT5BLOTK);
 
-INCLUDE_ASM(const s32, "P2/screen", PostBlotLoad__FP4BLOT);
+void PostBlotLoad(BLOT *pblot)
+{
+    pblot->pfont = g_pfont;
+    *(int*)&pblot->rgba = 0xff808080; // Union?
+    pblot->achzDraw[0] = 0;
+    pblot->rFontScale = 1.0f;
+}
 
 INCLUDE_ASM(const s32, "P2/screen", UpdateBlot__FP4BLOT);
 
 INCLUDE_ASM(const s32, "P2/screen", SetBlotAchzDraw__FP4BLOTPc);
 
 INCLUDE_ASM(const s32, "P2/screen", SetBlotRgba__FP4BLOTUi);
 
-INCLUDE_ASM(const s32, "P2/screen", SetBlotFontScale__FP4BLOTf);
+void SetBlotFontScale(float rFontScale, BLOT *pblot)
+{
+    pblot->rFontScale = rFontScale;
+}
 
 INCLUDE_ASM(const s32, "P2/screen", DrawBlot__FP4BLOT);
 
 INCLUDE_ASM(const s32, "P2/screen", func_001AA890);
 
-INCLUDE_ASM(const s32, "P2/screen", DtAppearBlot__FP4BLOT);
-
-INCLUDE_ASM(const s32, "P2/screen", DtVisibleBlot__FP4BLOT);
-
-INCLUDE_ASM(const s32, "P2/screen", DtDisappearBlot__FP4BLOT);
-
-INCLUDE_ASM(const s32, "P2/screen", SetBlotDtAppear__FP4BLOTf);
-
-INCLUDE_ASM(const s32, "P2/screen", SetBlotDtVisible__FP4BLOTf);
-
-INCLUDE_ASM(const s32, "P2/screen", SetBlotDtDisappear__FP4BLOTf);
+float DtAppearBlot(BLOT *pblot)
+{
+    return pblot->dtAppear;
+}
+
+float DtVisibleBlot(BLOT *pblot)
+{
+    return pblot->dtVisible;
+}
+
+float DtDisappearBlot(BLOT *pblot)
+{
+    return pblot->dtDisappear;
+}
+
+void SetBlotDtAppear(BLOT *pblot, float dtAppear)
+{
+    pblot->dtAppear = dtAppear;
+}
+
+void SetBlotDtVisible(BLOT *pblot, float dtVisible)
+{
+    pblot->dtVisible = dtVisible;
+}
+
+void SetBlotDtDisappear(BLOT *pblot, float dtDisappear)
+{
+    pblot->dtDisappear = dtDisappear;
+}
 
 INCLUDE_ASM(const s32, "P2/screen", OnBlotReset__FP4BLOT);