From d58a1ab643c59b498de5fa0eceab31a35ff05972 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 27 Mar 2021 20:18:32 -0400 Subject: [PATCH] fopMsg_Draw OK --- include/f/f_pc/f_pc_leaf.h | 28 ++++++++++++---------------- ldscript.lcf | 5 +++++ src/f/f_op/f_op_camera.cpp | 1 + 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/include/f/f_pc/f_pc_leaf.h b/include/f/f_pc/f_pc_leaf.h index a903f647362..c0916f5bf2c 100644 --- a/include/f/f_pc/f_pc_leaf.h +++ b/include/f/f_pc/f_pc_leaf.h @@ -8,24 +8,24 @@ #include "global.h" typedef struct leafdraw_method_class { - process_method_class mBase; - process_method_func mpDrawFunc; + /* 0x00 */ process_method_class mBase; + /* 0x10 */ process_method_func mpDrawFunc; } leafdraw_method_class; typedef struct leafdraw_class { - base_process_class mBase; - leafdraw_method_class* mpDrawMtd; - s8 mbUnk0; - u8 mbUnk1; - draw_priority_class mDwPi; + /* 0x00 */ base_process_class mBase; + /* 0xB8 */ leafdraw_method_class* mpDrawMtd; + /* 0xBC */ s8 mbUnk0; + /* 0xBD */ u8 mbUnk1; + /* 0xBE */ draw_priority_class mDwPi; } leafdraw_class; typedef struct leaf_process_profile_definition { - process_profile_definition mBase; - leafdraw_method_class* mLfDrwMth; - s16 unk20; - u8 unk22[2]; - s32 unk24; + /* 0x00 */ process_profile_definition mBase; + /* 0x1C */ leafdraw_method_class* mLfDrwMth; + /* 0x20 */ s16 unk20; + /* 0x22 */ u8 unk22[2]; + /* 0x24 */ s32 unk24; } leaf_process_profile_definition; s32 fpcLf_GetPriority(const leafdraw_class* pLeaf); @@ -36,8 +36,4 @@ s32 fpcLf_IsDelete(leafdraw_class* pLeaf); s32 fpcLf_Delete(leafdraw_class* pLeaf); s32 fpcLf_Create(leafdraw_class* pLeaf); -extern "C" { -void fpcLf_GetPriority__FPC14leafdraw_class(void); -} - #endif diff --git a/ldscript.lcf b/ldscript.lcf index f5e273bb906..d60e6bba6c6 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -3322,6 +3322,11 @@ fopMsgM_destroyExpHeap__FP10JKRExpHeap fopMsgM_messageGet__FPcUl insert__10J2DPictureFPCcUcf append__10J2DPictureFPCcf +fopMsg_Draw__FPv +fopMsg_Execute__FPv +fopMsg_IsDelete__FPv +fopMsg_Delete__FPv +fopMsg_Create__FPv } /* .init 80003100 - 80005600 diff --git a/src/f/f_op/f_op_camera.cpp b/src/f/f_op/f_op_camera.cpp index d8f60e9eadc..f0119a8ee18 100644 --- a/src/f/f_op/f_op_camera.cpp +++ b/src/f/f_op/f_op_camera.cpp @@ -17,6 +17,7 @@ void func_8001E1C8(void); void func_8001E21C(void); void func_8001E270(void); void fopDwTg_DrawQTo__FP16create_tag_class(void); +void fpcLf_GetPriority__FPC14leafdraw_class(void); } // additional symbols needed for f_op_camera.cpp