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 --- src/d/msg/d_msg_object.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/d/msg/d_msg_object.cpp') diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp index e9603f2726..38978405fb 100644 --- a/src/d/msg/d_msg_object.cpp +++ b/src/d/msg/d_msg_object.cpp @@ -447,7 +447,7 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; static u8 s_groupID[2 + 6 /* padding */]; /* 80232A3C-80232A44 -00001 0008+00 0/0 0/0 0/0 .text dMsgObject_getGroupID__Fv */ -s32 dMsgObject_getGroupID() { +s16 dMsgObject_getGroupID() { return (s32) * (s16*)(&s_groupID); } @@ -1802,7 +1802,7 @@ asm void dMsgObject_c::setProcessID(unsigned int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::getActor() { +asm fopAc_ac_c* dMsgObject_c::getActor() { nofralloc #include "asm/d/msg/d_msg_object/getActor__12dMsgObject_cFv.s" } -- cgit v1.2.3