falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fopScnM_SearchByID OK

This commit is contained in:
Pheenoh 2021-02-21 10:43:08 -05:00
parent 5fbe9419f9
commit f256d97ddf
No known key found for this signature in database
GPG Key ID: 4312662758CE7D5A
4 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/f/f_pc/f_pc_searcher.h
View File

@ -7,8 +7,8 @@
extern "C" { extern "C" {
void* fpcSch_JudgeForPName(base_process_class* pProc, void* pUserData); void* fpcSch_JudgeForPName(void* pProc, void* pUserData);
void* fpcSch_JudgeByID(base_process_class* pProc, void* pUserData); void* fpcSch_JudgeByID(void* pProc, void* pUserData);
}; };
#endif #endif

3
include/mwcc.h
View File

@ -18,7 +18,6 @@ void _savegpr_26(void);
void _savegpr_27(void); void _savegpr_27(void);
void _savegpr_28(void); void _savegpr_28(void);
void _savegpr_29(void); void _savegpr_29(void);
void _restgpr_14(void); void _restgpr_14(void);
void _restgpr_15(void); void _restgpr_15(void);
void _restgpr_16(void); void _restgpr_16(void);
@ -35,13 +34,11 @@ void _restgpr_26(void);
void _restgpr_27(void); void _restgpr_27(void);
void _restgpr_28(void); void _restgpr_28(void);
void _restgpr_29(void); void _restgpr_29(void);
void _savefpr_25(void); void _savefpr_25(void);
void _savefpr_26(void); void _savefpr_26(void);
void _savefpr_27(void); void _savefpr_27(void);
void _savefpr_28(void); void _savefpr_28(void);
void _savefpr_29(void); void _savefpr_29(void);
void _restfpr_25(void); void _restfpr_25(void);
void _restfpr_26(void); void _restfpr_26(void);
void _restfpr_27(void); void _restfpr_27(void);

17
src/f/f_op/f_op_scene_mng.cpp
View File

@ -2,6 +2,7 @@
#include "f/f_op/f_op_scene_mng.h" #include "f/f_op/f_op_scene_mng.h"
#include "f/f_op/f_op_scene_iter.h" #include "f/f_op/f_op_scene_iter.h"
#include "f/f_pc/f_pc_searcher.h"
#include "global.h" #include "global.h"
// additional symbols needed for f_op_scene_mng.cpp // additional symbols needed for f_op_scene_mng.cpp
@ -16,7 +17,6 @@ void fopScnM_SearchByID(void);
void fopScnRq_Handler(void); void fopScnRq_Handler(void);
void fopScnRq_ReRequest(void); void fopScnRq_ReRequest(void);
void fopScnRq_Request(void); void fopScnRq_Request(void);
void fpcSch_JudgeByID(void);
void fopScnIt_Judge__FPFPvPv_PvPv(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 // autogenerated by split.py v0.4 at 2021-02-13 20:33:37.409412
extern u8 lbl_804505B8; extern u8 lbl_804505B8;
// fopScnM_SearchByID__FUi // matches but is proabably wrong
// fopScnM_SearchByID(unsigned int) void* fopScnM_SearchByID(unsigned int id) {
// void* fopScnM_SearchByID(unsigned int id) { unsigned int local_8[2];
// unsigned int tmp = id + 8; local_8[0] = id;
// return fopScnIt_Judge((fop_ScnItFunc)fpcSch_JudgeByID, (void*)tmp); return fopScnIt_Judge(fpcSch_JudgeByID, (void*)local_8);
// }
asm void* fopScnM_SearchByID(unsigned int) {
nofralloc
#include "f/f_op_scene_mng/asm/func_8001ECB0.s"
} }
extern "C" { extern "C" {

8
src/f/f_pc/f_pc_searcher.cpp
View File

@ -2,16 +2,16 @@
#include "f/f_pc/f_pc_searcher.h" #include "f/f_pc/f_pc_searcher.h"
#include "f/f_pc/f_pc_base.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; s16 pname = *(s16*)pUserData;
if (pProc->mProcName == pname) if (((base_process_class*)pProc)->mProcName == pname)
return pProc; return pProc;
return NULL; return NULL;
} }
void* fpcSch_JudgeByID(base_process_class* pProc, void* pUserData) { void* fpcSch_JudgeByID(void* pProc, void* pUserData) {
s32 id = *(s32*)pUserData; s32 id = *(s32*)pUserData;
if (pProc->mBsPcId == id) if (((base_process_class*)pProc)->mBsPcId == id)
return pProc; return pProc;
return NULL; return NULL;
} }