diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h
index b7fdb6c3ae3..b7fd742e168 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 a4c0ca50ed6..42e505a7b5a 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 a081b0c916d..af687cbe3c3 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 5f6edf0d303..d45b97a4e76 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 189f63bc53b..3e60349bfb2 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 44ae4d2e45f..618d76138e5 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 65c0cb8297f..5cb8af07a78 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 a626bddb255..6629cdffda8 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 09d9766da38..1bef68c63e8 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 551222cd58d..77e156dc90d 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 df43e86ba45..fdd4e1228f0 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 c0e7930dc24..84b4d2d3cc7 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 d21d923d0f0..f4c553562b4 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 661e8897f82..7018bc75269 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 9169f206387..fe7cd2e8a2d 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 f46ca98a96c..74c25cf4fba 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 db40cf1b617..62a1f7a7d51 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 4d0a5bbe46f..08ea875b532 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 1744f32bee6..713613c1572 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 9f24e2e7106..157ddaaebb9 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 3bda004d8ae..7c94ec7bf0e 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 c7e5aaa77de..c5048a9af52 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();
diff --git a/libs/JSystem/JParticle/JPAChildShape.cpp b/libs/JSystem/JParticle/JPAChildShape.cpp
index 8c982c3f556..962ed1ef237 100644
--- a/libs/JSystem/JParticle/JPAChildShape.cpp
+++ b/libs/JSystem/JParticle/JPAChildShape.cpp
@@ -6,8 +6,8 @@
 #include "JSystem/JParticle/JPAChildShape.h"
 #include "JSystem/JParticle/JPAParticle.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 #include "dolphin/os/OS.h"
+#include "dolphin/types.h"
 
 //
 // Types:
diff --git a/libs/JSystem/JParticle/JPAExtraShape.cpp b/libs/JSystem/JParticle/JPAExtraShape.cpp
index 49f599c0604..9d08e8ccf7f 100644
--- a/libs/JSystem/JParticle/JPAExtraShape.cpp
+++ b/libs/JSystem/JParticle/JPAExtraShape.cpp
@@ -4,13 +4,13 @@
 //
 
 #include "JSystem/JParticle/JPAExtraShape.h"
+#include "JSystem/JMath/JMATrigonometric.h"
 #include "JSystem/JParticle/JPAParticle.h"
 #include "JSystem/JParticle/JPAResource.h"
 #include "JSystem/JParticle/JPAResourceManager.h"
-#include "JSystem/JMath/JMATrigonometric.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 #include "dolphin/os/OS.h"
+#include "dolphin/types.h"
 
 //
 // Types:
