format

11 files changed, 61 insertions, 53 deletions

diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h
index 3a99422819..5974961dac 100644
--- a/include/JSystem/J2DGraph/J2DAnimation.h
+++ b/include/JSystem/J2DGraph/J2DAnimation.h
@@ -11,13 +11,13 @@
 class J2DScreen;
 
 enum J2DAnmKind {
-    KIND_TRANSFORM   = 0,
-    KIND_COLOR       = 1,
+    KIND_TRANSFORM = 0,
+    KIND_COLOR = 1,
     KIND_TEX_PATTERN = 2,
     KIND_TEXTURE_SRT = 4,
-    KIND_TEV_REG     = 5,
-    KIND_VISIBILITY  = 6,
-    KIND_VTX_COLOR   = 7
+    KIND_TEV_REG = 5,
+    KIND_VISIBILITY = 6,
+    KIND_VTX_COLOR = 7
 };
 
 class J2DAnmBase {
diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h
index 1bca78e0bf..59203403b1 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModelData.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h
@@ -43,10 +43,18 @@ public:
     bool checkFlag(u32 flag) const { return !!(mFlags & flag); }
     bool checkBumpFlag() const { return mbHasBumpArray; }
     bool checkBBoardFlag() const { return mbHasBillboard == 1; }
-    int removeTexNoAnimator(J3DAnmTexPattern* anm) { return mMaterialTable.removeTexNoAnimator(anm); }
-    int removeTexMtxAnimator(J3DAnmTextureSRTKey* anm) { return mMaterialTable.removeTexMtxAnimator(anm); }
-    int removeTevRegAnimator(J3DAnmTevRegKey* anm) { return mMaterialTable.removeTevRegAnimator(anm); }
-    int removeMatColorAnimator(J3DAnmColor* anm) { return mMaterialTable.removeMatColorAnimator(anm); }
+    int removeTexNoAnimator(J3DAnmTexPattern* anm) {
+        return mMaterialTable.removeTexNoAnimator(anm);
+    }
+    int removeTexMtxAnimator(J3DAnmTextureSRTKey* anm) {
+        return mMaterialTable.removeTexMtxAnimator(anm);
+    }
+    int removeTevRegAnimator(J3DAnmTevRegKey* anm) {
+        return mMaterialTable.removeTevRegAnimator(anm);
+    }
+    int removeMatColorAnimator(J3DAnmColor* anm) {
+        return mMaterialTable.removeMatColorAnimator(anm);
+    }
 
 private:
     /* 0x04 */ void* mpRawData;
diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h
index 866dbe34e5..f18551d7ed 100644
--- a/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/include/JSystem/J3DGraphBase/J3DShape.h
@@ -31,8 +31,8 @@ public:
     u32 getMtxIdxRegB() const { return mMtxIdxRegB; }
 
     inline void load() const {
-        J3DFifoWriteCPCmd(0x30, getMtxIdxRegA()); // CP_MATINDEX_A
-        J3DFifoWriteCPCmd(0x40, getMtxIdxRegB()); // CP_MATINDEX_B
+        J3DFifoWriteCPCmd(0x30, getMtxIdxRegA());  // CP_MATINDEX_A
+        J3DFifoWriteCPCmd(0x40, getMtxIdxRegB());  // CP_MATINDEX_B
         J3DFifoWriteXFCmd(0x1018, 2);
         GFX_FIFO(u32) = getMtxIdxRegA();
         GFX_FIFO(u32) = getMtxIdxRegB();
@@ -44,12 +44,12 @@ class J3DVertexData;
 class J3DDrawMtxData;
 
 enum J3DShpFlag {
-    J3DShpFlag_Visible     = 0x0001,
-    J3DShpFlag_SkinPosCpu  = 0x0004,
-    J3DShpFlag_SkinNrmCpu  = 0x0008,
-    J3DShpFlag_Hidden      = 0x0010,
-    J3DShpFlag_EnableLod   = 0x0100,
-    J3DShpFlag_NoMtx       = 0x0200,
+    J3DShpFlag_Visible = 0x0001,
+    J3DShpFlag_SkinPosCpu = 0x0004,
+    J3DShpFlag_SkinNrmCpu = 0x0008,
+    J3DShpFlag_Hidden = 0x0010,
+    J3DShpFlag_EnableLod = 0x0100,
+    J3DShpFlag_NoMtx = 0x0200,
 };
 
 class J3DShape {
diff --git a/include/JSystem/JAudio2/JASDvdThread.h b/include/JSystem/JAudio2/JASDvdThread.h
index 779461a72f..0e05c452d9 100644
--- a/include/JSystem/JAudio2/JASDvdThread.h
+++ b/include/JSystem/JAudio2/JASDvdThread.h
@@ -1,8 +1,8 @@
 #ifndef JASDVDTHREAD_H
 #define JASDVDTHREAD_H
 
-#include "dolphin/types.h"
 #include "JSystem/JAudio2/JASTaskThread.h"
+#include "dolphin/types.h"
 
 class JASDvd {
 public:
diff --git a/include/JSystem/JAudio2/JASTaskThread.h b/include/JSystem/JAudio2/JASTaskThread.h
index 82f9a9f2ac..d98f9bb450 100644
--- a/include/JSystem/JAudio2/JASTaskThread.h
+++ b/include/JSystem/JAudio2/JASTaskThread.h
@@ -1,8 +1,8 @@
 #ifndef JASTASKTHREAD_H
 #define JASTASKTHREAD_H
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRThread.h"
+#include "dolphin/types.h"
 
 class JASTaskThread : public JKRThread {
 public:
diff --git a/include/JSystem/JKernel/JKRAssertHeap.h b/include/JSystem/JKernel/JKRAssertHeap.h
index 58c4345d5c..3d8693ea6e 100644
--- a/include/JSystem/JKernel/JKRAssertHeap.h
+++ b/include/JSystem/JKernel/JKRAssertHeap.h
@@ -10,23 +10,23 @@ protected:
     virtual ~JKRAssertHeap();
 
 public:
-    /* vt[04] */ virtual u32 getHeapType(void);           /* override */
-    /* vt[05] */ virtual bool check(void);                /* override */
-    /* vt[06] */ virtual bool dump_sort(void);            /* override */
-    /* vt[07] */ virtual bool dump(void);                 /* override */
-    /* vt[08] */ virtual void do_destroy(void);           /* override */
-    /* vt[09] */ virtual void* do_alloc(u32, int);        /* override */
-    /* vt[10] */ virtual void do_free(void*);             /* override */
-    /* vt[11] */ virtual void do_freeAll(void);           /* override */
-    /* vt[12] */ virtual void do_freeTail(void);          /* override */
-    /* vt[13] */ virtual void do_fillFreeArea(void);      /* override */
-    /* vt[14] */ virtual s32 do_resize(void*, u32);       /* override */
-    /* vt[15] */ virtual s32 do_getSize(void*);           /* override */
-    /* vt[16] */ virtual s32 do_getFreeSize(void);        /* override */
-    /* vt[17] */ virtual void* do_getMaxFreeBlock(void);  /* override */
-    /* vt[18] */ virtual s32 do_getTotalFreeSize(void);   /* override */
+    /* vt[04] */ virtual u32 getHeapType(void);            /* override */
+    /* vt[05] */ virtual bool check(void);                 /* override */
+    /* vt[06] */ virtual bool dump_sort(void);             /* override */
+    /* vt[07] */ virtual bool dump(void);                  /* override */
+    /* vt[08] */ virtual void do_destroy(void);            /* override */
+    /* vt[09] */ virtual void* do_alloc(u32, int);         /* override */
+    /* vt[10] */ virtual void do_free(void*);              /* override */
+    /* vt[11] */ virtual void do_freeAll(void);            /* override */
+    /* vt[12] */ virtual void do_freeTail(void);           /* override */
+    /* vt[13] */ virtual void do_fillFreeArea(void);       /* override */
+    /* vt[14] */ virtual s32 do_resize(void*, u32);        /* override */
+    /* vt[15] */ virtual s32 do_getSize(void*);            /* override */
+    /* vt[16] */ virtual s32 do_getFreeSize(void);         /* override */
+    /* vt[17] */ virtual void* do_getMaxFreeBlock(void);   /* override */
+    /* vt[18] */ virtual s32 do_getTotalFreeSize(void);    /* override */
     /* vt[19] */ virtual s32 do_changeGroupID(u8 param_1); /* override */
-    /* vt[20] */ virtual u8 do_getCurrentGroupId(void);   /* override */
+    /* vt[20] */ virtual u8 do_getCurrentGroupId(void);    /* override */
 
 public:
     static JKRAssertHeap* create(JKRHeap*);
diff --git a/include/JSystem/JKernel/JKRDvdAramRipper.h b/include/JSystem/JKernel/JKRDvdAramRipper.h
index 040015d0d7..fa9f33357c 100644
--- a/include/JSystem/JKernel/JKRDvdAramRipper.h
+++ b/include/JSystem/JKernel/JKRDvdAramRipper.h
@@ -37,7 +37,8 @@ class JKRDvdAramRipper {
 public:
     static JKRAramBlock* loadToAram(long, u32, JKRExpandSwitch, u32, u32, u32*);
     static JKRAramBlock* loadToAram(JKRDvdFile*, u32, JKRExpandSwitch, u32, u32, u32*);
-    static JKRADCommand* loadToAram_Async(JKRDvdFile*, u32, JKRExpandSwitch, void (*)(u32), u32, u32, u32*);
+    static JKRADCommand* loadToAram_Async(JKRDvdFile*, u32, JKRExpandSwitch, void (*)(u32), u32,
+                                          u32, u32*);
     static JKRADCommand* callCommand_Async(JKRADCommand*);
     static bool syncAram(JKRADCommand*, int);
 
diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h
index 257e0bfc4b..8ee16b87f0 100644
--- a/include/JSystem/JKernel/JKRExpHeap.h
+++ b/include/JSystem/JKernel/JKRExpHeap.h
@@ -73,7 +73,7 @@ public:
     /* vt[16] */ virtual s32 do_getFreeSize();                             /* override */
     /* vt[17] */ virtual void* do_getMaxFreeBlock();                       /* override */
     /* vt[18] */ virtual s32 do_getTotalFreeSize();                        /* override */
-    /* vt[19] */ virtual s32 do_changeGroupID(u8 newGroupID);               /* override */
+    /* vt[19] */ virtual s32 do_changeGroupID(u8 newGroupID);              /* override */
     /* vt[20] */ virtual u8 do_getCurrentGroupId();                        /* override */
     /* vt[21] */ virtual void state_register(JKRHeap::TState*, u32) const; /* override */
     /* vt[22] */ virtual bool state_compare(JKRHeap::TState const&,
diff --git a/include/JSystem/JParticle/JPADynamicsBlock.h b/include/JSystem/JParticle/JPADynamicsBlock.h
index 8b3e441c19..9519972e5f 100644
--- a/include/JSystem/JParticle/JPADynamicsBlock.h
+++ b/include/JSystem/JParticle/JPADynamicsBlock.h
@@ -43,10 +43,10 @@ struct JPADynamicsBlockData {
 typedef void (*JPADynamicsCalcVolumeFunc)(JPAEmitterWorkData*);
 
 enum {
-    JPADynFlag_FixedDensity   = 0x01,
-    JPADynFlag_FixedInterval  = 0x02,
-    JPADynFlag_InheritScale   = 0x04,
-    JPADynFlag_FollowEmtr     = 0x08,
+    JPADynFlag_FixedDensity = 0x01,
+    JPADynFlag_FixedInterval = 0x02,
+    JPADynFlag_InheritScale = 0x04,
+    JPADynFlag_FollowEmtr = 0x08,
     JPADynFlag_FollowEmtrChld = 0x10,
 };
 
diff --git a/include/JSystem/JParticle/JPAParticle.h b/include/JSystem/JParticle/JPAParticle.h
index 2c50176b8a..0c009f21b4 100644
--- a/include/JSystem/JParticle/JPAParticle.h
+++ b/include/JSystem/JParticle/JPAParticle.h
@@ -34,12 +34,13 @@ public:
     JPARandom() { mSeed = 0; }
     void set_seed(u32 seed) { mSeed = seed; }
 
-    u32 get_rndm_u() {
-        return mSeed = mSeed * 0x19660du + 0x3c6ef35fu;
-    }
+    u32 get_rndm_u() { return mSeed = mSeed * 0x19660du + 0x3c6ef35fu; }
 
     f32 get_rndm_f() {
-        union { u32 u; f32 f; } a;
+        union {
+            u32 u;
+            f32 f;
+        } a;
         a.u = ((get_rndm_u() >> 9) | 0x3f800000);
         return a.f - 1.0f;
     }
@@ -54,9 +55,7 @@ public:
         return f - 1.0f;
     }
 
-    s16 get_rndm_ss() {
-        return ((s16)get_rndm_u()) >> 16;
-    }
+    s16 get_rndm_ss() { return ((s16)get_rndm_u()) >> 16; }
 
 public:
     u32 mSeed;
@@ -203,9 +202,9 @@ public:
 };
 
 enum {
-    JPAEmtrStts_StopEmit     = 0x01,
-    JPAEmtrStts_StopCalc     = 0x02,
-    JPAEmtrStts_FirstEmit    = 0x10,
+    JPAEmtrStts_StopEmit = 0x01,
+    JPAEmtrStts_StopCalc = 0x02,
+    JPAEmtrStts_FirstEmit = 0x10,
     JPAEmtrStts_RateStepEmit = 0x20,
 };
 
diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h
index b25321d731..49a5a0315e 100644
--- a/include/JSystem/JUtility/JUTGamePad.h
+++ b/include/JSystem/JUtility/JUTGamePad.h
@@ -111,7 +111,7 @@ public:
     u8 getAnalogR() const { return mButton.mAnalogR; }
 
     s8 getErrorStatus() const { return mErrorStatus; }
-    
+
     s16 getPortNum() const { return mPortNum; }
 
     JUTGamePadRecordBase* getPadReplay() const { return mPadReplay; }
@@ -215,7 +215,7 @@ public:
         static void setEnabled(u32 pad_mask);
 
         void stopMotorHard(int portNo) { stopMotor(portNo, true); }
-        
+
         static bool isEnabled(u32 mask) { return mEnabled & mask; }
         static bool isEnabledPort(int port) { return isEnabled(sChannelMask[port]); }