Match CConsoleOutputWindow, regswaps in constructor

Former-commit-id: 27bd20ff1d

include/Kyoto/Text/CFont.hpp

@@ -0,0 +1,14 @@
+#ifndef _CFONT
+#define _CFONT
+
+class CFont {
+public:
+  CFont(float scale);
+  ~CFont();
+  int CharWidth(char) const;
+private:
+  float mFontSize;
+  float mScale;
+};
+
+#endif // _CFONT

include/MetroidPrime/CArchMsgParmReal32.hpp

@@ -6,11 +6,12 @@
 #include "MetroidPrime/CArchitectureMessage.hpp"
 
 class CArchMsgParmReal32 : public IArchitectureMessageParm {
-  float mVal;
-
 public:
   CArchMsgParmReal32(float);
   ~CArchMsgParmReal32();
+  float GetReal() const { return mVal; }
+private:
+  float mVal;
 };
 
 #endif // _CARCHMSGPARMREAL32

include/MetroidPrime/CArchitectureMessage.hpp

@@ -31,6 +31,9 @@ struct IArchitectureMessageParm {
 IArchitectureMessageParm::~IArchitectureMessageParm() {}
 
 class CArchitectureMessage {
+
+public:
+  EArchMsgType GetType() const { return x4_type; }
 private:
   EArchMsgTarget x0_target;
   EArchMsgType x4_type;

include/MetroidPrime/CConsoleOutputWindow.hpp

@@ -1,17 +1,29 @@
 #ifndef _CCONSOLEOUTPUTWINDOW
 #define _CCONSOLEOUTPUTWINDOW
 
-#include "types.h"
-
 #include "MetroidPrime/CIOWin.hpp"
 
+#include "Kyoto/Text/CFont.hpp"
+
+#include <rstl/vector.hpp>
+
 class CConsoleOutputWindow : public CIOWin {
+  static CConsoleOutputWindow* mInstance;
 public:
   CConsoleOutputWindow(int, float, float);
 
   ~CConsoleOutputWindow() override;
   EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override;
-  void Draw() override;
+  void Update(float);
+  void Draw() const;
+private:
+  CFont mFont;
+  float mUnk;
+  rstl::vector<rstl::string> mText;
+  rstl::vector<float> mUnkFloats;
+  int x40_;
+  int x44_;
+  int x48_;
 };
 
 #endif // _CCONSOLEOUTPUTWINDOW

include/MetroidPrime/Decode.hpp

@@ -0,0 +1,15 @@
+#ifndef _DECODE
+#define _DECODE
+
+#include "MetroidPrime/CArchMsgParmInt32.hpp"
+#include "MetroidPrime/CArchMsgParmInt32Int32VoidPtr.hpp"
+#include "MetroidPrime/CArchMsgParmNull.hpp"
+#include "MetroidPrime/CArchMsgParmReal32.hpp"
+#include "MetroidPrime/CArchMsgParmUserInput.hpp"
+#include "MetroidPrime/CArchMsgParmControllerStatus.hpp"
+
+namespace MakeMsg {
+  const CArchMsgParmReal32& GetParmTimerTick(const CArchitectureMessage& msg);
+}
+
+#endif // _DECODE