@@ -21,9 +21,12 @@
 void JPACalcScaleX(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPAExtraShape* esp = work->mpRes->getEsp();
     if (work->mScaleAnm < esp->getScaleInTiming()) {
-        ptcl->mParticleScaleX = ptcl->mScaleOut * (esp->getScaleIncRateX() * work->mScaleAnm + esp->getScaleInValueX());
+        ptcl->mParticleScaleX =
+            ptcl->mScaleOut * (esp->getScaleIncRateX() * work->mScaleAnm + esp->getScaleInValueX());
     } else if (work->mScaleAnm > esp->getScaleOutTiming()) {
-        ptcl->mParticleScaleX = ptcl->mScaleOut * (esp->getScaleDecRateX() * (work->mScaleAnm - esp->getScaleOutTiming()) + 1.0f);
+        ptcl->mParticleScaleX =
+            ptcl->mScaleOut *
+            (esp->getScaleDecRateX() * (work->mScaleAnm - esp->getScaleOutTiming()) + 1.0f);
     } else {
         ptcl->mParticleScaleX = ptcl->mScaleOut;
     }
@@ -34,9 +37,12 @@ void JPACalcScaleX(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
 void JPACalcScaleY(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPAExtraShape* esp = work->mpRes->getEsp();
     if (work->mScaleAnm < esp->getScaleInTiming()) {
-        ptcl->mParticleScaleY = ptcl->mScaleOut * (esp->getScaleIncRateY() * work->mScaleAnm + esp->getScaleInValueY());
+        ptcl->mParticleScaleY =
+            ptcl->mScaleOut * (esp->getScaleIncRateY() * work->mScaleAnm + esp->getScaleInValueY());
     } else if (work->mScaleAnm > esp->getScaleOutTiming()) {
-        ptcl->mParticleScaleY = ptcl->mScaleOut * (esp->getScaleDecRateY() * (work->mScaleAnm - esp->getScaleOutTiming()) + 1.0f);
+        ptcl->mParticleScaleY =
+            ptcl->mScaleOut *
+            (esp->getScaleDecRateY() * (work->mScaleAnm - esp->getScaleOutTiming()) + 1.0f);
     } else {
         ptcl->mParticleScaleY = ptcl->mScaleOut;
     }
@@ -95,7 +101,8 @@ void JPACalcAlphaAnm(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     if (ptcl->mTime < esp->getAlphaInTiming()) {
         alpha = 255.0f * (esp->getAlphaInValue() + esp->getAlphaIncRate() * ptcl->mTime);
     } else if (ptcl->mTime > esp->getAlphaOutTiming()) {
-        alpha = 255.0f * ((ptcl->mTime - esp->getAlphaOutTiming()) * esp->getAlphaDecRate() + esp->getAlphaBaseValue());
+        alpha = 255.0f * ((ptcl->mTime - esp->getAlphaOutTiming()) * esp->getAlphaDecRate() +
+                          esp->getAlphaBaseValue());
     } else {
         alpha = 255.0f * esp->getAlphaBaseValue();
     }
@@ -110,7 +117,8 @@ void JPACalcAlphaFlickAnm(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     if (ptcl->mTime < esp->getAlphaInTiming()) {
         alpha = (esp->getAlphaInValue() + esp->getAlphaIncRate() * ptcl->mTime);
     } else if (ptcl->mTime > esp->getAlphaOutTiming()) {
-        alpha = ((ptcl->mTime - esp->getAlphaOutTiming()) * esp->getAlphaDecRate() + esp->getAlphaBaseValue());
+        alpha = ((ptcl->mTime - esp->getAlphaOutTiming()) * esp->getAlphaDecRate() +
+                 esp->getAlphaBaseValue());
     } else {
         alpha = esp->getAlphaBaseValue();
     }
@@ -128,8 +136,12 @@ JPAExtraShape::JPAExtraShape(u8 const* data) {
 
 /* 8027ADBC-8027AEBC 2756FC 0100+00 1/1 0/0 0/0 .text            init__13JPAExtraShapeFv */
 void JPAExtraShape::init() {
-    mAlphaIncRate = (getAlphaInTiming() != 0.0f) ? (getAlphaBaseValue() - getAlphaInValue()) / getAlphaInTiming() : 1.0f;
-    mAlphaDecRate = (getAlphaOutTiming() != 1.0f) ? (getAlphaOutValue() - getAlphaBaseValue()) / (1.0f - getAlphaOutTiming()) : 1.0f;
+    mAlphaIncRate = (getAlphaInTiming() != 0.0f) ?
+                        (getAlphaBaseValue() - getAlphaInValue()) / getAlphaInTiming() :
+                        1.0f;
+    mAlphaDecRate = (getAlphaOutTiming() != 1.0f) ?
+                        (getAlphaOutValue() - getAlphaBaseValue()) / (1.0f - getAlphaOutTiming()) :
+                        1.0f;
 
     if (getScaleInTiming() != 0.0f) {
         mScaleIncRateX = (1.0f - getScaleInValueX()) / getScaleInTiming();
diff --git a/libs/JSystem/JParticle/JPAResource.cpp b/libs/JSystem/JParticle/JPAResource.cpp
index 64df9b337e1..e25ed1a06c5 100644
--- a/libs/JSystem/JParticle/JPAResource.cpp
+++ b/libs/JSystem/JParticle/JPAResource.cpp
@@ -4,8 +4,8 @@
 //
 
 #include "JSystem/JParticle/JPAResource.h"
-#include "JSystem/JParticle/JPAMath.h"
 #include "JSystem/JParticle/JPABaseShape.h"
+#include "JSystem/JParticle/JPAMath.h"
 #include "JSystem/JParticle/JPAParticle.h"
 #include "dol2asm.h"
 #include "dolphin/mtx/mtx.h"
diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp
index 7358966282d..be22bb86218 100644
--- a/src/d/com/d_com_inf_game.cpp
+++ b/src/d/com/d_com_inf_game.cpp
@@ -1356,7 +1356,7 @@ SECTION_SDATA extern u8 g_clearColor[4] = {
 };
 
 /* 80450604-80450608 000084 0004+00 1/1 10/10 15/15 .sdata           g_blackColor */
-SECTION_SDATA extern GXColor g_blackColor = { 0, 0, 0, 255 };
+SECTION_SDATA extern GXColor g_blackColor = {0, 0, 0, 255};
 
 /* 8002CC54-8002CD44 027594 00F0+00 1/1 1/1 0/0 .text dComIfG_changeOpeningScene__FP11scene_classs
  */
diff --git a/src/d/menu/d_menu_ring.cpp b/src/d/menu/d_menu_ring.cpp
index 9fb9ee4fa7d..19b10355543 100644
--- a/src/d/menu/d_menu_ring.cpp
+++ b/src/d/menu/d_menu_ring.cpp
@@ -11,7 +11,6 @@
 // Types:
 //
 
-
 struct mDoCPd_c {
     static u8 m_cpadInfo[256];
 };
diff --git a/src/d/menu/d_menu_skill.cpp b/src/d/menu/d_menu_skill.cpp
index 0c78b194ce8..14eb7a87496 100644
--- a/src/d/menu/d_menu_skill.cpp
+++ b/src/d/menu/d_menu_skill.cpp
@@ -738,21 +738,13 @@ asm void dMenu_Skill_c::screenSetLetter() {
 /* ############################################################################################## */
 /* 80397D30-80397D58 024390 0028+00 1/1 0/0 0/0 .rodata          text_a_tag$4365 */
 SECTION_RODATA static u64 const text_a_tag[5] = {
-    'atext1_1',
-    'atext1_2',
-    'atext1_3',
-    'atext1_4',
-    'atext1_5',
+    'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5',
 };
 COMPILER_STRIP_GATE(0x80397D30, &text_a_tag);
 
 /* 80397D58-80397D80 0243B8 0028+00 1/1 0/0 0/0 .rodata          text_b_tag$4366 */
 SECTION_RODATA static u64 const text_b_tag[5] = {
-    'btext1_1',
-    'btext1_2',
-    'btext1_3',
-    'btext1_4',
-    'btext1_5',
+    'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5',
 };
 COMPILER_STRIP_GATE(0x80397D58, &text_b_tag);
 
diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp
index f9ee19e1edd..5e5dbc971a4 100644
--- a/src/d/menu/d_menu_window.cpp
+++ b/src/d/menu/d_menu_window.cpp
@@ -4,24 +4,24 @@
 //
 
 #include "d/menu/d_menu_window.h"
+#include "Z2AudioLib/Z2AudioMgr.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/menu/d_menu_collect.h"
-#include "d/menu/d_menu_ring.h"
-#include "d/menu/d_menu_skill.h"
-#include "d/menu/d_menu_save.h"
-#include "d/menu/d_menu_letter.h"
-#include "d/menu/d_menu_fmap.h"
 #include "d/menu/d_menu_dmap.h"
 #include "d/menu/d_menu_fishing.h"
+#include "d/menu/d_menu_fmap.h"
 #include "d/menu/d_menu_insect.h"
+#include "d/menu/d_menu_letter.h"
 #include "d/menu/d_menu_option.h"
+#include "d/menu/d_menu_ring.h"
+#include "d/menu/d_menu_save.h"
+#include "d/menu/d_menu_skill.h"
 #include "d/menu/d_menu_window_HIO.h"
 #include "d/meter/d_meter_HIO.h"
 #include "d/msg/d_msg_object.h"
-#include "f_op/f_op_msg_mng.h"
-#include "Z2AudioLib/Z2AudioMgr.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "f_op/f_op_msg_mng.h"
 
 //
 // Forward References:
@@ -1246,12 +1246,17 @@ void dMw_c::collect_move_init(u8 menu_status) {
 
 /* 801FA46C-801FA538 1F4DAC 00CC+00 1/0 0/0 0/0 .text            collect_close_init__5dMw_cFUc */
 void dMw_c::collect_close_init(u8 param_0) {
-    if (mpMenuCollect->getSubWindowOpenCheck() != 1 && mpMenuCollect->getSubWindowOpenCheck() != 2) {
-        if (mpMenuCollect->getSubWindowOpenCheck() == 3 || mpMenuCollect->getSubWindowOpenCheck() == 4 ||
-            mpMenuCollect->getSubWindowOpenCheck() == 5 || mpMenuCollect->getSubWindowOpenCheck() == 6) {
-            Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_IN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
+    if (mpMenuCollect->getSubWindowOpenCheck() != 1 &&
+        mpMenuCollect->getSubWindowOpenCheck() != 2) {
+        if (mpMenuCollect->getSubWindowOpenCheck() == 3 ||
+            mpMenuCollect->getSubWindowOpenCheck() == 4 ||
+            mpMenuCollect->getSubWindowOpenCheck() == 5 ||
+            mpMenuCollect->getSubWindowOpenCheck() == 6) {
+            Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_SUB_IN, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
+                                            -1.0f, 0);
         } else {
-            Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
+            Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MENU_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
+                                            0);
             dMeter2Info_set2DVibrationM();
         }
     }
@@ -1498,7 +1503,8 @@ void dMw_c::collect_move_proc() {
     if (mpMenuCollect->getSubWindowOpenCheck()) {
         mMenuStatus = COLLECT_CLOSE;
     } else {
-        if ((dMw_isPush_S_Button() && !mpMenuCollect->isKeyCheck()) || mpMenuCollect->isOutCheck()) {
+        if ((dMw_isPush_S_Button() && !mpMenuCollect->isKeyCheck()) ||
+            mpMenuCollect->isOutCheck()) {
             mMenuStatus = COLLECT_CLOSE;
         } else {
             mpMenuCollect->_move();
@@ -1563,7 +1569,8 @@ void dMw_c::fmap_move_proc() {
 
         if (g_fmapHIO.field_0x2f9 != 0) {
             mMenuStatus = FMAP_CLOSE;
-            Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
+            Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
+                                            -1.0f, 0);
         }
 
         if (dMeter2Info_getMeterMapClass() != NULL) {
@@ -1609,24 +1616,27 @@ void dMw_c::dmap_move_proc() {
         dMeter2Info_setMapKeyDirection(0x200);
         mMenuStatus = DMAP_CLOSE;
         mpMenuDmap->setInOutDir(3);
-        Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
+        Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
+                                        0);
     } else if (nextStatus == 2) {
         dMeter2Info_setMapStatus(0);
         dMeter2Info_setMapKeyDirection(0x400);
         mMenuStatus = DMAP_CLOSE;
         dMeter2Info_getMeterMapClass()->setDispPosOutsideFlg_SE_On();
         mpMenuDmap->setInOutDir(1);
-        Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
+        Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
+                                        0);
     } else if (nextStatus == 3) {
         if (dMeterMap_c::isEnableDispMapAndMapDispSizeTypeNo()) {
             dMeter2Info_setMapStatus(1);
         } else {
             dMeter2Info_setMapStatus(0);
         }
-        
+
         mMenuStatus = DMAP_CLOSE;
         mpMenuDmap->setInOutDir(2);
-        Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
+        Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_MAP_CLOSE_L, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
+                                        0);
     } else {
         mpMenuDmap->_move();
     }
@@ -1713,7 +1723,7 @@ void dMw_c::collect_option_close_proc() {
 void dMw_c::collect_letter_open_proc() {
     if (mpMenuLetter->getStatus() == 1) {
         mpMenuLetter->_open();
-        
+
         if (field_0x152 == 0 && mpMenuLetter->isSync()) {
             dMw_fade_in();
             field_0x152 = 1;
@@ -1752,7 +1762,7 @@ void dMw_c::collect_letter_close_proc() {
 void dMw_c::collect_fishing_open_proc() {
     if (mpMenuFishing->getStatus() == 1) {
         mpMenuFishing->_open();
-        
+
         if (field_0x152 == 0 && mpMenuFishing->isSync()) {
             dMw_fade_in();
             field_0x152 = 1;
@@ -1868,7 +1878,7 @@ void dMw_c::insect_open_proc() {
         dComIfGp_setHeapLockFlag(1);
         dMw_insect_create(1);
         mMenuStatus = INSECT_AGITHA_OPEN2;
-    } 
+    }
 }
 
 /* 801FBC78-801FBD08 1F65B8 0090+00 1/0 0/0 0/0 .text            insect_open2_proc__5dMw_cFv */
@@ -1969,7 +1979,7 @@ void dMw_c::dMw_capture_delete() {
 void dMw_c::dMw_ring_create(u8 param_0) {
     markMemSize();
     dComIfGp_setHeapLockFlag(1);
-    
+
     mpMenuRing = new dMenu_Ring_c(mpHeap, mpStick, mpCStick, param_0);
     mpMenuRing->_create();
 
@@ -2006,8 +2016,7 @@ void dMw_c::dMw_collect_create() {
 
     if (mDoCPd_c::getHoldLockL(mDoCPd_c::PAD_0)) {
         dMw_onButtonBit(1);
-    }
-    else if (mDoCPd_c::getHoldLockR(mDoCPd_c::PAD_0)) {
+    } else if (mDoCPd_c::getHoldLockR(mDoCPd_c::PAD_0)) {
         dMw_onButtonBit(2);
     }
 }
@@ -2029,14 +2038,10 @@ void dMw_c::dMw_fmap_create() {
     dComIfGp_setHeapLockFlag(2);
 
     u8 tmp = 0;
-    if (dMeter2Info_getMapKeyDirection() == 0x400 ||
-        dMeter2Info_getMapStatus() == 3 ||
-        dMeter2Info_getMapStatus() == 4 ||
-        dMeter2Info_getMapStatus() == 5 ||
-        dMeter2Info_getMapStatus() == 7 ||
-        dMeter2Info_getMapStatus() == 8 ||
-        dMeter2Info_getMapStatus() == 9 ||
-        dMeter2Info_getMapStatus() == 6) {
+    if (dMeter2Info_getMapKeyDirection() == 0x400 || dMeter2Info_getMapStatus() == 3 ||
+        dMeter2Info_getMapStatus() == 4 || dMeter2Info_getMapStatus() == 5 ||
+        dMeter2Info_getMapStatus() == 7 || dMeter2Info_getMapStatus() == 8 ||
+        dMeter2Info_getMapStatus() == 9 || dMeter2Info_getMapStatus() == 6) {
         tmp = 1;
     } else if (dMeter2Info_getMapKeyDirection() == 0x200) {
         tmp = 3;
@@ -2045,8 +2050,9 @@ void dMw_c::dMw_fmap_create() {
     } else if (dMeter2Info_getMapKeyDirection() == 0x80) {
         tmp = 3;
     }
-    
-    mpMenuFmap = new dMenu_Fmap_c(mpHeap, mpStick, mpCStick, field_0x14E, field_0x14F, field_0x150, field_0x13c, field_0x140, tmp);
+
+    mpMenuFmap = new dMenu_Fmap_c(mpHeap, mpStick, mpCStick, field_0x14E, field_0x14F, field_0x150,
+                                  field_0x13c, field_0x140, tmp);
 
     if (mpCapture == NULL) {
         mpCapture = new dDlst_MENU_CAPTURE_c();
@@ -2104,9 +2110,9 @@ void dMw_c::dMw_dmap_create() {
     } else if (dMeter2Info_getMapKeyDirection() == 0x80) {
         tmp = 0;
     }
-    
+
     mpMenuDmap = new dMenu_Dmap_c(mpHeap, mpStick, mpCStick, field_0x14C, tmp);
-    
+
     dMeter2Info_resetWarpStatus();
 }
 
@@ -2135,7 +2141,7 @@ bool dMw_c::dMw_dmap_delete(bool param_0) {
 /* 801FC520-801FC5D0 1F6E60 00B0+00 1/1 0/0 0/0 .text            dMw_save_create__5dMw_cFv */
 void dMw_c::dMw_save_create() {
     markMemSize();
-    
+
     mpMenuSave = new dMenu_save_c();
     mpMenuSave->setUseType(1);
     mpMenuSave->_create();
@@ -2166,7 +2172,7 @@ bool dMw_c::dMw_save_delete() {
 /* 801FC668-801FC70C 1F6FA8 00A4+00 1/1 0/0 0/0 .text            dMw_option_create__5dMw_cFv */
 void dMw_c::dMw_option_create() {
     markMemSize();
-    
+
     mpMenuOption = new dMenu_Option_c(dComIfGp_getCollectResArchive(), mpStick);
 
     if (mpCapture == NULL) {
@@ -2197,7 +2203,7 @@ bool dMw_c::dMw_option_delete() {
 /* 801FC7BC-801FC85C 1F70FC 00A0+00 1/1 0/0 0/0 .text            dMw_letter_create__5dMw_cFv */
 void dMw_c::dMw_letter_create() {
     markMemSize();
-    
+
     mpMenuLetter = new dMenu_Letter_c(mpHeap, mpStick, mpCStick);
 
     if (mpCapture == NULL) {
@@ -2227,7 +2233,7 @@ bool dMw_c::dMw_letter_delete() {
 /* 801FC904-801FC9A4 1F7244 00A0+00 1/1 0/0 0/0 .text            dMw_fishing_create__5dMw_cFv */
 void dMw_c::dMw_fishing_create() {
     markMemSize();
-    
+
     mpMenuFishing = new dMenu_Fishing_c(mpHeap, mpStick, mpCStick);
 
     if (mpCapture == NULL) {
@@ -2257,7 +2263,7 @@ bool dMw_c::dMw_fishing_delete() {
 /* 801FCA4C-801FCAEC 1F738C 00A0+00 1/1 0/0 0/0 .text            dMw_skill_create__5dMw_cFv */
 void dMw_c::dMw_skill_create() {
     markMemSize();
-    
+
     mpMenuSkill = new dMenu_Skill_c(mpHeap, mpStick, mpCStick);
     if (mpCapture == NULL) {
         mpCapture = new dDlst_MENU_CAPTURE_c();
@@ -2286,7 +2292,7 @@ bool dMw_c::dMw_skill_delete() {
 /* 801FCB94-801FCC44 1F74D4 00B0+00 2/2 0/0 0/0 .text            dMw_insect_create__5dMw_cFUc */
 void dMw_c::dMw_insect_create(u8 param_0) {
     markMemSize();
-    
+
     mpMenuInsect = new dMenu_Insect_c(mpHeap, mpStick, mpCStick, param_0);
     if (mpCapture == NULL) {
         mpCapture = new dDlst_MENU_CAPTURE_c();
@@ -2420,15 +2426,12 @@ bool dMw_c::isEventCheck() {
 
         if (dComIfGp_event_runCheck()) {
             if (!dMsgObject_isTalkNowCheck() &&
-                (dMeter2Info_getMapStatus() == 4 ||
-                dMeter2Info_getMapStatus() == 5 ||
-                dMeter2Info_getMapStatus() == 7 ||
-                dMeter2Info_getMapStatus() == 8 ||
-                dMeter2Info_getMapStatus() == 9 ||
-                dMeter2Info_getMapStatus() == 6 ||
-                dMeter2Info_getMapStatus() == 3 ||
-                dMeter2Info_isMenuInForce(2) || dMeter2Info_getPauseStatus() == 8)) {
-                    return false;
+                (dMeter2Info_getMapStatus() == 4 || dMeter2Info_getMapStatus() == 5 ||
+                 dMeter2Info_getMapStatus() == 7 || dMeter2Info_getMapStatus() == 8 ||
+                 dMeter2Info_getMapStatus() == 9 || dMeter2Info_getMapStatus() == 6 ||
+                 dMeter2Info_getMapStatus() == 3 || dMeter2Info_isMenuInForce(2) ||
+                 dMeter2Info_getPauseStatus() == 8)) {
+                return false;
             }
             return true;
         }
@@ -2460,7 +2463,7 @@ void dMw_c::checkMemSize() {
 /* 801FD140-801FD2D8 1F7A80 0198+00 1/1 0/0 0/0 .text            _create__5dMw_cFv */
 int dMw_c::_create() {
     mpHeap = dComIfGp_getExpHeap2D();
-    
+
     mpStick = new STControl(5, 2, 1, 1, 0.9f, 0.5f, 0, 0x800);
     mpStick->setFirstWaitTime(8);
 
@@ -2542,7 +2545,7 @@ int dMw_c::_draw() {
             if (mpMenuSave != NULL) {
                 mpMenuSave->_draw2();
             }
-            
+
             if (mpMenuOption != NULL) {
                 dComIfGd_set2DOpa(mpMenuOption);
             }