diff options
| author | Pheenoh <pheenoh@gmail.com> | 2021-02-21 10:43:08 -0500 |
|---|---|---|
| committer | Pheenoh <pheenoh@gmail.com> | 2021-02-21 10:43:08 -0500 |
| commit | f256d97ddf87a785a593f1892e6a8d72ecb311ed (patch) | |
| tree | 7c9142a26e08131a260b58a7ffc72852a0b0127d /src | |
| parent | 5fbe9419f9af28560497f42eb951cd029ceb44d7 (diff) | |
fopScnM_SearchByID OK
Diffstat (limited to 'src')
| -rw-r--r-- | src/f/f_op/f_op_scene_mng.cpp | 17 | ||||
| -rw-r--r-- | src/f/f_pc/f_pc_searcher.cpp | 8 |
2 files changed, 10 insertions, 15 deletions
diff --git a/src/f/f_op/f_op_scene_mng.cpp b/src/f/f_op/f_op_scene_mng.cpp index cecabc5746..31508686d9 100644 --- a/src/f/f_op/f_op_scene_mng.cpp +++ b/src/f/f_op/f_op_scene_mng.cpp @@ -2,6 +2,7 @@ #include "f/f_op/f_op_scene_mng.h" #include "f/f_op/f_op_scene_iter.h" +#include "f/f_pc/f_pc_searcher.h" #include "global.h" // additional symbols needed for f_op_scene_mng.cpp @@ -16,7 +17,6 @@ void fopScnM_SearchByID(void); void fopScnRq_Handler(void); void fopScnRq_ReRequest(void); void fopScnRq_Request(void); -void fpcSch_JudgeByID(void); void fopScnIt_Judge__FPFPvPv_PvPv(void); } @@ -24,16 +24,11 @@ void fopScnIt_Judge__FPFPvPv_PvPv(void); // autogenerated by split.py v0.4 at 2021-02-13 20:33:37.409412 extern u8 lbl_804505B8; -// fopScnM_SearchByID__FUi -// fopScnM_SearchByID(unsigned int) -// void* fopScnM_SearchByID(unsigned int id) { -// unsigned int tmp = id + 8; -// return fopScnIt_Judge((fop_ScnItFunc)fpcSch_JudgeByID, (void*)tmp); -// } - -asm void* fopScnM_SearchByID(unsigned int) { - nofralloc -#include "f/f_op_scene_mng/asm/func_8001ECB0.s" +// matches but is proabably wrong +void* fopScnM_SearchByID(unsigned int id) { + unsigned int local_8[2]; + local_8[0] = id; + return fopScnIt_Judge(fpcSch_JudgeByID, (void*)local_8); } extern "C" { diff --git a/src/f/f_pc/f_pc_searcher.cpp b/src/f/f_pc/f_pc_searcher.cpp index 04f196553f..bc6ac378a2 100644 --- a/src/f/f_pc/f_pc_searcher.cpp +++ b/src/f/f_pc/f_pc_searcher.cpp @@ -2,16 +2,16 @@ #include "f/f_pc/f_pc_searcher.h" #include "f/f_pc/f_pc_base.h" -void* fpcSch_JudgeForPName(base_process_class* pProc, void* pUserData) { +void* fpcSch_JudgeForPName(void* pProc, void* pUserData) { s16 pname = *(s16*)pUserData; - if (pProc->mProcName == pname) + if (((base_process_class*)pProc)->mProcName == pname) return pProc; return NULL; } -void* fpcSch_JudgeByID(base_process_class* pProc, void* pUserData) { +void* fpcSch_JudgeByID(void* pProc, void* pUserData) { s32 id = *(s32*)pUserData; - if (pProc->mBsPcId == id) + if (((base_process_class*)pProc)->mBsPcId == id) return pProc; return NULL; }
\ No newline at end of file |