Merged dMesg_tControl classes (#670)

* Merged dMesg_tControl class definitions * Fix build * Fix * Fixed error
zeldaret · Jul 17, 2024 · 2cd767b · 2cd767b
1 parent bad4ac2
commit 2cd767b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/include/d/d_demo.h b/include/d/d_demo.h
@@ -24,13 +24,7 @@
 #include "f_pc/f_pc_base.h"
 
 class fopAc_ac_c;
-
-class dMesg_tControl : public JMessage::TControl {
-public:
-    dMesg_tControl();
-
-    /* 0x3C */ u8 field_0x3C[0x74 - 0x3C];
-};  // Size: 0x74
+class dMesg_tControl;
 
 class dDemo_actor_c : public JStage::TActor {
 public:

diff --git a/include/d/d_mesg.h b/include/d/d_mesg.h
@@ -2,8 +2,8 @@
 #define D_MESG_H
 
 #include "dolphin/types.h"
+#include "JSystem/JMessage/control.h"
 
-namespace JMessage { class TControl; };
 class JUTFont;
 class JKRExpHeap;
 
@@ -22,7 +22,7 @@ class dMesg_outFont_c {
     void _setAlpha(u8);
 };
 
-class dMesg_tControl {
+class dMesg_tControl : public JMessage::TControl {
 public:
     void getCharCode() {}
     void getCharSpace() {}
@@ -47,7 +47,10 @@ class dMesg_tControl {
     void setRubyFont(JUTFont*) {}
 
     dMesg_tControl();
-    void do_word(u32);
+    const char* do_word(u32);
+
+public:
+    /* 0x3C */ u8 field_0x3C[0x74 - 0x3C];
 };
 
 class dMesg_tSequenceProcessor {

diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp
@@ -6,6 +6,7 @@
 #include "d/d_demo.h"
 #include "f_op/f_op_camera_mng.h"
 #include "d/d_com_inf_game.h"
+#include "d/d_mesg.h"
 #include "m_Do/m_Do_printf.h"
 
 /* 800692C4-80069330       .text __ct__13dDemo_actor_cFv */

diff --git a/src/d/d_mesg.cpp b/src/d/d_mesg.cpp
@@ -43,7 +43,7 @@ dMesg_tControl::dMesg_tControl() {
 }
 
 /* 801E0274-801E0288       .text do_word__14dMesg_tControlFUl */
-void dMesg_tControl::do_word(u32) {
+const char* dMesg_tControl::do_word(u32) {
     /* Nonmatching */
 }