diff --git a/include/f/f_op/f_op_scene.h b/include/f/f_op/f_op_scene.h index 0258131b3ba..0ff9955abf8 100644 --- a/include/f/f_op/f_op_scene.h +++ b/include/f/f_op/f_op_scene.h @@ -11,7 +11,7 @@ public: /* 0x008 */ u8 field_0x08[0x24]; /* 0x02C */ int* field_0x2C; /* 0x030 */ u8 field_0x30[0x17C]; - /* 0x1AC */ nodedraw_method_class* mpNodedrawMtd; + /* 0x1AC */ process_method_class* mpProcessMtd; }; #endif \ No newline at end of file diff --git a/src/f/f_op/f_op_scene.cpp b/src/f/f_op/f_op_scene.cpp index ccc8fcbe2d8..f6f208ffa3a 100644 --- a/src/f/f_op/f_op_scene.cpp +++ b/src/f/f_op/f_op_scene.cpp @@ -26,21 +26,16 @@ void fopScn_Create__FPv(void); // additional symbols needed for f_op_scene.cpp // autogenerated by split.py v0.4 at 2021-02-15 21:09:24.524304 -// fopScn_Draw__FP11scene_class -// fopScn_Draw__FP11scene_class(scene_class*) void fopScn_Draw(scene_class* pScene) { - fpcNd_DrawMethod(pScene->mpNodedrawMtd,pScene); + fpcNd_DrawMethod((nodedraw_method_class*)pScene->mpProcessMtd,pScene); } void fopScn_Execute(scene_class* pScene) { - fpcMtd_Execute((process_method_class*)pScene->mpNodedrawMtd,pScene); + fpcMtd_Execute(pScene->mpProcessMtd,pScene); } -// fopScn_IsDelete__FPv -// fopScn_IsDelete(void*) -asm void fopScn_IsDelete(void*) { - nofralloc -#include "f/f_op/f_op_scene/asm/func_8001EB84.s" +s32 fopScn_IsDelete(void* param_1) { + return fpcMtd_IsDelete(((scene_class*)param_1)->mpProcessMtd,param_1); } // fopScn_Delete__FPv