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

clang-format + fixes for jasper

This commit is contained in:
Pheenoh 2021-02-21 19:41:58 -05:00
parent 9fd3148994
commit c71234f308
No known key found for this signature in database
GPG Key ID: 4312662758CE7D5A
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/f/f_op/f_op_scene_iter.h
View File

@ -2,9 +2,9 @@
#define F_F_OP_SCENE_ITER_H_ #define F_F_OP_SCENE_ITER_H_
#include "dolphin/types.h" #include "dolphin/types.h"
#include "f/f_pc/f_pc_base.h"
typedef void* (*fop_ScnItFunc)(void*, void*); typedef void* (*fop_ScnItFunc)(base_process_class* pProc, void* pUserData);
void* fopScnIt_Judge(fop_ScnItFunc pFunc1, void* pUserData);
void* fopScnIt_Judge(fop_ScnItFunc pFunc1, void* pFunc2);
#endif #endif

2
include/f/f_op/f_op_scene_req.h
View File

@ -6,7 +6,7 @@ void fopScnRq_Handler(void);
void fopScnRq_ReRequest(void); void fopScnRq_ReRequest(void);
} }
u32 fopScnRq_Request(int,scene_class*,s16,void*,s16,u16); u32 fopScnRq_Request(int, scene_class*, s16, void*, s16, u16);
u32 fopScnRq_ReRequest(unsigned int, s16, void*); u32 fopScnRq_ReRequest(unsigned int, s16, void*);
#endif #endif

2
src/d/d_com/d_com_inf_game.cpp
View File

@ -4,13 +4,13 @@
#include "d/d_bg/d_bg_s/d_bg_s.h" #include "d/d_bg/d_bg_s/d_bg_s.h"
#include "d/d_item/d_item/d_item.h" #include "d/d_item/d_item/d_item.h"
#include "d/d_kankyo/d_kankyo.h" #include "d/d_kankyo/d_kankyo.h"
#include "f/f_op/f_op_scene_mng.h"
#include "global.h" #include "global.h"
#include "m_Do/m_Do_Reset/m_Do_Reset.h" #include "m_Do/m_Do_Reset/m_Do_Reset.h"
#include "m_Do/m_Do_audio/m_Do_audio.h" #include "m_Do/m_Do_audio/m_Do_audio.h"
#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h" #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
#include "m_Do/m_Do_ext/m_Do_ext.h" #include "m_Do/m_Do_ext/m_Do_ext.h"
#include "msl_c/string.h" #include "msl_c/string.h"
#include "f/f_op/f_op_scene_mng.h"
extern "C" { extern "C" {
bool dComIfGp_checkMapShow(void); bool dComIfGp_checkMapShow(void);

3
src/f/f_op/f_op_msg_mng.cpp
View File

@ -43,11 +43,8 @@ void fopMsgM_setStageLayer(void);
void fopMsgM_valueIncrease(void); void fopMsgM_valueIncrease(void);
void fopScnM_SearchByID(void); void fopScnM_SearchByID(void);
void fop_Timer_create(void); void fop_Timer_create(void);
void fpcBs_Is_JustOfType(void);
void fpcEx_SearchByID(void); void fpcEx_SearchByID(void);
void fpcLy_CurrentLayer(void);
void fpcM_Delete(void); void fpcM_Delete(void);
void fpcPi_Change(void);
void fpcSCtRq_Request(void); void fpcSCtRq_Request(void);
void func_80020158(void); void func_80020158(void);
void func_800202CC(void); void func_800202CC(void);

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

@ -14,11 +14,11 @@ void fopScnRq_Request__FiP11scene_classsPvsUs(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 unsigned int l_scnRqID; extern unsigned int l_scnRqID;
// matches but is proabably wrong // matches but can be improved
void* fopScnM_SearchByID(unsigned int id) { void* fopScnM_SearchByID(unsigned int id) {
unsigned int local_8[2]; unsigned int local_8[2];
local_8[0] = id; local_8[0] = id;
return fopScnIt_Judge(fpcSch_JudgeByID, (void*)local_8); return fopScnIt_Judge((fop_ScnItFunc)fpcSch_JudgeByID, (void*)local_8);
} }
int fopScnM_ChangeReq(scene_class* pScene, s16 param_2, s16 param_3, u16 param_4) { int fopScnM_ChangeReq(scene_class* pScene, s16 param_2, s16 param_3, u16 param_4) {