From 304cae803a6a4af9e1b7577d60e644b9cbefe916 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 13 Feb 2021 15:24:45 -0500 Subject: [PATCH] clang-format --- src/f/f_ap_game.cpp | 56 ++++++++++++++++++++---------------------- src/m_Do/m_Do_main.cpp | 7 +++--- 2 files changed, 30 insertions(+), 33 deletions(-) diff --git a/src/f/f_ap_game.cpp b/src/f/f_ap_game.cpp index 5a879dd48b2..88c08cf5ab0 100644 --- a/src/f/f_ap_game.cpp +++ b/src/f/f_ap_game.cpp @@ -1,30 +1,30 @@ /* f_ap_game.cpp autogenerated by split.py v0.4 at 2021-02-13 20:07:21.300413 */ -#include "global.h" -#include "f/f_pc/f_pc_manager.h" #include "SComponent/c_counter.h" +#include "f/f_pc/f_pc_manager.h" +#include "global.h" // additional symbols needed for f_ap_game.cpp // autogenerated by split.py v0.4 at 2021-02-13 20:07:21.300465 extern "C" { - void __dl__FPv(void); - // void cCt_Counter(void); - void fapGm_After(void); - void fapGm_Create(void); - void fapGm_Execute(void); - void fapGm_HIO_c(void); - void fapGm_HIO_c_NS_dtor(void); - void fopCamM_Init(void); - void fopCamM_Management(void); - void fopDwTg_CreateQueue(void); - void fopOvlpM_Init(void); - void fopOvlpM_Management(void); - void fopScnM_Init(void); - void fopScnM_Management(void); - void fpcM_Init(void); - //void fpcM_Management__FPFv_vPFv_v(void); - void func_80018B28(void); - void func_80361C24(void); +void __dl__FPv(void); +// void cCt_Counter(void); +void fapGm_After(void); +void fapGm_Create(void); +void fapGm_Execute(void); +void fapGm_HIO_c(void); +void fapGm_HIO_c_NS_dtor(void); +void fopCamM_Init(void); +void fopCamM_Management(void); +void fopDwTg_CreateQueue(void); +void fopOvlpM_Init(void); +void fopOvlpM_Management(void); +void fopScnM_Init(void); +void fopScnM_Management(void); +void fpcM_Init(void); +// void fpcM_Management__FPFv_vPFv_v(void); +void func_80018B28(void); +void func_80361C24(void); } // additional symbols needed for f_ap_game.cpp @@ -34,24 +34,23 @@ extern u8 lbl_803F1BB0; extern u8 lbl_80451BC0; extern u8 lbl_80451BC4; - extern "C" { // __ct__11fapGm_HIO_cFv // fapGm_HIO_c::fapGm_HIO_c(void) asm void fapGm_HIO_c(void) { nofralloc - #include "f/f_ap_game/asm/func_80018944.s" +#include "f/f_ap_game/asm/func_80018944.s" } // fapGm_After__Fv // fapGm_After(void) asm void fapGm_After(void) { nofralloc - #include "f/f_ap_game/asm/func_80018A44.s" +#include "f/f_ap_game/asm/func_80018A44.s" } void fapGm_Execute(void) { - fpcM_Management(0,fapGm_After); + fpcM_Management(0, fapGm_After); cCt_Counter(0); } @@ -59,21 +58,20 @@ void fapGm_Execute(void) { // fapGm_Create(void) asm void fapGm_Create(void) { nofralloc - #include "f/f_ap_game/asm/func_80018AA0.s" +#include "f/f_ap_game/asm/func_80018AA0.s" } // __dt__11fapGm_HIO_cFv // fapGm_HIO_c::~fapGm_HIO_c(void) asm void fapGm_HIO_c_NS_dtor(void) { nofralloc - #include "f/f_ap_game/asm/func_80018AE0.s" +#include "f/f_ap_game/asm/func_80018AE0.s" } // __sinit_f_ap_game_cpp -// +// asm void func_80018B28(void) { nofralloc - #include "f/f_ap_game/asm/func_80018B28.s" +#include "f/f_ap_game/asm/func_80018B28.s" } - }; diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 20987ed26d4..91ff7b7ca0b 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -2,8 +2,8 @@ #include "JSystem/JKernel/JKRAram/JKRAram.h" #include "JSystem/JKernel/JKRAramHeap/JKRAramHeap.h" #include "JSystem/JUtility/JUTAssert/JUTAssert.h" -#include "JSystem/JUtility/JUTReport/JUTReport.h" #include "JSystem/JUtility/JUTGamePad/JUTGamePad.h" +#include "JSystem/JUtility/JUTReport/JUTReport.h" #include "SComponent/c_API_controller_pad.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "dvd/dvd.h" @@ -390,10 +390,9 @@ s32 LOAD_COPYDATE(void*) { s32 status; u8 buffer[32]; u8 fileInfo[80]; - //DVDFileInfo fileInfo; + // DVDFileInfo fileInfo; status = DVDOpen("/str/Final/Release/COPYDATE", (DVDFileInfo*)&fileInfo); - if (status) { DVDReadPrio((DVDFileInfo*)fileInfo, &buffer, 32, 0, 2); @@ -522,7 +521,7 @@ void main01(void) { systemConsole->field_0x44 = 0x2A; // lol - mDoDVDThd_callback_c::create(LOAD_COPYDATE,0); + mDoDVDThd_callback_c::create(LOAD_COPYDATE, 0); fapGm_Create(); fopAcM_initManager(); lbl_80450B18 = 0;