From c262bbfc4d640b0c8d157118a7ae26c1fc2a4baf Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sun, 21 Feb 2021 21:49:57 -0500 Subject: [PATCH] clang-format --- include/f/f_op/f_op_kankyo_mng.h | 2 +- src/f/f_op/f_op_kankyo_mng.cpp | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/include/f/f_op/f_op_kankyo_mng.h b/include/f/f_op/f_op_kankyo_mng.h index 5aab1cdf60..e1eaca4d76 100644 --- a/include/f/f_op/f_op_kankyo_mng.h +++ b/include/f/f_op/f_op_kankyo_mng.h @@ -1,8 +1,8 @@ #ifndef F_F_OP_KANKYO_MNG_H_ #define F_F_OP_KANKYO_MNG_H_ -#include "dolphin/types.h" #include "SComponent/c_xyz.h" +#include "dolphin/types.h" typedef int (*fopKyMCreateFunc)(void*); diff --git a/src/f/f_op/f_op_kankyo_mng.cpp b/src/f/f_op/f_op_kankyo_mng.cpp index ac80469912..cf7d81bbc2 100644 --- a/src/f/f_op/f_op_kankyo_mng.cpp +++ b/src/f/f_op/f_op_kankyo_mng.cpp @@ -1,11 +1,11 @@ /* f_op_kankyo_mng.cpp autogenerated by split.py v0.4 at 2021-02-15 20:20:10.089723 */ -#include "d/d_com/d_com_inf_game/d_com_inf_game.h" -#include "SComponent/c_malloc.h" +#include "f/f_op/f_op_kankyo_mng.h" #include "SComponent/c_lib.h" +#include "SComponent/c_malloc.h" +#include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "f/f_pc/f_pc_manager.h" #include "f/f_pc/f_pc_stdcreate_req.h" -#include "f/f_op/f_op_kankyo_mng.h" #include "global.h" // additional symbols needed for f_op_kankyo_mng.cpp @@ -46,7 +46,7 @@ void* fopKyM_CreateAppend(void) { }; void* ptr = cMl::memalignB(-4, 0x1C); - + if (ptr) { cLib_memSet(ptr, 0, 0x1C); f32 tmp = lbl_80451C68; @@ -92,28 +92,30 @@ f32* createAppend(int param_1, cXyz* param_2, cXyz* param_3) { return ptr; } -void fopKyM_Delete(void* param_1) { +void fopKyM_Delete(void* param_1) { fpcM_Delete(param_1); } void fopKyM_Create(s16 param_1, fopKyMCreateFunc param_2, void* param_3) { - fpcSCtRq_Request(fpcLy_CurrentLayer(),param_1,(stdCreateFunc)param_2,0,param_3); + fpcSCtRq_Request(fpcLy_CurrentLayer(), param_1, (stdCreateFunc)param_2, 0, param_3); } -u32 fopKyM_create(s16 param_1, int param_2, cXyz* param_3, cXyz* param_4, fopKyMCreateFunc param_5) { - float* tmp = createAppend(param_2,param_3,param_4); +u32 fopKyM_create(s16 param_1, int param_2, cXyz* param_3, cXyz* param_4, + fopKyMCreateFunc param_5) { + float* tmp = createAppend(param_2, param_3, param_4); if (!tmp) { return -1; } - fopKyM_Create(param_1,param_5,(void*)tmp); + fopKyM_Create(param_1, param_5, (void*)tmp); } -u32 fopKyM_fastCreate(s16 param_1, int param_2, cXyz* param_3, cXyz* param_4, fopKyMCreateFunc param_5) { - float* tmp = createAppend(param_2,param_3,param_4); +u32 fopKyM_fastCreate(s16 param_1, int param_2, cXyz* param_3, cXyz* param_4, + fopKyMCreateFunc param_5) { + float* tmp = createAppend(param_2, param_3, param_4); if (!tmp) { return 0; } - fpcM_FastCreate(param_1,param_5,0,tmp); + fpcM_FastCreate(param_1, param_5, 0, tmp); } // fopKyM_createWpillar__FPC4cXyzfi