From 6e25909257292c4d8a3df7455972c623e0d7c886 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 20 Mar 2021 19:39:04 -0400 Subject: [PATCH] fopScnRq_Execute OK --- include/f/f_op/f_op_scene_req.h | 1 - src/f/f_op/f_op_scene_req.cpp | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/include/f/f_op/f_op_scene_req.h b/include/f/f_op/f_op_scene_req.h index 51bfd6ab40..f6a590d005 100644 --- a/include/f/f_op/f_op_scene_req.h +++ b/include/f/f_op/f_op_scene_req.h @@ -14,7 +14,6 @@ void fopScnRq_ReRequest(void); class scene_request_class { public: node_create_request mCrtReq; - u8 field_0x60[4]; int mFadeRequest; request_of_phase_process_class mReqPhsProcCls; u8 field_0x70[4]; diff --git a/src/f/f_op/f_op_scene_req.cpp b/src/f/f_op/f_op_scene_req.cpp index 453b293977..b7c38eaaaa 100644 --- a/src/f/f_op/f_op_scene_req.cpp +++ b/src/f/f_op/f_op_scene_req.cpp @@ -90,11 +90,20 @@ int fopScnRq_phase_Done(scene_request_class* pScnRq) { return 2; } -asm void fopScnRq_Execute(scene_request_class*) { - nofralloc -#include "f/f_op/f_op_scene_req/asm/func_8001EF24.s" +void fopScnRq_Execute(scene_request_class* pScnRq) { + int tmp = cPhs_Do(&pScnRq->mReqPhsProcCls,pScnRq); + switch (tmp) { + case 2: { + fopScnRq_Execute(pScnRq); + } + } } +// asm void fopScnRq_Execute(scene_request_class*) { +// nofralloc +// #include "f/f_op/f_op_scene_req/asm/func_8001EF24.s" +// } + asm void fopScnRq_PostMethod(void*, scene_request_class*) { nofralloc #include "f/f_op/f_op_scene_req/asm/func_8001EF6C.s"