format

22 files changed, 55 insertions, 74 deletions

diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h
index b7fdb6c3ae..b7fd742e16 100644
--- a/include/JSystem/JFramework/JFWDisplay.h
+++ b/include/JSystem/JFramework/JFWDisplay.h
@@ -1,12 +1,12 @@
 #ifndef JFWDISPLAY_H
 #define JFWDISPLAY_H
 
-#include "dolphin/types.h"
-#include "dolphin/gx/GX.h"
-#include "JSystem/JUtility/JUTXfb.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include "JSystem/JUtility/TColor.h"
 #include "JSystem/JUtility/JUTFader.h"
+#include "JSystem/JUtility/JUTXfb.h"
+#include "JSystem/JUtility/TColor.h"
+#include "dolphin/gx/GX.h"
+#include "dolphin/types.h"
 
 class JFWDisplay {
 public:
diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h
index a4c0ca50ed..42e505a7b5 100644
--- a/include/JSystem/JGeometry.h
+++ b/include/JSystem/JGeometry.h
@@ -40,9 +40,7 @@ struct TVec3<f32> {
         z = z_;
     }
 
-    void zero() {
-        x = y = z = 0.0f;
-    }
+    void zero() { x = y = z = 0.0f; }
 
     void mul(const TVec3<f32>& a, const TVec3<f32>& b) {
         x = a.x * b.x;
diff --git a/include/JSystem/JParticle/JPABaseShape.h b/include/JSystem/JParticle/JPABaseShape.h
index a081b0c916..af687cbe3c 100644
--- a/include/JSystem/JParticle/JPABaseShape.h
+++ b/include/JSystem/JParticle/JPABaseShape.h
@@ -1,8 +1,8 @@
 #ifndef JPABASESHAPE_H
 #define JPABASESHAPE_H
 
-#include "dolphin/types.h"
 #include "dolphin/gx/GX.h"
+#include "dolphin/types.h"
 
 class JPAEmitterWorkData;
 class JKRHeap;
diff --git a/include/JSystem/JParticle/JPAChildShape.h b/include/JSystem/JParticle/JPAChildShape.h
index 5f6edf0d30..d45b97a4e7 100644
--- a/include/JSystem/JParticle/JPAChildShape.h
+++ b/include/JSystem/JParticle/JPAChildShape.h
@@ -1,8 +1,8 @@
 #ifndef JPACHILDSHAPE_H
 #define JPACHILDSHAPE_H
 
-#include "dolphin/types.h"
 #include "dolphin/gx/GX.h"
+#include "dolphin/types.h"
 
 struct JPAChildShapeData {
     // Common header.
diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h
index 189f63bc53..3e60349bfb 100644
--- a/include/d/com/d_com_inf_game.h
+++ b/include/d/com/d_com_inf_game.h
@@ -1126,7 +1126,7 @@ inline daPy_py_c* dComIfGp_getLinkPlayer() {
 
 inline daPy_py_c* daPy_getLinkPlayerActorClass() {
     return dComIfGp_getLinkPlayer();
-} 
+}
 
 inline daAlink_c* daAlink_getAlinkActorClass() {
     return (daAlink_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR);
diff --git a/include/d/d_lib.h b/include/d/d_lib.h
index 44ae4d2e45..618d76138e 100644
--- a/include/d/d_lib.h
+++ b/include/d/d_lib.h
@@ -42,11 +42,9 @@ struct STControl {
 };  // Size = 0x30
 
 struct CSTControl : public STControl {
-    CSTControl(s16 param_0, s16 param_1, s16 param_2,
-               s16 param_3, f32 param_4, f32 param_5,
+    CSTControl(s16 param_0, s16 param_1, s16 param_2, s16 param_3, f32 param_4, f32 param_5,
                s16 param_6, s16 param_7)
-    : STControl(param_0, param_1, param_2, param_3,
-                param_4, param_5, param_6, param_7) {}
+        : STControl(param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7) {}
 
     virtual f32 getValueStick();
     virtual s16 getAngleStick();
diff --git a/include/d/d_select_cursor.h b/include/d/d_select_cursor.h
index 65c0cb8297..5cb8af07a7 100644
--- a/include/d/d_select_cursor.h
+++ b/include/d/d_select_cursor.h
@@ -1,9 +1,9 @@
 #ifndef D_D_SELECT_CURSOR_H
 #define D_D_SELECT_CURSOR_H
 
-#include "dolphin/types.h"
-#include "d/d_select_icon.h"
 #include "d/d_drawlist.h"
+#include "d/d_select_icon.h"
+#include "dolphin/types.h"
 
 class dSelect_cursorHIO_c {
 public:
diff --git a/include/d/menu/d_menu_collect.h b/include/d/menu/d_menu_collect.h
index a626bddb25..6629cdffda 100644
--- a/include/d/menu/d_menu_collect.h
+++ b/include/d/menu/d_menu_collect.h
@@ -1,10 +1,10 @@
 #ifndef D_MENU_D_MENU_COLLECT_H
 #define D_MENU_D_MENU_COLLECT_H
 
-#include "dolphin/types.h"
+#include "JSystem/J2DGraph/J2DPicture.h"
 #include "d/d_lib.h"
 #include "d/d_select_cursor.h"
-#include "JSystem/J2DGraph/J2DPicture.h"
+#include "dolphin/types.h"
 
 class dMsgString_c;
 class dMenu_save_c;
diff --git a/include/d/menu/d_menu_dmap.h b/include/d/menu/d_menu_dmap.h
index 09d9766da3..1bef68c63e 100644
--- a/include/d/menu/d_menu_dmap.h
+++ b/include/d/menu/d_menu_dmap.h
@@ -1,10 +1,10 @@
 #ifndef D_MENU_D_MENU_DMAP_H
 #define D_MENU_D_MENU_DMAP_H
 
-#include "dolphin/types.h"
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
 #include "d/d_lib.h"
 #include "d/d_select_cursor.h"
+#include "dolphin/types.h"
 
 class dMenu_DmapMapCtrl_c;
 class dMenu_DmapBg_c;
diff --git a/include/d/menu/d_menu_fishing.h b/include/d/menu/d_menu_fishing.h
index 551222cd58..77e156dc90 100644
--- a/include/d/menu/d_menu_fishing.h
+++ b/include/d/menu/d_menu_fishing.h
@@ -1,10 +1,10 @@
 #ifndef D_MENU_D_MENU_FISHING_H
 #define D_MENU_D_MENU_FISHING_H
 
-#include "dolphin/types.h"
 #include "JSystem/J2DGraph/J2DPicture.h"
-#include "d/d_select_cursor.h"
 #include "d/d_lib.h"
+#include "d/d_select_cursor.h"
+#include "dolphin/types.h"
 
 class mDoDvdThd_mountArchive_c;
 class dMsgString_c;
diff --git a/include/d/menu/d_menu_fmap.h b/include/d/menu/d_menu_fmap.h
index df43e86ba4..fdd4e1228f 100644
--- a/include/d/menu/d_menu_fmap.h
+++ b/include/d/menu/d_menu_fmap.h
@@ -1,11 +1,11 @@
 #ifndef D_MENU_D_MENU_FMAP_H
 #define D_MENU_D_MENU_FMAP_H
 
-#include "dolphin/types.h"
-#include "d/pane/d_pane_class.h"
-#include "d/d_lib.h"
 #include "d/d_drawlist.h"
+#include "d/d_lib.h"
 #include "d/msg/d_msg_flow.h"
+#include "d/pane/d_pane_class.h"
+#include "dolphin/types.h"
 
 class dMenu_Fmap_stage_data_c;
 class dMenu_Fmap_world_data_c;
diff --git a/include/d/menu/d_menu_insect.h b/include/d/menu/d_menu_insect.h
index c0e7930dc2..84b4d2d3cc 100644
--- a/include/d/menu/d_menu_insect.h
+++ b/include/d/menu/d_menu_insect.h
@@ -1,10 +1,10 @@
 #ifndef D_MENU_D_MENU_INSECT_H
 #define D_MENU_D_MENU_INSECT_H
 
-#include "dolphin/types.h"
 #include "JSystem/J2DGraph/J2DPicture.h"
-#include "d/d_select_cursor.h"
 #include "d/d_lib.h"
+#include "d/d_select_cursor.h"
+#include "dolphin/types.h"
 
 class dMsgScrn3Select_c;
 class dMsgString_c;
diff --git a/include/d/menu/d_menu_letter.h b/include/d/menu/d_menu_letter.h
index d21d923d0f..f4c553562b 100644
--- a/include/d/menu/d_menu_letter.h
+++ b/include/d/menu/d_menu_letter.h
@@ -1,10 +1,10 @@
 #ifndef D_MENU_D_MENU_LETTER_H
 #define D_MENU_D_MENU_LETTER_H
 
-#include "dolphin/types.h"
 #include "JSystem/J2DGraph/J2DPicture.h"
-#include "d/d_select_cursor.h"
 #include "d/d_lib.h"
+#include "d/d_select_cursor.h"
+#include "dolphin/types.h"
 
 class mDoDvdThd_mountArchive_c;
 class dMsgString_c;
diff --git a/include/d/menu/d_menu_option.h b/include/d/menu/d_menu_option.h
index 661e8897f8..7018bc7526 100644
--- a/include/d/menu/d_menu_option.h
+++ b/include/d/menu/d_menu_option.h
@@ -1,10 +1,10 @@
 #ifndef D_MENU_D_MENU_OPTION_H
 #define D_MENU_D_MENU_OPTION_H
 
-#include "dolphin/types.h"
+#include "JSystem/J2DGraph/J2DPicture.h"
 #include "d/d_lib.h"
 #include "d/d_select_cursor.h"
-#include "JSystem/J2DGraph/J2DPicture.h"
+#include "dolphin/types.h"
 
 class dFile_warning_c;
 class dMenu_Calibration_c;
@@ -97,11 +97,11 @@ private:
     /* 0x014 */ J2DScreen* mpTVScreen;
     /* 0x018 */ J2DScreen* mpScreenIcon;
     /* 0x01C */ J2DScreen* mpSelectScreen;
-    /* 0x020 */ void* field_0x20;  // bck
-    /* 0x024 */ void* field_0x24;  // bck
-    /* 0x028 */ void* field_0x28;  // bck
-    /* 0x02C */ void* field_0x2c;  // bpk
-    /* 0x030 */ void* field_0x30;  // btk
+    /* 0x020 */ void* field_0x20;
+    /* 0x024 */ void* field_0x24;
+    /* 0x028 */ void* field_0x28;
+    /* 0x02C */ void* field_0x2c;
+    /* 0x030 */ void* field_0x30;
     /* 0x034 */ dFile_warning_c* mpWarning;
     /* 0x038 */ J2DPicture* mpBlackTex;
     /* 0x03C */ dMenu_Calibration_c* field_0x3c;
diff --git a/include/d/menu/d_menu_ring.h b/include/d/menu/d_menu_ring.h
index 9169f20638..fe7cd2e8a2 100644
--- a/include/d/menu/d_menu_ring.h
+++ b/include/d/menu/d_menu_ring.h
@@ -1,10 +1,10 @@
 #ifndef D_MENU_D_MENU_RING_H
 #define D_MENU_D_MENU_RING_H
 
-#include "dolphin/types.h"
 #include "JSystem/J2DGraph/J2DPicture.h"
-#include "d/d_select_cursor.h"
 #include "d/d_lib.h"
+#include "d/d_select_cursor.h"
+#include "dolphin/types.h"
 
 class dMsgString_c;
 class dKantera_icon_c;
diff --git a/include/d/menu/d_menu_save.h b/include/d/menu/d_menu_save.h
index f46ca98a96..74c25cf4fb 100644
--- a/include/d/menu/d_menu_save.h
+++ b/include/d/menu/d_menu_save.h
@@ -3,8 +3,8 @@
 
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "d/d_lib.h"
-#include "dolphin/types.h"
 #include "d/d_select_cursor.h"
+#include "dolphin/types.h"
 
 class dMsgString_c;
 class mDoDvdThd_command_c;
@@ -173,14 +173,14 @@ private:
     /* 0x002C */ dSelect_cursor_c* mSelIcon;
     /* 0x0030 */ dFile_warning_c* field_0x30;
     /* 0x0034 */ dFile_info_c* field_0x34[3];
-    /* 0x0040 */ void* field_0x40;  // bck
-    /* 0x0044 */ void* field_0x44;  // bck
-    /* 0x0048 */ void* field_0x48;  // bck
-    /* 0x004C */ void* field_0x4c;  // bck
+    /* 0x0040 */ void* field_0x40;
+    /* 0x0044 */ void* field_0x44;
+    /* 0x0048 */ void* field_0x48;
+    /* 0x004C */ void* field_0x4c;
     /* 0x0050 */ s32 field_0x50;
     /* 0x0054 */ u8 field_0x54;
     /* 0x0058 */ CPaneMgr* field_0x58;
-    /* 0x005C */ int field_0x5c; 
+    /* 0x005C */ int field_0x5c;
     /* 0x0060 */ int field_0x60;
     /* 0x0064 */ u8 field_0x64;
     /* 0x0064 */ u8 field_0x65;
@@ -215,15 +215,15 @@ private:
     /* 0x0132 */ u8 field_0x132[2];
     /* 0x0134 */ u8 field_0x134[2];
     /* 0x0138 */ CPaneMgr* field_0x138[2];
-    /* 0x0140 */ void* field_0x140;  // bpk
+    /* 0x0140 */ void* field_0x140;
     /* 0x0144 */ int field_0x144;
-    /* 0x0148 */ void* field_0x148;  // btk
+    /* 0x0148 */ void* field_0x148;
     /* 0x014C */ int field_0x14c;
     /* 0x0150 */ void* field_0x150;
     /* 0x0154 */ int field_0x154;
-    /* 0x0158 */ void* field_0x158;  // btk
+    /* 0x0158 */ void* field_0x158;
     /* 0x015C */ int field_0x15c;
-    /* 0x0160 */ void* field_0x160;  // brk
+    /* 0x0160 */ void* field_0x160;
     /* 0x0164 */ int field_0x164;
     /* 0x0168 */ CPaneMgr* field_0x168[2];
     /* 0x0170 */ u8 field_0x170[8];
@@ -260,8 +260,8 @@ private:
     /* 0x01C0 */ u8 field_0x1c0;
     /* 0x01C4 */ int field_0x1c4;
     /* 0x01C8 */ int field_0x1c8;
-    /* 0x01CC */ void* field_0x1cc;  // func
-    /* 0x01D0 */ u8 field_0x1d0[0xA94 * 3];  // 3 savefiles buffer
+    /* 0x01CC */ void* field_0x1cc;
+    /* 0x01D0 */ u8 field_0x1d0[0xA94 * 3];
     /* 0x218C */ dMsgScrnExplain_c* mpScrnExplain;
     /* 0x2190 */ u8 field_0x2190;
     /* 0x2192 */ u16 field_0x2192;
diff --git a/include/d/menu/d_menu_skill.h b/include/d/menu/d_menu_skill.h
index db40cf1b61..62a1f7a7d5 100644
--- a/include/d/menu/d_menu_skill.h
+++ b/include/d/menu/d_menu_skill.h
@@ -1,10 +1,10 @@
 #ifndef D_MENU_D_MENU_SKILL_H
 #define D_MENU_D_MENU_SKILL_H
 
-#include "dolphin/types.h"
+#include "JSystem/J2DGraph/J2DPicture.h"
 #include "d/d_lib.h"
 #include "d/d_select_cursor.h"
-#include "JSystem/J2DGraph/J2DPicture.h"
+#include "dolphin/types.h"
 
 class mDoDvdThd_mountArchive_c;
 class dMsgString_c;
@@ -39,7 +39,7 @@ public:
     /* 801F93C0 */ void setNameString(u16);
     /* 801F9470 */ void getSkillNum();
     /* 801F9500 */ void setHIO(bool);
-    
+
     /* 801F9A08 */ virtual void draw();
     /* 801F7348 */ virtual ~dMenu_Skill_c();
 
diff --git a/include/d/menu/d_menu_window.h b/include/d/menu/d_menu_window.h
index 4d0a5bbe46..08ea875b53 100644
--- a/include/d/menu/d_menu_window.h
+++ b/include/d/menu/d_menu_window.h
@@ -1,13 +1,13 @@
 #ifndef D_MENU_D_MENU_WINDOW_H
 #define D_MENU_D_MENU_WINDOW_H
 
+#include "d/d_drawlist.h"
+#include "d/menu/d_menu_collect.h"
 #include "d/meter/d_meter2_info.h"
+#include "d/msg/d_msg_class.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"
-#include "d/d_drawlist.h"
-#include "d/menu/d_menu_collect.h"
-#include "d/msg/d_msg_class.h"
 
 class dMenu_Ring_c;
 class dMenu_Dmap_c;
@@ -238,18 +238,4 @@ static int dMw_Create(msg_class*);
 
 typedef int (*dMw_Method)(dMw_c*);
 
-typedef void (dMw_c::*dMw_init_func)(u8);
-struct dMw_init_proc {
-    /* 0x0 */ u32 field_0x0;
-    /* 0x4 */ u32 field_0x4;
-    /* 0x8 */ dMw_init_func init_func;
-};
-
-typedef void (dMw_c::*dMw_proc_func)();
-struct dMw_move_proc {
-    /* 0x0 */ u32 field_0x0;
-    /* 0x4 */ u32 field_0x4;
-    /* 0x8 */ dMw_proc_func proc_func;
-};
-
 #endif /* D_MENU_D_MENU_WINDOW_H */
diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h
index 1744f32bee..713613c157 100644
--- a/include/d/meter/d_meter2_info.h
+++ b/include/d/meter/d_meter2_info.h
@@ -135,7 +135,7 @@ public:
     bool isGameStatus(int status) { return mGameStatus & status; }
     void setMapKeyDirection(u16 direction) { mMapKeyDirection = direction; }
     bool isSub2DStatus(int flag) { return mSub2DStatus & (1 << flag); }
-    void offMenuInForce(int flag) { unk152 &= ~(1 << flag); } 
+    void offMenuInForce(int flag) { unk152 &= ~(1 << flag); }
     bool isMenuInForce(int flag) { return unk152 & (1 << flag); }
     u16 getMapKeyDirection() { return mMapKeyDirection; }
     u8 getWindowStatus() { return mWindowStatus; }
diff --git a/include/dolphin/gx/GX.h b/include/dolphin/gx/GX.h
index 9f24e2e710..157ddaaebb 100644
--- a/include/dolphin/gx/GX.h
+++ b/include/dolphin/gx/GX.h
@@ -928,7 +928,6 @@ inline void GXTexCoord2f32(f32 s, f32 t) {
 }
 
 inline void GXEnd() {}
-
 };
 
 #endif
diff --git a/include/dolphin/os/OS.h b/include/dolphin/os/OS.h
index 3bda004d8a..7c94ec7bf0 100644
--- a/include/dolphin/os/OS.h
+++ b/include/dolphin/os/OS.h
@@ -306,7 +306,7 @@ inline void* OSPhysicalToCached(u32 offset) {
 
 static inline u8 __OSf32tou8(register f32 src) {
     f32 tmp;
-    register f32 *p = &tmp;
+    register f32* p = &tmp;
     register u8 ret;
 
     asm
diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h
index c7e5aaa77d..c5048a9af5 100644
--- a/include/m_Do/m_Do_graphic.h
+++ b/include/m_Do/m_Do_graphic.h
@@ -1,9 +1,9 @@
 #ifndef M_DO_M_DO_GRAPHIC_H
 #define M_DO_M_DO_GRAPHIC_H
 
-#include "dolphin/gx/GX.h"
-#include "JSystem/JUtility/JUTFader.h"
 #include "JSystem/JFramework/JFWDisplay.h"
+#include "JSystem/JUtility/JUTFader.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
 void mDoGph_Create();