From 612f26c132280da43ecfa5fa8c8cc32966f06eb6 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Tue, 25 Jan 2022 12:24:14 -0800 Subject: d_kankyo_wether / d_eye_hl (#178) * d_eye_hl / d_kankyo_wether wip * more d_kankyo_wether + format * remove asm * some d_kankyo wip * fix dccs vtable * some m_Do_graphic / d_meter2_draw work --- include/d/msg/d_msg_object.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'include/d/msg') diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h index 903cc910f2..cd0dcd27e4 100644 --- a/include/d/msg/d_msg_object.h +++ b/include/d/msg/d_msg_object.h @@ -3,12 +3,12 @@ #include "JSystem/J2DGraph/J2DTextbox.h" #include "d/com/d_com_inf_game.h" +#include "d/msg/d_msg_class.h" #include "dolphin/types.h" -class msg_class; class COutFont_c; -class dMsgObject_c { +class dMsgObject_c : public msg_class { public: /* 80233284 */ void _create(msg_class*); /* 80233590 */ void _execute(); @@ -113,7 +113,7 @@ public: char*, char*, s16*); /* 80238174 */ void getMsgDtPtr(); /* 80238188 */ void setProcessID(unsigned int); - /* 8023819C */ void getActor(); + /* 8023819C */ static fopAc_ac_c* getActor(); /* 802381C0 */ void getpTalkActor(); /* 802381D4 */ void getIdx(); /* 802381E8 */ void getNodeIdx(); @@ -149,8 +149,12 @@ public: /* 8023860C */ void setEquipBombInfo(); /* 80238638 */ void getItemEquipButton(); /* 8023864C */ void setSelectCancelPos(u8); + + /* 0x100 */ fopAc_ac_c* field_0x100; }; +s16 dMsgObject_getGroupID(); + inline dMsgObject_c* dMsgObject_getMsgObjectClass() { return dComIfGp_getMsgObjectClass(); } -- cgit v1.2.3