From 226ccb02208e4e46fa326c6a79c67e50c63d3ae3 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 27 Mar 2021 20:22:15 -0400 Subject: [PATCH] fopMsg_Execute OK --- src/f/f_op/f_op_msg.cpp | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/f/f_op/f_op_msg.cpp b/src/f/f_op/f_op_msg.cpp index 95fb0af0cb..b1a4e1dea4 100644 --- a/src/f/f_op/f_op_msg.cpp +++ b/src/f/f_op/f_op_msg.cpp @@ -29,23 +29,32 @@ void fopMsg_Create__FPv(void); // additional symbols needed for f_op_msg.cpp // autogenerated by split.py v0.4 at 2021-02-15 21:05:32.071235 extern u8 lbl_80450CF0; -extern u8 lbl_80451124; +extern s8 lbl_80451124; struct unk { u8 field_0x00[0xd8]; leafdraw_method_class* mpDrawMtd; }; +struct unk2 { + u8 field_0x00[0xd8]; + process_method_class* mpDrawMtd; +}; + void fopMsg_Draw(void* pUserData) { unk* pUnk = (unk*)pUserData; fpcLf_DrawMethod(pUnk->mpDrawMtd,pUserData); } -// fopMsg_Execute__FPv -// fopMsg_Execute(void*) -asm void fopMsg_Execute(void*) { - nofralloc -#include "f/f_op/f_op_msg/asm/func_8001F4B0.s" +s32 fopMsg_Execute(void* pUserData) { + s32 ret = 1; + unk2* pUnk2 = (unk2*)pUserData; + + if (!lbl_80451124) { + ret = fpcMtd_Execute(pUnk2->mpDrawMtd,pUserData); + } + + return ret; } // fopMsg_IsDelete__FPv