From 52a53ba135a8ccc8c1e87ecb59491968fcc45214 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 7 Jan 2021 22:58:47 -0500 Subject: [PATCH] clang-format --- .../JKernel/JKRSolidHeap/JKRSolidHeap.h | 2 +- include/d/d_attention/d_attention.h | 1 - include/d/d_bg/d_bg_s/d_bg_s.h | 6 +-- .../d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h | 2 +- .../d/d_com/d_com_inf_game/d_com_inf_game.h | 13 ++--- include/d/d_drawlist/d_drawlist.h | 5 +- include/d/d_event/d_event/d_event.h | 4 +- include/d/d_event/d_event_data/d_event_data.h | 2 +- include/d/d_resource/d_resource.h | 2 +- include/d/d_stage/d_stage.h | 12 ++--- include/d/d_vibration/d_vibration.h | 2 +- include/functions.h | 2 +- .../m_Do/m_Do_dvd_thread/m_Do_dvd_thread.h | 11 ++--- include/m_Do/m_Do_main/m_Do_main.h | 2 +- include/variables.h | 2 +- src/m_Do/m_Do_main.cpp | 47 +++++++++---------- 16 files changed, 56 insertions(+), 59 deletions(-) diff --git a/include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h b/include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h index 4adf468423a..bab096891d6 100644 --- a/include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h +++ b/include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h @@ -58,7 +58,7 @@ public: }; extern "C" { - JKRSolidHeap* JKRSolidHeap_NS_create(u32 size, JKRHeap* heap, bool use_default_error_handler); +JKRSolidHeap* JKRSolidHeap_NS_create(u32 size, JKRHeap* heap, bool use_default_error_handler); } #endif diff --git a/include/d/d_attention/d_attention.h b/include/d/d_attention/d_attention.h index 2981266f3b1..caf0a2d4fd2 100644 --- a/include/d/d_attention/d_attention.h +++ b/include/d/d_attention/d_attention.h @@ -96,7 +96,6 @@ class dAttDraw_c { }; #pragma pack(pop) - class dAttDraw_CallBack_c { mDoExt_McaMorfCallBack1_c mDoExt_McaMorfCallback; }; diff --git a/include/d/d_bg/d_bg_s/d_bg_s.h b/include/d/d_bg/d_bg_s/d_bg_s.h index f8c4c2f1bf1..b61f1091ddb 100644 --- a/include/d/d_bg/d_bg_s/d_bg_s.h +++ b/include/d/d_bg/d_bg_s/d_bg_s.h @@ -3,7 +3,7 @@ #include "d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h" #include "global.h" -#pragma pack(push,1) +#pragma pack(push, 1) class cBgS_ChkElm { /* 0x00 */ dBgW_Base* bgw_base_pointer; /* 0x04 */ u8 used; @@ -14,7 +14,7 @@ class cBgS_ChkElm { }; #pragma pack(pop) -#pragma pack(push,1) +#pragma pack(push, 1) class cBgS { /* 0x0000 */ cBgS_ChkElm cbgs_elements[256]; }; @@ -32,7 +32,7 @@ class dBgS_HIO { /* 0x30 */ u8 field_0x30[4]; }; -#pragma pack(push,1) +#pragma pack(push, 1) class dBgS { public: private: diff --git a/include/d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h b/include/d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h index 877d650297c..88751715934 100644 --- a/include/d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h +++ b/include/d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h @@ -2,7 +2,7 @@ #define __D_BG_W_BASE_H_ #include "global.h" -#pragma pack(push,1) +#pragma pack(push, 1) class dBgW_Base { public: private: diff --git a/include/d/d_com/d_com_inf_game/d_com_inf_game.h b/include/d/d_com/d_com_inf_game/d_com_inf_game.h index 3f198d13d54..4ae7b68a455 100644 --- a/include/d/d_com/d_com_inf_game/d_com_inf_game.h +++ b/include/d/d_com/d_com_inf_game/d_com_inf_game.h @@ -13,7 +13,7 @@ #include "d/d_stage/d_stage.h" #include "d/d_vibration/d_vibration.h" -#pragma pack(push,1) +#pragma pack(push, 1) struct item_func { float hearts; // bf80 u32 rupees; // bf84 @@ -36,7 +36,7 @@ struct item_func { }; #pragma pack(pop) -#pragma pack(push,1) +#pragma pack(push, 1) class dComIfG_camera_info_class { public: private: @@ -46,7 +46,7 @@ private: }; #pragma pack(pop) -#pragma pack(push,1) +#pragma pack(push, 1) class dDlst_window_c { public: private: @@ -64,7 +64,7 @@ private: }; #pragma pack(pop) -#pragma pack(push,1) +#pragma pack(push, 1) class dComIfG_play_c { public: void ct(void); @@ -92,6 +92,7 @@ public: void setItemMaxLifeCount(short max) { give_item.max_life += max; } void setOxygen(long oxygen) { give_item.oxygen = oxygen; } void setMaxOxygen(long max) { give_item.max_oxygen = max; } + private: /* 0x00000 */ dBgS dbgs; /* 0x0143C */ u8 field_0x143c[0x2A8C]; @@ -139,7 +140,7 @@ private: }; #pragma pack(pop) -#pragma pack(push,1) +#pragma pack(push, 1) class dComIfG_inf_c { public: // temp until we map the item short function names @@ -164,7 +165,7 @@ private: /* 0x00F28 */ u32 saveStartTime; /* 0x00F2C */ u32 field_0xf30; /* 0x00F30 */ u32 field_0xf34; - u8 unk[3]; + u8 unk[3]; /* 0x00F34 */ dComIfG_play_c play; /* 0x05F60 */ u8 field_0x5f60[0x10]; /* 0x05F70 */ dDlst_list_c draw_list_list; diff --git a/include/d/d_drawlist/d_drawlist.h b/include/d/d_drawlist/d_drawlist.h index c7e818c8d2c..15d4aa7c0b4 100644 --- a/include/d/d_drawlist/d_drawlist.h +++ b/include/d/d_drawlist/d_drawlist.h @@ -3,7 +3,6 @@ #include "dolphin/types.h" - class dDlst_FileInfo_c { public: void draw(void); @@ -12,13 +11,13 @@ public: private: }; -#pragma pack(push,1) +#pragma pack(push, 1) class dDlst_peekZ_c { u8 unk[7]; }; // actual size unknown!!! #pragma pack(pop) -#pragma pack(push,1) +#pragma pack(push, 1) class dDlst_list_c { public: static u32 mWipeColor; diff --git a/include/d/d_event/d_event/d_event.h b/include/d/d_event/d_event/d_event.h index 345dda57656..b8e1a628257 100644 --- a/include/d/d_event/d_event/d_event.h +++ b/include/d/d_event/d_event/d_event.h @@ -3,7 +3,7 @@ #include "dolphin/types.h" -#pragma pack(push,1) +#pragma pack(push, 1) class dEvt_order_c { public: private: @@ -201,7 +201,7 @@ private: }; #pragma pack(pop) -#pragma pack(push,1) +#pragma pack(push, 1) class dEvt_control_c { public: void searchMapEventData(u8 param_1); diff --git a/include/d/d_event/d_event_data/d_event_data.h b/include/d/d_event/d_event_data/d_event_data.h index 82f1ba25e27..47fbb6c7d29 100644 --- a/include/d/d_event/d_event_data/d_event_data.h +++ b/include/d/d_event/d_event_data/d_event_data.h @@ -8,7 +8,7 @@ public: private: u8 field_0x0[320]; }; -#pragma pack(push,1) +#pragma pack(push, 1) class dEvDtBase_c { public: private: diff --git a/include/d/d_resource/d_resource.h b/include/d/d_resource/d_resource.h index 0efd75d5310..e30b879b904 100644 --- a/include/d/d_resource/d_resource.h +++ b/include/d/d_resource/d_resource.h @@ -7,7 +7,7 @@ #include "dolphin/types.h" #include "m_Do/m_Do_dvd_thread/m_Do_dvd_thread.h" -#pragma pack(push,1) +#pragma pack(push, 1) class dRes_info_c { public: private: diff --git a/include/d/d_stage/d_stage.h b/include/d/d_stage/d_stage.h index d6770bbd2f7..6c7ed213d19 100644 --- a/include/d/d_stage/d_stage.h +++ b/include/d/d_stage/d_stage.h @@ -2,7 +2,7 @@ #define __D_STAGE_H_ #include "global.h" -#pragma pack(push,1) +#pragma pack(push, 1) class dStage_roomControl_c { public: private: @@ -10,7 +10,7 @@ private: }; #pragma pack(pop) -#pragma pack(push,1) +#pragma pack(push, 1) class dStage_stageDt_c { public: private: @@ -18,7 +18,7 @@ private: }; #pragma pack(pop) -#pragma pack(push,1) +#pragma pack(push, 1) class dStage_nextStage_c { public: private: @@ -42,10 +42,10 @@ private: }; #pragma pack(pop) -#pragma pack(push,1) +#pragma pack(push, 1) class dStage_startStage_c { - public: - private: +public: +private: /* 0x0 */ char mStage[8]; /* 0x8 */ s16 mPoint; /* 0xA */ s8 mRoomNo; diff --git a/include/d/d_vibration/d_vibration.h b/include/d/d_vibration/d_vibration.h index 2a4b08ef0c9..878cc418a77 100644 --- a/include/d/d_vibration/d_vibration.h +++ b/include/d/d_vibration/d_vibration.h @@ -3,7 +3,7 @@ #include "global.h" -#pragma pack(push,1) +#pragma pack(push, 1) class dVibration_c { public: private: diff --git a/include/functions.h b/include/functions.h index dcfc37729b1..b729a291826 100644 --- a/include/functions.h +++ b/include/functions.h @@ -318,7 +318,7 @@ void mDoAud_Execute(void); void fapGm_Execute(void); void mDoCPd_c_NS_read(void); void mDoMemCd_Ctrl_c_NS_update(void); -//void JKRSolidHeap_NS_create(void); +// void JKRSolidHeap_NS_create(void); void cDyl_InitAsync(void); void fopAcM_initManager(void); void fapGm_Create(void); diff --git a/include/m_Do/m_Do_dvd_thread/m_Do_dvd_thread.h b/include/m_Do/m_Do_dvd_thread/m_Do_dvd_thread.h index 2ef1db9bf08..c92ad55354b 100644 --- a/include/m_Do/m_Do_dvd_thread/m_Do_dvd_thread.h +++ b/include/m_Do/m_Do_dvd_thread/m_Do_dvd_thread.h @@ -4,16 +4,15 @@ #include "dolphin/types.h" class mDoDVDThd_command_c { - public: - - private: +public: +private: }; class mDoDVDThd_callback_c { - public: - mDoDVDThd_callback_c(void *(void*),void*); +public: + mDoDVDThd_callback_c(void*(void*), void*); ~mDoDVDThd_callback_c(); - mDoDVDThd_command_c* create(void *(void*),void*); + mDoDVDThd_command_c* create(void*(void*), void*); mDoDVDThd_command_c* execute(); }; diff --git a/include/m_Do/m_Do_main/m_Do_main.h b/include/m_Do/m_Do_main/m_Do_main.h index 7a668eb374f..949efc3af1f 100644 --- a/include/m_Do/m_Do_main/m_Do_main.h +++ b/include/m_Do/m_Do_main/m_Do_main.h @@ -26,7 +26,7 @@ private: }; extern HeapCheck* HeapCheckTable[8]; -extern HeapCheck lbl_803D32E0[8]; // RootHeapCheck +extern HeapCheck lbl_803D32E0[8]; // RootHeapCheck // extern HeapCheck lbl_803D3308; // SystemHeapCheck // extern HeapCheck lbl_803D3330; // ZeldaHeapCheck // extern HeapCheck lbl_803D3358; // GameHeapCheck diff --git a/include/variables.h b/include/variables.h index 5e60075a689..0fb5bc70823 100644 --- a/include/variables.h +++ b/include/variables.h @@ -49,7 +49,7 @@ extern u8 lbl_80450B1C; struct JUTGamePad; extern JUTGamePad* m_gamePad[4]; extern u8 lbl_80450B18; -//extern u8 lbl_803D32E0; +// extern u8 lbl_803D32E0; extern u8 lbl_803EAF40[]; extern u8 lbl_80450B34; extern u8 lbl_80450B00; diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 0a4f5cd8354..fc14ff2ebd2 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -4,11 +4,11 @@ #include "dvd/dvd.h" #include "global.h" #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h" +#include "m_Do/m_Do_dvd_thread/m_Do_dvd_thread.h" #include "m_Do/m_Do_ext/m_Do_ext.h" #include "m_Do/m_Do_graphic/m_Do_graphic.h" #include "m_Do/m_Do_machine/m_Do_machine.h" #include "m_Do/m_Do_reset/m_Do_reset.h" -#include "m_Do/m_Do_dvd_thread/m_Do_dvd_thread.h" void version_check(void) { if ((!strcmp((char*)lbl_803739A0, (char*)lbl_803739A0)) && @@ -175,17 +175,16 @@ void main01(void) { mDoGph_Create(); create__8mDoCPd_cFv(); mDoDVDThd_callback_c thread_callback; - //JKRSolidHeap audio_heap; + // JKRSolidHeap audio_heap; // Root Heap - heaps[0].setHeap((JKRExpHeap *)lbl_80451378); + heaps[0].setHeap((JKRExpHeap*)lbl_80451378); if (lbl_80451378) { heaps[0].setHeapSize(lbl_80451378->getSize()); } - // System Heap - heaps[1].setHeap((JKRExpHeap *)lbl_80451370); + heaps[1].setHeap((JKRExpHeap*)lbl_80451370); if (lbl_80451370) { heaps[1].setHeapSize(lbl_80451370->getSize()); } @@ -234,37 +233,37 @@ void main01(void) { unk = 3; } - *(lbl_804511B8+0x58) = unk; - *(systemConsole+0x40) = 0x20; - *(systemConsole+0x44) = 0x2a; + *(lbl_804511B8 + 0x58) = unk; + *(systemConsole + 0x40) = 0x20; + *(systemConsole + 0x44) = 0x2a; // lol - thread_callback.create((void * (*)(void *))LOAD_COPYDATE,0); + thread_callback.create((void* (*)(void*))LOAD_COPYDATE, 0); fapGm_Create(); fopAcM_initManager(); lbl_80450B18 = 0; cDyl_InitAsync(); // g_mDoAud_audioHeap - - lbl_80450BBC = JKRSolidHeap_NS_create(0x14d800,lbl_80451374,false); - + + lbl_80450BBC = JKRSolidHeap_NS_create(0x14d800, lbl_80451374, false); + // main loop do { - // global frame counter? - lbl_80450B34++; + // global frame counter? + lbl_80450B34++; - if (lbl_80450B00 && (lbl_80450B34 == ((lbl_80450B34 / lbl_80450B00) * lbl_80450B00))) { - mDoMch_HeapCheckAll(); - } + if (lbl_80450B00 && (lbl_80450B34 == ((lbl_80450B34 / lbl_80450B00) * lbl_80450B00))) { + mDoMch_HeapCheckAll(); + } - if (lbl_80450C80) { - mDoMemCd_Ctrl_c_NS_update(); - } - mDoCPd_c_NS_read(); - fapGm_Execute(); - mDoAud_Execute(); - debug(); + if (lbl_80450C80) { + mDoMemCd_Ctrl_c_NS_update(); + } + mDoCPd_c_NS_read(); + fapGm_Execute(); + mDoAud_Execute(); + debug(); } while (true); } #else