diff --git a/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h b/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h
index ef6cd04dc1..52cffc57a2 100644
--- a/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h
+++ b/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h
@@ -1,8 +1,6 @@
 #ifndef J2DSCREEN_H_
 #define J2DSCREEN_H_
 
-class J2DScreen {
-
-};
+class J2DScreen {};
 
 #endif
\ No newline at end of file
diff --git a/include/JSystem/J3DGraphAnimator/J3DJoint.h b/include/JSystem/J3DGraphAnimator/J3DJoint.h
index a581b451d6..16fbb47ef0 100644
--- a/include/JSystem/J3DGraphAnimator/J3DJoint.h
+++ b/include/JSystem/J3DGraphAnimator/J3DJoint.h
@@ -1,8 +1,6 @@
 #ifndef J3DJOINT_H_
 #define J3DJOINT_H_
 
-struct J3DJoint{
-
-};
+struct J3DJoint {};
 
 #endif
\ No newline at end of file
diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h
index a42288f94f..74c313c1eb 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModel.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModel.h
@@ -1,8 +1,6 @@
 #ifndef J3DMODEL_H_
 #define J3DMODEL_H_
 
-struct J3DModel{
-
-};
+struct J3DModel {};
 
 #endif
\ No newline at end of file
diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h
index 11bba6653e..b4932f6559 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModelData.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h
@@ -1,8 +1,6 @@
 #ifndef J3DMODELDATA_H_
 #define J3DMODELDATA_H_
 
-struct J3DModelData{
-
-};
+struct J3DModelData {};
 
 #endif
\ No newline at end of file
diff --git a/include/JSystem/J3DGraphAnimator/J3DModelLoader.h b/include/JSystem/J3DGraphAnimator/J3DModelLoader.h
index 1c6e0a282f..247f11f844 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModelLoader.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModelLoader.h
@@ -1,8 +1,6 @@
 #ifndef J3DMODELLOADER_H_
 #define J3DMODELLOADER_H_
 
-struct J3DMaterial{
-
-};
+struct J3DMaterial {};
 
 #endif
\ No newline at end of file
diff --git a/include/JSystem/JAudio2/JAISe/JAISe.h b/include/JSystem/JAudio2/JAISe/JAISe.h
index 856a7a7ae7..1960eadd76 100644
--- a/include/JSystem/JAudio2/JAISe/JAISe.h
+++ b/include/JSystem/JAudio2/JAISe/JAISe.h
@@ -3,9 +3,9 @@
 
 #include "global.h"
 
-struct  JAISoundID{
+struct JAISoundID {
     u32 soundId;
-    JAISoundID(JAISoundID const &soundIdToSet);
+    JAISoundID(JAISoundID const& soundIdToSet);
 };
 
 #endif
\ No newline at end of file
diff --git a/include/JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h b/include/JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h
index 8979a65e87..6048eec2ae 100644
--- a/include/JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h
+++ b/include/JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h
@@ -3,8 +3,6 @@
 
 #include "global.h"
 
-struct JAISoundHandle{
-
-};
+struct JAISoundHandle {};
 
 #endif
\ No newline at end of file
diff --git a/include/JSystem/JKernel/JKRAram/JKRAram.h b/include/JSystem/JKernel/JKRAram/JKRAram.h
index 8bbf87c10d..cd68c73086 100644
--- a/include/JSystem/JKernel/JKRAram/JKRAram.h
+++ b/include/JSystem/JKernel/JKRAram/JKRAram.h
@@ -1,8 +1,8 @@
 #ifndef __JKRARAM_H__
 #define __JKRARAM_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRThread/JKRThread.h"
+#include "dolphin/types.h"
 
 // JKRExpandSwitch
 #include "JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h"
@@ -13,21 +13,17 @@
 class JKRHeap;
 class JKRAramBlock;
 class JKRAram : public JKRThread {
-  private:
+private:
     JKRAram(u32, u32, long);
     virtual ~JKRAram();
 
     /* vt[03] */ void* run(void); /* override */
-    
-  public:
-    void* getAudioMemory() {
-        return this->mAudioMemoryPtr;
-    }
-    u32 getAudioMemSize() {
-        return this->mAudioMemorySize;
-    }
 
-  private:
+public:
+    void* getAudioMemory() { return this->mAudioMemoryPtr; }
+    u32 getAudioMemSize() { return this->mAudioMemorySize; }
+
+private:
     void* mAudioMemoryPtr;
     u32 mAudioMemorySize;
     void* mGraphMemoryPtr;
@@ -38,20 +34,16 @@ class JKRAram : public JKRThread {
     u32 field_0x9c;
     u32 field_0xa0;
 
-  public:
+public:
     static void create(u32, u32, long, long, long);
     static void checkOkAddress(u8*, u32, JKRAramBlock*, u32);
     static void changeGroupIdIfNeed(u8*, int);
     static void mainRamToAram(u8*, u32, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
     static void aramToMainRam(u32, u8*, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
 
-    static JKRAram* getManager() {
-        return lbl_804513C8;
-    }
+    static JKRAram* getManager() { return lbl_804513C8; }
 
-    static JKRAramHeap* getAramHeap() {
-        return getManager()->mAramHeap;
-    }
+    static JKRAramHeap* getAramHeap() { return getManager()->mAramHeap; }
 
     static u8 decideAramGroupId(int groupId) {
         JKRAramHeap* heap;
@@ -64,13 +56,9 @@ class JKRAram : public JKRThread {
         return (u8)groupId;
     }
 
-    static u32 getSZSBufferSize() {
-        return lbl_804508B8;
-    }
+    static u32 getSZSBufferSize() { return lbl_804508B8; }
 
-    void setSZSBufferSize(u32 size) {
-        lbl_804508B8 = size;
-    }
+    void setSZSBufferSize(u32 size) { lbl_804508B8 = size; }
 };
 
 void JKRDecompressFromAramToMainRam(u32, void*, u32, u32, u32, u32*);
diff --git a/include/JSystem/JKernel/JKRAramArchive/JKRAramArchive.h b/include/JSystem/JKernel/JKRAramArchive/JKRAramArchive.h
index 4b8efa9c63..f3797e3e94 100644
--- a/include/JSystem/JKernel/JKRAramArchive/JKRAramArchive.h
+++ b/include/JSystem/JKernel/JKRAramArchive/JKRAramArchive.h
@@ -1,11 +1,11 @@
 #ifndef __JKRARAMARCHIVE_H__
 #define __JKRARAMARCHIVE_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRArchive/JKRArchive.h"
+#include "dolphin/types.h"
 
 class JKRAramArchive : public JKRArchive {
-  public:
+public:
     JKRAramArchive(long, JKRArchive::EMountDirection);
     virtual ~JKRAramArchive();
 
@@ -17,7 +17,7 @@ class JKRAramArchive : public JKRArchive {
     /* vt[16] */ void fetchResource(JKRArchive::SDIFileEntry*, u32*);             /* override */
     /* vt[17] */ void fetchResource(void*, u32, JKRArchive::SDIFileEntry*, u32*); /* override */
 
-  public:
+public:
     static void fetchResource_subroutine(u32, u32, u8*, u32, int);
     static void fetchResource_subroutine(u32, u32, JKRHeap*, int, u8**);
 };
diff --git a/include/JSystem/JKernel/JKRAramBlock/JKRAramBlock.h b/include/JSystem/JKernel/JKRAramBlock/JKRAramBlock.h
index e4d2c333b7..895bd38051 100644
--- a/include/JSystem/JKernel/JKRAramBlock/JKRAramBlock.h
+++ b/include/JSystem/JKernel/JKRAramBlock/JKRAramBlock.h
@@ -1,35 +1,27 @@
 #ifndef __JKRARAMBLOCK_H__
 #define __JKRARAMBLOCK_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JSupport/JSUList/JSUList.h"
+#include "dolphin/types.h"
 
 class JKRAramHeap;
 class JKRAramBlock {
-  public:
+public:
     JKRAramBlock(u32, u32, u32, u8, bool);
     virtual ~JKRAramBlock();
 
     void allocHead(u32, u8, JKRAramHeap*);
     void allocTail(u32, u8, JKRAramHeap*);
 
-    void* getAddress() {
-        return (void*)this->mAddress;
-    }
+    void* getAddress() { return (void*)this->mAddress; }
 
-    u32 getSize() {
-        return this->mSize;
-    }
+    u32 getSize() { return this->mSize; }
 
-    bool isTempMemory() {
-        return this->mIsTempMemory;
-    }
+    bool isTempMemory() { return this->mIsTempMemory; }
 
-    void newGroupID(u8 groupId) {
-        this->mGroupId = groupId;
-    }
+    void newGroupID(u8 groupId) { this->mGroupId = groupId; }
 
-  public:
+public:
     JSULink<JKRAramBlock> mBlockLink;
     u32 mAddress;
     u32 mSize;
diff --git a/include/JSystem/JKernel/JKRAramHeap/JKRAramHeap.h b/include/JSystem/JKernel/JKRAramHeap/JKRAramHeap.h
index 81d4698c10..d916363293 100644
--- a/include/JSystem/JKernel/JKRAramHeap/JKRAramHeap.h
+++ b/include/JSystem/JKernel/JKRAramHeap/JKRAramHeap.h
@@ -1,18 +1,18 @@
 #ifndef __JKRARAMHEAP_H__
 #define __JKRARAMHEAP_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
+#include "dolphin/types.h"
 #include "global.h"
 
 class JKRAramHeap : public JKRDisposer {
-  public:
+public:
     enum EAllocMode {
         HEAD = 0,
         TAIL = 1,
     };
 
-  public:
+public:
     JKRAramHeap(u32, u32);
     virtual ~JKRAramHeap(void);
 
@@ -23,23 +23,15 @@ class JKRAramHeap : public JKRDisposer {
     void getTotalFreeSize(void);
     void dump(void);
 
-    u8 getCurrentGroupID() {
-        return this->mGroupId;
-    }
+    u8 getCurrentGroupID() { return this->mGroupId; }
 
-    JKRHeap* getMgrHeap() {
-        return this->mHeap;
-    }
+    JKRHeap* getMgrHeap() { return this->mHeap; }
 
-    void lock() {
-        OSLockMutex(&this->mMutex);
-    }
+    void lock() { OSLockMutex(&this->mMutex); }
 
-    void unlock() {
-        OSUnlockMutex(&this->mMutex);
-    }
+    void unlock() { OSUnlockMutex(&this->mMutex); }
 
-  public:
+public:
     OSMutex mMutex;
     JKRHeap* mHeap;
     u32 field_0x34;
diff --git a/include/JSystem/JKernel/JKRAramPiece/JKRAramPiece.h b/include/JSystem/JKernel/JKRAramPiece/JKRAramPiece.h
index c4ce359db0..051f9eef07 100644
--- a/include/JSystem/JKernel/JKRAramPiece/JKRAramPiece.h
+++ b/include/JSystem/JKernel/JKRAramPiece/JKRAramPiece.h
@@ -4,14 +4,14 @@
 #include "dolphin/types.h"
 
 class JKRAMCommand {
-  public:
+public:
     JKRAMCommand(void);
     ~JKRAMCommand();
 };
 
 class JKRAramBlock;
 class JKRAramPiece {
-  public:
+public:
     static void prepareCommand(int, u32, u32, u32, JKRAramBlock*, void (*)(u32));
     static void sendCommand(JKRAMCommand*);
 
diff --git a/include/JSystem/JKernel/JKRAramStream/JKRAramStream.h b/include/JSystem/JKernel/JKRAramStream/JKRAramStream.h
index 4a96ab7b1e..01c0f0229b 100644
--- a/include/JSystem/JKernel/JKRAramStream/JKRAramStream.h
+++ b/include/JSystem/JKernel/JKRAramStream/JKRAramStream.h
@@ -1,16 +1,16 @@
 #ifndef __JKRARAMSTREAM_H__
 #define __JKRARAMSTREAM_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRThread/JKRThread.h"
 #include "JSystem/JSupport/JSUFileInputStream/JSUFileInputStream.h"
 #include "JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h"
+#include "dolphin/types.h"
 
 class JKRAramStreamCommand {
-  public:
+public:
     JKRAramStreamCommand();
 
-  public:
+public:
     u32 field_0x00;
     u32 field_0x04;
     u32 field_0x08;
@@ -31,13 +31,13 @@ class JKRAramStreamCommand {
 };
 
 class JKRAramStream : public JKRThread {
-  private:
+private:
     JKRAramStream(long);
     virtual ~JKRAramStream();
 
     /* vt[03] */ void* run(void); /* override */
 
-  public:
+public:
     static void create(long);
 
     static void readFromAram(void);
diff --git a/include/JSystem/JKernel/JKRArchive/JKRArchive.h b/include/JSystem/JKernel/JKRArchive/JKRArchive.h
index b6608671d1..dad9dd6728 100644
--- a/include/JSystem/JKernel/JKRArchive/JKRArchive.h
+++ b/include/JSystem/JKernel/JKRArchive/JKRArchive.h
@@ -1,68 +1,59 @@
 #ifndef __JKRARCHIVEPUB_H__
 #define __JKRARCHIVEPUB_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRFileLoader/JKRFileLoader.h"
+#include "dolphin/types.h"
 
 class JKRHeap;
 class JKRDvdFile;
 class JKRArchive : public JKRFileLoader {
-  public:
+public:
     class SDirEntry {};
     class SDIFileEntry {};
 
     enum EMountMode {
         UNKNOWN_MOUNT_MODE = 0,
-        MEM                = 1,
-        ARAM               = 2,
-        DVD                = 3,
-        COMP               = 4,
+        MEM = 1,
+        ARAM = 2,
+        DVD = 3,
+        COMP = 4,
 
         __EMOUNT_MODE_PADDING_FOR_32BIT = 0xFFFFFFFF
     };
 
     enum EMountDirection {
         UNKNOWN_MOUNT_DIRECTION = 0,
-        HEAD                    = 1,
-        TAIL                    = 2,
+        HEAD = 1,
+        TAIL = 2,
 
         __EMOUNT_DIRECTION_PADDING_FOR_32BIT = 0xFFFFFFFF
     };
 
     class CArcName {
-      public:
-        CArcName() {
-        }
-        CArcName(char const* data) {
-            this->store(data);
-        }
-        CArcName(char const** data, char endChar) {
-            *data = this->store(*data, endChar);
-        }
+    public:
+        CArcName() {}
+        CArcName(char const* data) { this->store(data); }
+        CArcName(char const** data, char endChar) { *data = this->store(*data, endChar); }
 
         void store(char const* data);
         const char* store(char const* data, char endChar);
 
-        u16 getHash() {
-            return mHash;
-        }
-        
-        const char* getString() {
-            return mData;
-        }
+        u16 getHash() { return mHash; }
 
-      private:
+        const char* getString() { return mData; }
+
+    private:
         u16 mHash;
         u16 mLength;
         char mData[64];
     };
 
-  protected:
+protected:
     JKRArchive();
     JKRArchive(long, EMountMode);
     virtual ~JKRArchive();
 
-  public:
+public:
     bool getDirEntry(SDirEntry*, u32) const;
     void getIdxResource(u32);
     void getResource(unsigned short);
@@ -80,7 +71,7 @@ class JKRArchive : public JKRFileLoader {
     void findPtrResource(void const*) const;
     void findIdResource(unsigned short) const;
 
-  public:
+public:
     /* vt[04] */ virtual void becomeCurrent(char const*);                 /* override */
     /* vt[05] */ virtual void getResource(char const*);                   /* override */
     /* vt[06] */ virtual void getResource(u32, char const*);              /* override */
@@ -93,12 +84,12 @@ class JKRArchive : public JKRFileLoader {
     /* vt[13] */ virtual void countFile(char const*) const;               /* override */
     /* vt[14] */ virtual void getFirstFile(char const*) const;            /* override */
     /* vt[15] */ virtual void getExpandedResSize(void const*) const;
-    /* vt[16] */ virtual void fetchResource(SDIFileEntry*, u32)              = 0;
+    /* vt[16] */ virtual void fetchResource(SDIFileEntry*, u32) = 0;
     /* vt[17] */ virtual void fetchResource(void*, u32, SDIFileEntry*, u32*) = 0;
     /* vt[18] */ virtual void setExpandSize(SDIFileEntry*, u32);
     /* vt[19] */ virtual void getExpandSize(SDIFileEntry*) const;
 
-  private:
+private:
     JKRHeap* mHeap;
     EMountMode mMountMode;
     int mEntryNum;
@@ -113,7 +104,7 @@ class JKRArchive : public JKRFileLoader {
     u32 field_0x64;
     JKRDvdFile* mDvdFile;
 
-  public:
+public:
     static void check_mount_already(long, JKRHeap*);
     static void mount(char const*, EMountMode, JKRHeap*, EMountDirection);
     static void mount(void*, JKRHeap*, EMountDirection);
diff --git a/include/JSystem/JKernel/JKRAssertHeap/JKRAssertHeap.h b/include/JSystem/JKernel/JKRAssertHeap/JKRAssertHeap.h
index 5785517a7d..3236d9cad0 100644
--- a/include/JSystem/JKernel/JKRAssertHeap/JKRAssertHeap.h
+++ b/include/JSystem/JKernel/JKRAssertHeap/JKRAssertHeap.h
@@ -1,15 +1,15 @@
 #ifndef __JKRASSERTHEAP_H__
 #define __JKRASSERTHEAP_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
+#include "dolphin/types.h"
 
 class JKRAssertHeap : public JKRHeap {
-  protected:
+protected:
     JKRAssertHeap(void*, unsigned long, JKRHeap*, bool);
     virtual ~JKRAssertHeap();
 
-  public:
+public:
     /* vt[04] */ virtual u32 getHeapType(void);           /* override */
     /* vt[05] */ virtual bool check(void);                /* override */
     /* vt[06] */ virtual bool dump(void);                 /* override */
@@ -28,7 +28,7 @@ class JKRAssertHeap : public JKRHeap {
     /* vt[19] */ virtual u8 do_changeGroupID(u8 param_1); /* override */
     /* vt[20] */ virtual u8 do_getCurrentGroupId(void);   /* override */
 
-  public:
+public:
     static void create(JKRHeap*);
 };
 
diff --git a/include/JSystem/JKernel/JKRCompArchive/JKRCompArchive.h b/include/JSystem/JKernel/JKRCompArchive/JKRCompArchive.h
index eda1032223..eaaa35fb99 100644
--- a/include/JSystem/JKernel/JKRCompArchive/JKRCompArchive.h
+++ b/include/JSystem/JKernel/JKRCompArchive/JKRCompArchive.h
@@ -1,11 +1,11 @@
 #ifndef __JKRCOMPARCHIVE_H__
 #define __JKRCOMPARCHIVE_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRArchive/JKRArchive.h"
+#include "dolphin/types.h"
 
 class JKRCompArchive : public JKRArchive {
-  public:
+public:
     JKRCompArchive(long, JKRArchive::EMountDirection);
     virtual ~JKRCompArchive();
 
@@ -18,7 +18,7 @@ class JKRCompArchive : public JKRArchive {
     /* vt[16] */ void fetchResource(JKRArchive::SDIFileEntry*, u32*);             /* override */
     /* vt[17] */ void fetchResource(void*, u32, JKRArchive::SDIFileEntry*, u32*); /* override */
 
-  public:
+public:
 };
 
 #endif
diff --git a/include/JSystem/JKernel/JKRDecomp/JKRDecomp.h b/include/JSystem/JKernel/JKRDecomp/JKRDecomp.h
index 86e6f67408..96e9996d15 100644
--- a/include/JSystem/JKernel/JKRDecomp/JKRDecomp.h
+++ b/include/JSystem/JKernel/JKRDecomp/JKRDecomp.h
@@ -1,23 +1,23 @@
 #ifndef __JKRDECOMP_H__
 #define __JKRDECOMP_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRThread/JKRThread.h"
+#include "dolphin/types.h"
 
 class JKRDecompCommand {
-  public:
+public:
     JKRDecompCommand();
     ~JKRDecompCommand();
 };
 
 class JKRDecomp : public JKRThread {
-  private:
+private:
     JKRDecomp(long);
     virtual ~JKRDecomp(void);
 
     /* vt[03] */ virtual void* run(); /* override */
 
-  public:
+public:
     static void create(long);
     static void prepareCommand(u8*, u8*, u32, u32, void (*)(u32));
     static void sendCommand(JKRDecompCommand*);
diff --git a/include/JSystem/JKernel/JKRDisposer/JKRDisposer.h b/include/JSystem/JKernel/JKRDisposer/JKRDisposer.h
index 3372dbfb57..7b13b5ff83 100644
--- a/include/JSystem/JKernel/JKRDisposer/JKRDisposer.h
+++ b/include/JSystem/JKernel/JKRDisposer/JKRDisposer.h
@@ -1,16 +1,16 @@
 #ifndef __JKRDISPOSER_H__
 #define __JKRDISPOSER_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JSupport/JSUList/JSUList.h"
+#include "dolphin/types.h"
 
 class JKRHeap;
 class JKRDisposer {
-  public:
+public:
     JKRDisposer();
     virtual ~JKRDisposer();
 
-  public:
+public:
     JKRHeap* mHeap;
     JSULink<JKRDisposer> mLink;
 };
diff --git a/include/JSystem/JKernel/JKRDvdAramRipper/JKRDvdAramRipper.h b/include/JSystem/JKernel/JKRDvdAramRipper/JKRDvdAramRipper.h
index 68182a53b0..8b1895e6ff 100644
--- a/include/JSystem/JKernel/JKRDvdAramRipper/JKRDvdAramRipper.h
+++ b/include/JSystem/JKernel/JKRDvdAramRipper/JKRDvdAramRipper.h
@@ -1,19 +1,19 @@
 #ifndef __JKRDVDARAMRIPPER_H__
 #define __JKRDVDARAMRIPPER_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h"
 #include "JSystem/JSupport/JSUFileInputStream/JSUFileInputStream.h"
+#include "dolphin/types.h"
 
 class JKRADCommand {
-  public:
+public:
     JKRADCommand();
     ~JKRADCommand();
 };
 
 class JKRDvdFile;
 class JKRDvdAramRipper {
-  public:
+public:
     static void loadToAram(long, u32, JKRExpandSwitch, u32, u32, u32*);
     static void loadToAram(JKRDvdFile*, u32, JKRExpandSwitch, u32, u32, u32*);
     static void loadToAram_Async(JKRDvdFile*, u32, JKRExpandSwitch, void (*)(u32), u32, u32, u32*);
diff --git a/include/JSystem/JKernel/JKRDvdArchive/JKRDvdArchive.h b/include/JSystem/JKernel/JKRDvdArchive/JKRDvdArchive.h
index 27961403d0..d98893a817 100644
--- a/include/JSystem/JKernel/JKRDvdArchive/JKRDvdArchive.h
+++ b/include/JSystem/JKernel/JKRDvdArchive/JKRDvdArchive.h
@@ -1,21 +1,22 @@
 #ifndef __JKRDVDARCHIVE_H__
 #define __JKRDVDARCHIVE_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRArchive/JKRArchive.h"
+#include "dolphin/types.h"
 
 class JKRDvdArchive : public JKRArchive {
-  public:
+public:
     JKRDvdArchive(long, JKRArchive::EMountDirection);
     virtual ~JKRDvdArchive();
 
     void open(long);
 
-    /* vt[15] */ virtual void getExpandedResSize(void const*) const;                      /* override */
-    /* vt[16] */ virtual void fetchResource(JKRArchive::SDIFileEntry*, u32*);             /* override */
-    /* vt[17] */ virtual void fetchResource(void*, u32, JKRArchive::SDIFileEntry*, u32*); /* override */
+    /* vt[15] */ virtual void getExpandedResSize(void const*) const;          /* override */
+    /* vt[16] */ virtual void fetchResource(JKRArchive::SDIFileEntry*, u32*); /* override */
+    /* vt[17] */ virtual void fetchResource(void*, u32, JKRArchive::SDIFileEntry*,
+                                            u32*); /* override */
 
-  public:
+public:
     static void fetchResource_subroutine(long, u32, u32, u8*, u32, int, int);
     static void fetchResource_subroutine(long, u32, u32, JKRHeap*, int, int, u8**);
 };
diff --git a/include/JSystem/JKernel/JKRDvdFile/JKRDvdFile.h b/include/JSystem/JKernel/JKRDvdFile/JKRDvdFile.h
index 6d9b7384e3..991f245e4a 100644
--- a/include/JSystem/JKernel/JKRDvdFile/JKRDvdFile.h
+++ b/include/JSystem/JKernel/JKRDvdFile/JKRDvdFile.h
@@ -1,14 +1,14 @@
 #ifndef __JKRDVDFILE_H__
 #define __JKRDVDFILE_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRFile/JKRFile.h"
+#include "dolphin/types.h"
 #include "dvd/dvd.h"
 #include "global.h"
 
 class DVDFileInfo;
 class JKRDvdFile : public JKRFile {
-  public:
+public:
     JKRDvdFile();
     JKRDvdFile(char const*);
     JKRDvdFile(long);
@@ -17,19 +17,13 @@ class JKRDvdFile : public JKRFile {
     void initiate(void);
     s32 sync(void);
 
-    int getFileID() const {
-        return this->mFileID << 2;
-    }
+    int getFileID() const { return this->mFileID << 2; }
 
-    const u8* getFileInfo() const {
-        return this->mDvdCommandBlock;
-    }
+    const u8* getFileInfo() const { return this->mDvdCommandBlock; }
 
-    int getStatus() {
-        return DVDGetCommandBlockStatus(&this->mDvdCommandBlock[0]);
-    }
+    int getStatus() { return DVDGetCommandBlockStatus(&this->mDvdCommandBlock[0]); }
 
-  public:
+public:
     /* vt[03] */ virtual bool open(char const*);                 /* override */
     /* vt[04] */ virtual void close(void);                       /* override */
     /* vt[05] */ virtual s32 readData(void*, long, long);        /* override */
@@ -37,7 +31,7 @@ class JKRDvdFile : public JKRFile {
     /* vt[07] */ virtual s32 getFileSize(void) const;            /* override */
     /* vt[08] */ virtual bool open(long);
 
-  private:
+private:
     OSMutex mMutex1;
     OSMutex mMutex2;
     u32 field_0x4c;
@@ -56,9 +50,8 @@ class JKRDvdFile : public JKRFile {
     JSULink<JKRDvdFile> mDvdLink;
     OSThread* mOSThread;
 
-  public:
+public:
     static void doneProcess(long, DVDFileInfo*);
 };
 
-
 #endif
diff --git a/include/JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h b/include/JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h
index e3ede27b0b..faf3408c78 100644
--- a/include/JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h
+++ b/include/JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h
@@ -10,14 +10,16 @@ enum JKRExpandSwitch {
 class JKRHeap;
 class JKRDvdFile;
 class JKRDvdRipper {
-  public:
+public:
     enum EAllocDirection {
 
     };
 
-    void loadToMainRAM(char const*, u8*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, u32, int*, u32*);
+    void loadToMainRAM(char const*, u8*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, u32, int*,
+                       u32*);
     void loadToMainRAM(long, u8*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, u32, int*, u32*);
-    void loadToMainRAM(JKRDvdFile*, u8*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, u32, int*, u32*);
+    void loadToMainRAM(JKRDvdFile*, u8*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, u32, int*,
+                       u32*);
 
     void isErrorRetry(void);
 };
diff --git a/include/JSystem/JKernel/JKRExpHeap/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap/JKRExpHeap.h
index f5fc4d542c..9e7f7d1a1c 100644
--- a/include/JSystem/JKernel/JKRExpHeap/JKRExpHeap.h
+++ b/include/JSystem/JKernel/JKRExpHeap/JKRExpHeap.h
@@ -1,57 +1,43 @@
 #ifndef __JKREXPHEAP_H__
 #define __JKREXPHEAP_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
+#include "dolphin/types.h"
 
 class JKRExpHeap : public JKRHeap {
-  public:
+public:
     class CMemBlock {
-      public:
+    public:
         void initiate(CMemBlock*, CMemBlock*, u32, u8, u8);
         void allocFore(u32, u8, u8, u8, u8);
         void allocBack(u32, u8, u8, u8, u8);
         void free(JKRExpHeap*);
         void getHeapBlock(void*);
 
-        void newGroupId(u8 groupId) {
-            this->mGroupId = groupId;
-        }
+        void newGroupId(u8 groupId) { this->mGroupId = groupId; }
 
-        bool isValid() {
-            return this->mMagic == 0x484d;
-        }
+        bool isValid() { return this->mMagic == 0x484d; }
 
-        bool _isTempMemBlock() {
-            return (this->mFlags & 0x80) ? true : false;
-        }
+        bool _isTempMemBlock() { return (this->mFlags & 0x80) ? true : false; }
 
-        int getAlignment() const {
-            return this->mFlags & 0x7f;
-        }
+        int getAlignment() const { return this->mFlags & 0x7f; }
 
-        void* getContent() {
-            return (void*)(this + 1);
-        }
+        void* getContent() { return (void*)(this + 1); }
 
-        CMemBlock* getPrevBlock() {
-            return this->mPrev;
-        }
+        CMemBlock* getPrevBlock() { return this->mPrev; }
 
-        CMemBlock* getNextBlock() {
-            return this->mNext;
-        }
+        CMemBlock* getNextBlock() { return this->mNext; }
 
-      private:
+    private:
         u16 mMagic;
-        u8 mFlags; // a|bbbbbbb a=temporary b=alignment
+        u8 mFlags;  // a|bbbbbbb a=temporary b=alignment
         u8 mGroupId;
         u32 size;
         CMemBlock* mPrev;
         CMemBlock* mNext;
     };
 
-  protected:
+protected:
     JKRExpHeap(void*, u32, JKRHeap*, bool);
     virtual ~JKRExpHeap();
 
@@ -66,32 +52,33 @@ class JKRExpHeap : public JKRHeap {
     void recycleFreeBlock(CMemBlock*);
     void joinTwoBlocks(CMemBlock*);
 
-  public:
+public:
     s32 getUsedSize(u8) const;
     s32 getTotalUsedSize(void) const;
 
-  public:
-    /* vt[04] */ virtual u32 getHeapType();                                           /* override */
-    /* vt[05] */ virtual bool check();                                                             /* override */
-    /* vt[06] */ virtual void dump_sort();                                                         /* override */
-    /* vt[07] */ virtual bool dump();                                                              /* override */
-    /* vt[08] */ virtual void do_destroy();                                                        /* override */
-    /* vt[09] */ virtual void* do_alloc(u32 size, int alignment);                                  /* override */
-    /* vt[10] */ virtual void do_free(void* ptr);                                                  /* override */
-    /* vt[11] */ virtual void do_freeAll();                                                        /* override */
-    /* vt[12] */ virtual void do_freeTail();                                                       /* override */
-    /* vt[13] */ virtual void do_fillFreeArea();                                                   /* override */
-    /* vt[14] */ virtual s32 do_resize(void* ptr, u32 size);                                       /* override */
-    /* vt[15] */ virtual s32 do_getSize(void* ptr);                                                /* override */
-    /* vt[16] */ virtual s32 do_getFreeSize();                                                     /* override */
-    /* vt[17] */ virtual void* do_getMaxFreeBlock();                                               /* override */
-    /* vt[18] */ virtual s32 do_getTotalFreeSize();                                                /* override */
-    /* vt[19] */ virtual u8 do_changeGroupID(u8 param_1);                                          /* 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&, JKRHeap::TState const&) const; /* override */
+public:
+    /* vt[04] */ virtual u32 getHeapType();                                /* override */
+    /* vt[05] */ virtual bool check();                                     /* override */
+    /* vt[06] */ virtual void dump_sort();                                 /* override */
+    /* vt[07] */ virtual bool dump();                                      /* override */
+    /* vt[08] */ virtual void do_destroy();                                /* override */
+    /* vt[09] */ virtual void* do_alloc(u32 size, int alignment);          /* override */
+    /* vt[10] */ virtual void do_free(void* ptr);                          /* override */
+    /* vt[11] */ virtual void do_freeAll();                                /* override */
+    /* vt[12] */ virtual void do_freeTail();                               /* override */
+    /* vt[13] */ virtual void do_fillFreeArea();                           /* override */
+    /* vt[14] */ virtual s32 do_resize(void* ptr, u32 size);               /* override */
+    /* vt[15] */ virtual s32 do_getSize(void* ptr);                        /* override */
+    /* vt[16] */ virtual s32 do_getFreeSize();                             /* override */
+    /* vt[17] */ virtual void* do_getMaxFreeBlock();                       /* override */
+    /* vt[18] */ virtual s32 do_getTotalFreeSize();                        /* override */
+    /* vt[19] */ virtual u8 do_changeGroupID(u8 param_1);                  /* 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&,
+                                            JKRHeap::TState const&) const; /* override */
 
-  private:
+private:
     u32 field_0x6c;
     u32 field_0x70;
     u32 field_0x74;
@@ -100,7 +87,7 @@ class JKRExpHeap : public JKRHeap {
     CMemBlock* mHeadUsedList;
     CMemBlock* mTailUsedList;
 
-  public:
+public:
     static void createRoot(int, bool);
     static void create(u32, JKRHeap*, bool);
     static void create(void*, u32, JKRHeap*, bool);
diff --git a/include/JSystem/JKernel/JKRFile/JKRFile.h b/include/JSystem/JKernel/JKRFile/JKRFile.h
index 0993e022b2..009741a875 100644
--- a/include/JSystem/JKernel/JKRFile/JKRFile.h
+++ b/include/JSystem/JKernel/JKRFile/JKRFile.h
@@ -1,28 +1,26 @@
 #ifndef __JKRFILE_H__
 #define __JKRFILE_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
+#include "dolphin/types.h"
 
 class JKRFile : public JKRDisposer {
-  public:
+public:
     JKRFile() : mIsAvailable(false) {}
     virtual ~JKRFile() {}
 
     s32 read(void*, long, long);
 
-    bool isAvailable() {
-        return this->mIsAvailable;
-    }
+    bool isAvailable() { return this->mIsAvailable; }
 
-  public:
+public:
     /* vt[03] */ virtual bool open(const char*) = 0;
     /* vt[04] */ virtual void close() = 0;
     /* vt[05] */ virtual s32 readData(void*, long, long) = 0;
     /* vt[06] */ virtual s32 writeData(const void*, long, long) = 0;
     /* vt[07] */ virtual s32 getFileSize() const = 0;
 
-  protected:
+protected:
     bool mIsAvailable;
     u8 field_0x19[3];
 };
diff --git a/include/JSystem/JKernel/JKRFileCache/JKRFileCache.h b/include/JSystem/JKernel/JKRFileCache/JKRFileCache.h
index 67f0b6ca9f..2c8f623be5 100644
--- a/include/JSystem/JKernel/JKRFileCache/JKRFileCache.h
+++ b/include/JSystem/JKernel/JKRFileCache/JKRFileCache.h
@@ -1,17 +1,17 @@
 #ifndef __JKRFILECACHE_H__
 #define __JKRFILECACHE_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRFileLoader/JKRFileLoader.h"
+#include "dolphin/types.h"
 
 class JKRHeap;
 class JKRFileCache : public JKRFileLoader {
-  public:
+public:
     class CCacheBlock {
-      public:
+    public:
         CCacheBlock(u32, u32, void const*);
 
-      private:
+    private:
         JSULink<CCacheBlock> mLink;
         u32 field_0x10;
         u32 mFileId;
@@ -19,7 +19,7 @@ class JKRFileCache : public JKRFileLoader {
         void const* mMemoryPtr;
     };
 
-  protected:
+protected:
     JKRFileCache(char const*, char const*);
     virtual ~JKRFileCache();
 
@@ -29,7 +29,7 @@ class JKRFileCache : public JKRFileLoader {
     void getDvdPathName(char const*) const;
     void convStrLower(char*) const;
 
-  public:
+public:
     /* vt[04] */ virtual void becomeCurrent(char const*);                 /* override */
     /* vt[05] */ virtual void getResource(char const*);                   /* override */
     /* vt[06] */ virtual void getResource(u32, char const*);              /* override */
@@ -46,14 +46,14 @@ class JKRFileCache : public JKRFileLoader {
     /* vt[17] */ virtual void readFsResource(void*, u32, char const*);
     /* vt[18] */ virtual void readNameResource(void*, u32, u32, char const*);
 
-  private:
+private:
     JKRHeap* mParentHeap;
     JSUList<CCacheBlock> mCacheBlockList;
     char* field_0x40;
     char* field_0x4c;
     char* field_0x50;
 
-  public:
+public:
     static void mount(char const*, JKRHeap*, char const*);
 };
 
diff --git a/include/JSystem/JKernel/JKRFileFinder/JKRFileFinder.h b/include/JSystem/JKernel/JKRFileFinder/JKRFileFinder.h
index d76237ecb2..bfa88f0fc9 100644
--- a/include/JSystem/JKernel/JKRFileFinder/JKRFileFinder.h
+++ b/include/JSystem/JKernel/JKRFileFinder/JKRFileFinder.h
@@ -11,18 +11,16 @@ struct JKRFileFinder_UnknownBase {
 };
 
 class JKRFileFinder : JKRFileFinder_UnknownBase {
-  public:
+public:
     JKRFileFinder();
     virtual ~JKRFileFinder();
 
-    bool isAvailable() {
-        return this->mIsAvailable;
-    }
+    bool isAvailable() { return this->mIsAvailable; }
 
-  public:
+public:
     /* vt[3] */ virtual bool findNextFile(void) = 0;
 
-  private:
+private:
     bool mIsAvailable;
     bool field_0x11;
     u8 padding_0x12[2];
@@ -30,14 +28,14 @@ class JKRFileFinder : JKRFileFinder_UnknownBase {
 
 class JKRArchive;
 class JKRArcFinder : public JKRFileFinder {
-  public:
+public:
     JKRArcFinder(JKRArchive*, long, long);
     virtual ~JKRArcFinder();
 
-  public:
+public:
     /* vt[3] */ virtual bool findNextFile(void); /* override */
 
-  private:
+private:
     JKRArchive* mArchive;
     u32 field_0x18;
     u32 field_0x1c;
@@ -45,14 +43,14 @@ class JKRArcFinder : public JKRFileFinder {
 };
 
 class JKRDvdFinder : public JKRFileFinder {
-  public:
+public:
     JKRDvdFinder(char const*);
     virtual ~JKRDvdFinder();
 
-  public:
+public:
     /* vt[3] */ virtual bool findNextFile(void); /* override */
 
-  private:
+private:
     u8 mDvd[12];
     bool mDvdIsOpen;
     u8 padding_0x21[3];
diff --git a/include/JSystem/JKernel/JKRFileLoader/JKRFileLoader.h b/include/JSystem/JKernel/JKRFileLoader/JKRFileLoader.h
index 7ddeba67aa..1d74afc1c5 100644
--- a/include/JSystem/JKernel/JKRFileLoader/JKRFileLoader.h
+++ b/include/JSystem/JKernel/JKRFileLoader/JKRFileLoader.h
@@ -1,37 +1,33 @@
 #ifndef __JKRFILELOADER_H__
 #define __JKRFILELOADER_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
+#include "dolphin/types.h"
 
 class JKRFileLoader : public JKRDisposer {
-  public:
+public:
     JKRFileLoader(void);
     virtual ~JKRFileLoader();
 
-    bool isMounted() {
-        return this->mIsMounted;
-    }
+    bool isMounted() { return this->mIsMounted; }
 
-    u32 getVolumeType() {
-        return this->mVolumeType;
-    }
+    u32 getVolumeType() { return this->mVolumeType; }
 
-  public:
+public:
     /* vt[03] */ virtual void unmount(void);
-    /* vt[04] */ virtual void becomeCurrent(char const*)                 = 0;
-    /* vt[05] */ virtual void getResource(char const*)                   = 0;
-    /* vt[06] */ virtual void getResource(u32, char const*)              = 0;
-    /* vt[07] */ virtual void readResource(void*, u32, char const*)      = 0;
+    /* vt[04] */ virtual void becomeCurrent(char const*) = 0;
+    /* vt[05] */ virtual void getResource(char const*) = 0;
+    /* vt[06] */ virtual void getResource(u32, char const*) = 0;
+    /* vt[07] */ virtual void readResource(void*, u32, char const*) = 0;
     /* vt[08] */ virtual void readResource(void*, u32, u32, char const*) = 0;
-    /* vt[09] */ virtual void removeResourceAll(void)                    = 0;
-    /* vt[10] */ virtual void removeResource(void*)                      = 0;
-    /* vt[11] */ virtual void detachResource(void*)                      = 0;
-    /* vt[12] */ virtual void getResSize(void const*) const              = 0;
-    /* vt[13] */ virtual void countFile(char const*) const               = 0;
-    /* vt[14] */ virtual void getFirstFile(char const*) const            = 0;
+    /* vt[09] */ virtual void removeResourceAll(void) = 0;
+    /* vt[10] */ virtual void removeResource(void*) = 0;
+    /* vt[11] */ virtual void detachResource(void*) = 0;
+    /* vt[12] */ virtual void getResSize(void const*) const = 0;
+    /* vt[13] */ virtual void countFile(char const*) const = 0;
+    /* vt[14] */ virtual void getFirstFile(char const*) const = 0;
 
-  private:
+private:
     JSULink<JKRFileLoader> mFileLoaderLink;
     char* mVolumeName;
     u32 mVolumeType;
@@ -39,7 +35,7 @@ class JKRFileLoader : public JKRDisposer {
     u8 padding_0x31[3];
     int mMountCount;
 
-  public:
+public:
     static void* getGlbResource(char const*);
     static void* getGlbResource(char const*, JKRFileLoader*);
     static bool removeResource(void*, JKRFileLoader*);
diff --git a/include/JSystem/JKernel/JKRHeap/JKRHeap.h b/include/JSystem/JKernel/JKRHeap/JKRHeap.h
index e4f92ff47b..31e5d5a59b 100644
--- a/include/JSystem/JKernel/JKRHeap/JKRHeap.h
+++ b/include/JSystem/JKernel/JKRHeap/JKRHeap.h
@@ -1,16 +1,16 @@
 #ifndef __JKRHEAP_H__
 #define __JKRHEAP_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
+#include "dolphin/types.h"
 #include "global.h"
 
 typedef void (*JKRErrorHandler)(void*, u32, int);
 class JKRHeap : public JKRDisposer {
-  public:
+public:
     class TState {};
 
-  public:
+public:
     JKRHeap(void*, u32, JKRHeap*, bool);
     virtual ~JKRHeap();
 
@@ -43,79 +43,59 @@ class JKRHeap : public JKRDisposer {
 
     /* vt[03] */ virtual void callAllDisposer();
     /* vt[04] */ virtual u32 getHeapType() = 0;
-    /* vt[05] */ virtual bool check()      = 0;
+    /* vt[05] */ virtual bool check() = 0;
     /* vt[06] */ virtual void dump_sort();
-    /* vt[07] */ virtual bool dump()                             = 0;
-    /* vt[08] */ virtual void do_destroy()                       = 0;
+    /* vt[07] */ virtual bool dump() = 0;
+    /* vt[08] */ virtual void do_destroy() = 0;
     /* vt[09] */ virtual void* do_alloc(u32 size, int alignment) = 0;
-    /* vt[10] */ virtual void do_free(void* ptr)                 = 0;
-    /* vt[11] */ virtual void do_freeAll()                       = 0;
-    /* vt[12] */ virtual void do_freeTail()                      = 0;
-    /* vt[13] */ virtual void do_fillFreeArea()                  = 0;
-    /* vt[14] */ virtual s32 do_resize(void* ptr, u32 size)      = 0;
-    /* vt[15] */ virtual s32 do_getSize(void* ptr)               = 0;
-    /* vt[16] */ virtual s32 do_getFreeSize()                    = 0;
-    /* vt[17] */ virtual void* do_getMaxFreeBlock()              = 0;
-    /* vt[18] */ virtual s32 do_getTotalFreeSize()               = 0;
+    /* vt[10] */ virtual void do_free(void* ptr) = 0;
+    /* vt[11] */ virtual void do_freeAll() = 0;
+    /* vt[12] */ virtual void do_freeTail() = 0;
+    /* vt[13] */ virtual void do_fillFreeArea() = 0;
+    /* vt[14] */ virtual s32 do_resize(void* ptr, u32 size) = 0;
+    /* vt[15] */ virtual s32 do_getSize(void* ptr) = 0;
+    /* vt[16] */ virtual s32 do_getFreeSize() = 0;
+    /* vt[17] */ virtual void* do_getMaxFreeBlock() = 0;
+    /* vt[18] */ virtual s32 do_getTotalFreeSize() = 0;
     /* vt[19] */ virtual u8 do_changeGroupID(u8 param_1);
     /* vt[20] */ virtual u8 do_getCurrentGroupId();
     /* vt[21] */ virtual void state_register(JKRHeap::TState*, unsigned long) const;
     /* vt[22] */ virtual bool state_compare(JKRHeap::TState const&, JKRHeap::TState const&) const;
     /* vt[23] */ virtual void state_dump();
 
-    void setDebugFill(bool debugFill) {
-        this->mDebugFill = debugFill;
-    }
+    void setDebugFill(bool debugFill) { this->mDebugFill = debugFill; }
 
-    void* getStartAddr() const {
-        return (void*)mStart;
-    }
+    void* getStartAddr() const { return (void*)mStart; }
 
-    void* getEndAddr() const {
-        return (void*)mEnd;
-    }
+    void* getEndAddr() const { return (void*)mEnd; }
 
-    u32 getSize() const {
-        return mSize;
-    }
+    u32 getSize() const { return mSize; }
 
-    bool getErrorFlag() {
-        return mErrorFlag;
-    }
+    bool getErrorFlag() { return mErrorFlag; }
 
     JKRHeap* getParent() {
         JSUTree<JKRHeap>* parent = this->mChildTree.getParent();
         return parent->getObject();
     }
 
-    JSUTree<JKRHeap>& getHeapTree() {
-        return this->mChildTree;
-    }
+    JSUTree<JKRHeap>& getHeapTree() { return this->mChildTree; }
 
-    void appendDisposer(JKRDisposer* disposer) {
-        mDisposerList.append(&disposer->mLink);
-    }
+    void appendDisposer(JKRDisposer* disposer) { mDisposerList.append(&disposer->mLink); }
 
-    void removeDisposer(JKRDisposer* disposer) {
-        mDisposerList.remove(&disposer->mLink);
-    }
+    void removeDisposer(JKRDisposer* disposer) { mDisposerList.remove(&disposer->mLink); }
 
-    void lock() {
-        OSLockMutex(&this->mMutex);
-    }
+    void lock() { OSLockMutex(&this->mMutex); }
 
-    void unlock() {
-        OSUnlockMutex(&this->mMutex);
-    }
+    void unlock() { OSUnlockMutex(&this->mMutex); }
 
-  protected:
+protected:
     OSMutex mMutex;
     u32 mStart;
     u32 mEnd;
     u32 mSize;
     bool mDebugFill;
     bool mCheckMemoryFilled;
-    u8 mAllocationMode; // EAllocMode?
+    u8 mAllocationMode;  // EAllocMode?
     u8 mGroupId;
     JSUTree<JKRHeap> mChildTree;
     JSUList<JKRDisposer> mDisposerList;
@@ -123,7 +103,7 @@ class JKRHeap : public JKRDisposer {
     bool mInitFlag;
     u8 padding_0x6a[2];
 
-  public:
+public:
     static bool initArena(char**, u32*, int);
     static void* alloc(u32 size, int alignment, JKRHeap* heap);
     static void free(void* ptr, JKRHeap* heap);
@@ -132,43 +112,27 @@ class JKRHeap : public JKRDisposer {
     static JKRHeap* findFromRoot(void* ptr);
 
     static void copyMemory(void* dst, void* src, u32 size);
-    static void fillMemory(void* dst, u32 size, u8 value); // NOTE: never used
+    static void fillMemory(void* dst, u32 size, u8 value);  // NOTE: never used
     static bool checkMemoryFilled(void* src, u32 size, u8 value);
 
     static void JKRDefaultMemoryErrorRoutine(JKRHeap* heap, u32 size, int alignment);
     static JKRErrorHandler setErrorHandler(JKRErrorHandler error_handler);
 
-    static void* getCodeStart(void) {
-        return lbl_80451384;
-    }
+    static void* getCodeStart(void) { return lbl_80451384; }
 
-    static void* getCodeEnd(void) {
-        return lbl_80451388;
-    }
+    static void* getCodeEnd(void) { return lbl_80451388; }
 
-    static void* getUserRamStart(void) {
-        return lbl_8045138C;
-    }
+    static void* getUserRamStart(void) { return lbl_8045138C; }
 
-    static void* getUserRamEnd(void) {
-        return lbl_80451390;
-    }
+    static void* getUserRamEnd(void) { return lbl_80451390; }
 
-    static u32 getMemorySize(void) {
-        return lbl_80451394;
-    }
+    static u32 getMemorySize(void) { return lbl_80451394; }
 
-    static JKRHeap* getRootHeap() {
-        return lbl_80451378;
-    }
+    static JKRHeap* getRootHeap() { return lbl_80451378; }
 
-    static JKRHeap* getSystemHeap() {
-        return lbl_80451370;
-    }
+    static JKRHeap* getSystemHeap() { return lbl_80451370; }
 
-    static JKRHeap* getCurrentHeap() {
-        return lbl_80451374;
-    }
+    static JKRHeap* getCurrentHeap() { return lbl_80451374; }
 };
 
 void* operator new(u32 size);
diff --git a/include/JSystem/JKernel/JKRMemArchive/JKRMemArchive.h b/include/JSystem/JKernel/JKRMemArchive/JKRMemArchive.h
index 335696ef77..2d9f2263af 100644
--- a/include/JSystem/JKernel/JKRMemArchive/JKRMemArchive.h
+++ b/include/JSystem/JKernel/JKRMemArchive/JKRMemArchive.h
@@ -1,15 +1,15 @@
 #ifndef __JKRMEMARCHIVE_H__
 #define __JKRMEMARCHIVE_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRArchive/JKRArchive.h"
+#include "dolphin/types.h"
 
 enum JKRMemBreakFlag {
     _JKRMemBreakFlag_PADDING_32BIT = 0xFFFFFFFF,
 };
 
 class JKRMemArchive : public JKRArchive {
-  public:
+public:
     JKRMemArchive(long, JKRArchive::EMountDirection);
     JKRMemArchive(void*, u32, JKRMemBreakFlag);
     virtual ~JKRMemArchive();
@@ -24,7 +24,7 @@ class JKRMemArchive : public JKRArchive {
     /* vt[16] */ void fetchResource(JKRArchive::SDIFileEntry*, u32*);             /* override */
     /* vt[17] */ void fetchResource(void*, u32, JKRArchive::SDIFileEntry*, u32*); /* override */
 
-  public:
+public:
     static void fetchResource_subroutine(u8*, u32, u8*, u32, int);
 };
 
diff --git a/include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h b/include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h
index 9fc8e4c249..88a46d3e23 100644
--- a/include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h
+++ b/include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h
@@ -1,11 +1,11 @@
 #ifndef __JKRSOLIDHEAP_H__
 #define __JKRSOLIDHEAP_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
+#include "dolphin/types.h"
 
 class JKRSolidHeap : public JKRHeap {
-  protected:
+protected:
     JKRSolidHeap(void*, u32, JKRHeap*, bool);
     virtual ~JKRSolidHeap(void);
 
@@ -13,33 +13,34 @@ class JKRSolidHeap : public JKRHeap {
     void allocFromHead(u32, int);
     void allocFromTail(u32, int);
 
-  public:
-    /* vt[04] */ virtual u32 getHeapType(void);                                                    /* override */
-    /* vt[05] */ virtual bool check(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[21] */ virtual void state_register(JKRHeap::TState*, u32) const;                         /* override */
-    /* vt[22] */ virtual bool state_compare(JKRHeap::TState const&, JKRHeap::TState const&) const; /* override */
+public:
+    /* vt[04] */ virtual u32 getHeapType(void); /* override */
+    /* vt[05] */ virtual bool check(void);      /* override */
 
-  private:
+    /* 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[21] */ virtual void state_register(JKRHeap::TState*, u32) const; /* override */
+    /* vt[22] */ virtual bool state_compare(JKRHeap::TState const&,
+                                            JKRHeap::TState const&) const; /* override */
+
+private:
     u32 mFreeSize;
     void* mSolidStart;
     void* mSolidEnd;
     u32 field_0x78;
 
-  public:
+public:
     static void create(u32, JKRHeap*, bool);
 };
 
diff --git a/include/JSystem/JKernel/JKRThread/JKRThread.h b/include/JSystem/JKernel/JKRThread/JKRThread.h
index d083da9845..1d55d23554 100644
--- a/include/JSystem/JKernel/JKRThread/JKRThread.h
+++ b/include/JSystem/JKernel/JKRThread/JKRThread.h
@@ -1,15 +1,15 @@
 #ifndef __JKRTHREAD_H__
 #define __JKRTHREAD_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
+#include "dolphin/types.h"
 #include "global.h"
 
 class JKRThreadName_;
 class JUTConsole;
 class JKRHeap;
 class JKRThread : JKRDisposer {
-  public:
+public:
     JKRThread(u32 stack_size, int message_count, int param_3);
     JKRThread(JKRHeap* heap, u32 stack_size, int message_count, int param_4);
     JKRThread(OSThread* thread, int message_count);
@@ -20,11 +20,9 @@ class JKRThread : JKRDisposer {
     void setCommon_mesgQueue(JKRHeap* heap, int message_count);
     void setCommon_heapSpecified(JKRHeap* heap, u32 stack_size, int param_3);
 
-    OSThread* getThreadRecord() {
-        return this->mOSThread;
-    }
+    OSThread* getThreadRecord() { return this->mOSThread; }
 
-  private:
+private:
     JSULink<JKRThread> mThreadListLink;
     JKRHeap* mHeap;
     OSThread* mOSThread;
@@ -42,16 +40,14 @@ class JKRThread : JKRDisposer {
     JKRHeap* field_0x74;
     JKRHeap* field_0x78;
 
-  public:
+public:
     static void* start(void* param_1);
     static JKRThread* searchThread(OSThread* thread);
-    static JSUList<JKRThread>* getList() {
-        return &lbl_8043428C;
-    }
+    static JSUList<JKRThread>* getList() { return &lbl_8043428C; }
 };
 
 class JKRThreadSwitch {
-  public:
+public:
     JKRThreadSwitch(JKRHeap*);
     virtual ~JKRThreadSwitch();
 
@@ -62,7 +58,7 @@ class JKRThreadSwitch {
     void draw(JKRThreadName_* param_1, JUTConsole* param_2);
     void draw(JKRThreadName_* param_1);
 
-  public:
+public:
     JKRHeap* heap;
     u8 field_0x8[4];
     u32 field_0xC[2];
diff --git a/include/JSystem/JMessage/control/control.h b/include/JSystem/JMessage/control/control.h
index 9d2ffa86a1..0f4c5c2b07 100644
--- a/include/JSystem/JMessage/control/control.h
+++ b/include/JSystem/JMessage/control/control.h
@@ -3,10 +3,7 @@
 
 #include "dolphin/types.h"
 
-
 // this may actually go somewhere else, but defining it here for now
-class JMSMesgEntry_c {
-
-};
+class JMSMesgEntry_c {};
 
 #endif
\ No newline at end of file
diff --git a/include/JSystem/JSupport/JSUFileInputStream/JSUFileInputStream.h b/include/JSystem/JSupport/JSUFileInputStream/JSUFileInputStream.h
index 5ff4335683..49a48bd796 100644
--- a/include/JSystem/JSupport/JSUFileInputStream/JSUFileInputStream.h
+++ b/include/JSystem/JSupport/JSUFileInputStream/JSUFileInputStream.h
@@ -4,9 +4,8 @@
 #include "dolphin/types.h"
 
 class JSUFileInputStream {
-  public:
+public:
     virtual ~JSUFileInputStream();
-
 };
 
 #endif
diff --git a/include/JSystem/JSupport/JSUList/JSUList.h b/include/JSystem/JSupport/JSUList/JSUList.h
index 9eefc0c6ca..630e5d6f03 100644
--- a/include/JSystem/JSupport/JSUList/JSUList.h
+++ b/include/JSystem/JSupport/JSUList/JSUList.h
@@ -9,27 +9,19 @@
 
 class JSUPtrList;
 class JSUPtrLink {
-  public:
+public:
     JSUPtrLink(void* object);
     ~JSUPtrLink();
 
-    void* getObjectPtr() const {
-        return mObject;
-    }
+    void* getObjectPtr() const { return mObject; }
 
-    JSUPtrList* getList() const {
-        return mList;
-    }
+    JSUPtrList* getList() const { return mList; }
 
-    JSUPtrLink* getNext() const {
-        return mNext;
-    }
+    JSUPtrLink* getNext() const { return mNext; }
 
-    JSUPtrLink* getPrev() const {
-        return mPrev;
-    }
+    JSUPtrLink* getPrev() const { return mPrev; }
 
-  public:
+public:
     void* mObject;
     JSUPtrList* mList;
     JSUPtrLink* mPrev;
@@ -38,21 +30,14 @@ class JSUPtrLink {
 
 template <typename T>
 class JSULink : public JSUPtrLink {
-  public:
-    JSULink(T* object) : JSUPtrLink((void*)object) {
-    }
+public:
+    JSULink(T* object) : JSUPtrLink((void*)object) {}
 
-    T* getObject() const {
-        return (T*)getObjectPtr();
-    }
+    T* getObject() const { return (T*)getObjectPtr(); }
 
-    JSULink<T>* getNext() const {
-        return (JSULink<T>*)this->JSUPtrLink::getNext();
-    }
+    JSULink<T>* getNext() const { return (JSULink<T>*)this->JSUPtrLink::getNext(); }
 
-    JSULink<T>* getPrev() const {
-        return (JSULink<T>*)this->JSUPtrLink::getPrev();
-    }
+    JSULink<T>* getPrev() const { return (JSULink<T>*)this->JSUPtrLink::getPrev(); }
 };
 
 //
@@ -60,10 +45,8 @@ class JSULink : public JSUPtrLink {
 //
 
 class JSUPtrList {
-  public:
-    JSUPtrList() {
-        this->initiate();
-    }
+public:
+    JSUPtrList() { this->initiate(); }
 
     JSUPtrList(bool init);
     ~JSUPtrList();
@@ -76,19 +59,13 @@ class JSUPtrList {
     bool remove(JSUPtrLink* ptr);
     JSUPtrLink* getNthLink(u32 i) const;
 
-    JSUPtrLink* getFirstLink() const {
-        return mHead;
-    }
+    JSUPtrLink* getFirstLink() const { return mHead; }
 
-    JSUPtrLink* getLastLink() const {
-        return mTail;
-    }
+    JSUPtrLink* getLastLink() const { return mTail; }
 
-    u32 getNumLinks() const {
-        return mLength;
-    }
+    u32 getNumLinks() const { return mLength; }
 
-  private:
+private:
     JSUPtrLink* mHead;
     JSUPtrLink* mTail;
     u32 mLength;
@@ -96,84 +73,55 @@ class JSUPtrList {
 
 template <typename T>
 class JSUList : protected JSUPtrList {
-  public:
-    JSUList() : JSUPtrList() {
-    }
+public:
+    JSUList() : JSUPtrList() {}
 
-    JSUList(bool init) : JSUPtrList(init) {
-    }
+    JSUList(bool init) : JSUPtrList(init) {}
 
-    bool append(JSULink<T>* link) {
-        return this->JSUPtrList::append((JSUPtrLink*)link);
-    }
+    bool append(JSULink<T>* link) { return this->JSUPtrList::append((JSUPtrLink*)link); }
 
-    bool prepend(JSULink<T>* link) {
-        return this->JSUPtrList::prepend((JSUPtrLink*)link);
-    }
+    bool prepend(JSULink<T>* link) { return this->JSUPtrList::prepend((JSUPtrLink*)link); }
 
     bool insert(JSULink<T>* before, JSULink<T>* link) {
         return this->JSUPtrList::insert((JSUPtrLink*)before, (JSUPtrLink*)link);
     }
 
-    bool remove(JSULink<T>* link) {
-        return this->JSUPtrList::remove((JSUPtrLink*)link);
-    }
+    bool remove(JSULink<T>* link) { return this->JSUPtrList::remove((JSUPtrLink*)link); }
 
-    JSULink<T>* getFirst() const {
-        return (JSULink<T>*)getFirstLink();
-    }
+    JSULink<T>* getFirst() const { return (JSULink<T>*)getFirstLink(); }
 
-    JSULink<T>* getLast() const {
-        return (JSULink<T>*)getLastLink();
-    }
+    JSULink<T>* getLast() const { return (JSULink<T>*)getLastLink(); }
 
-    JSULink<T>* getEnd() const {
-        return NULL;
-    }
+    JSULink<T>* getEnd() const { return NULL; }
 
-    u32 getNumLinks() const {
-        return this->JSUPtrList::getNumLinks();
-    }
+    u32 getNumLinks() const { return this->JSUPtrList::getNumLinks(); }
 };
 
 template <typename T>
 class JSUListIterator {
-  public:
-    JSUListIterator() : mLink() {
-    }
-    JSUListIterator(JSULink<T>* link) : mLink(link) {
-    }
-    JSUListIterator(JSUList<T>* list) : mLink(list->getFirst()) {
-    }
+public:
+    JSUListIterator() : mLink() {}
+    JSUListIterator(JSULink<T>* link) : mLink(link) {}
+    JSUListIterator(JSUList<T>* list) : mLink(list->getFirst()) {}
 
     JSUListIterator<T>& operator=(JSULink<T>* link) {
         this->mLink = link;
         return *this;
     }
 
-    T* getObject() {
-        return this->mLink->getObject();
-    }
+    T* getObject() { return this->mLink->getObject(); }
 
-    bool operator==(JSULink<T> const* other) const {
-        return this->mLink == other;
-    }
+    bool operator==(JSULink<T> const* other) const { return this->mLink == other; }
 
-    bool operator!=(JSULink<T> const* other) const {
-        return this->mLink != other;
-    }
+    bool operator!=(JSULink<T> const* other) const { return this->mLink != other; }
 
-    bool operator==(JSUListIterator<T> const& other) const {
-        return this->mLink == other.mLink;
-    }
+    bool operator==(JSUListIterator<T> const& other) const { return this->mLink == other.mLink; }
 
-    bool operator!=(JSUListIterator<T> const& other) const {
-        return this->mLink != other.other;
-    }
+    bool operator!=(JSUListIterator<T> const& other) const { return this->mLink != other.other; }
 
     JSUListIterator<T> operator++(int) {
         JSUListIterator<T> prev = *this;
-        this->mLink             = this->mLink->getNext();
+        this->mLink = this->mLink->getNext();
         return prev;
     }
 
@@ -182,15 +130,11 @@ class JSUListIterator {
         return *this;
     }
 
-    T& operator*() {
-        return *this->getObject();
-    }
+    T& operator*() { return *this->getObject(); }
 
-    T* operator->() {
-        return this->getObject();
-    }
+    T* operator->() { return this->getObject(); }
 
-  private:
+private:
     JSULink<T>* mLink;
 };
 
@@ -199,18 +143,17 @@ class JSUListIterator {
 //
 
 #define JSU_TREE_FROM_LINK(T, LINK) (JSUTree<T>*)(((u8*)(LINK)) - 12)
-#define JSU_TREE_LINK_IF_NOT_NULL(TREE)                                                                                \
-    if (TREE) {                                                                                                        \
-        TREE = (JSUTree<T>*)(&(TREE)->mLink);                                                                          \
+#define JSU_TREE_LINK_IF_NOT_NULL(TREE)                                                            \
+    if (TREE) {                                                                                    \
+        TREE = (JSUTree<T>*)(&(TREE)->mLink);                                                      \
     }
 
 #define _JSU_TREE_AS_LINK(TREE) ((JSULink<T>*)(TREE))
 
 template <typename T>
 class JSUTree {
-  public:
-    JSUTree(T* owner) : mList(), mLink(owner) {
-    }
+public:
+    JSUTree(T* owner) : mList(), mLink(owner) {}
 
     bool appendChild(JSUTree<T>* child) {
         JSU_TREE_LINK_IF_NOT_NULL(child);
@@ -228,9 +171,7 @@ class JSUTree {
         return this->mList.insert(_JSU_TREE_AS_LINK(before), _JSU_TREE_AS_LINK(child));
     }
 
-    JSUTree<T>* getEndChild() const {
-        return NULL;
-    }
+    JSUTree<T>* getEndChild() const { return NULL; }
 
     JSUTree<T>* getFirstChild() const {
         JSULink<T>* link = this->mList.getFirst();
@@ -252,51 +193,37 @@ class JSUTree {
         return link ? JSU_TREE_FROM_LINK(T, link) : (JSUTree<T>*)link;
     }
 
-    u32 getNumChildren() const {
-        return this->mList.getNumLinks();
-    }
+    u32 getNumChildren() const { return this->mList.getNumLinks(); }
 
-    T* getObject() const {
-        return this->mLink.getObject();
-    }
+    T* getObject() const { return this->mLink.getObject(); }
 
-    JSUTree<T>* getParent() const {
-        return (JSUTree<T>*)this->mLink.getList();
-    }
+    JSUTree<T>* getParent() const { return (JSUTree<T>*)this->mLink.getList(); }
 
-  private:
+private:
     JSUList<T> mList;
     JSULink<T> mLink;
 };
 
 template <typename T>
 class JSUTreeIterator {
-  public:
-    JSUTreeIterator() : mTree(NULL) {
-    }
-    JSUTreeIterator(JSUTree<T>* tree) : mTree(tree) {
-    }
+public:
+    JSUTreeIterator() : mTree(NULL) {}
+    JSUTreeIterator(JSUTree<T>* tree) : mTree(tree) {}
 
     JSUTreeIterator<T>& operator=(JSUTree<T>* tree) {
         this->mTree = tree;
         return *this;
     }
 
-    T* getObject() {
-        return this->mTree->getObject();
-    }
+    T* getObject() { return this->mTree->getObject(); }
 
-    bool operator==(JSUTree<T>* other) {
-        return this->mTree == other;
-    }
+    bool operator==(JSUTree<T>* other) { return this->mTree == other; }
 
-    bool operator!=(JSUTree<T>* other) {
-        return this->mTree != other;
-    }
+    bool operator!=(JSUTree<T>* other) { return this->mTree != other; }
 
     JSUTreeIterator<T> operator++(int) {
         JSUTreeIterator<T> prev = *this;
-        this->mTree             = this->mTree->getNextChild();
+        this->mTree = this->mTree->getNextChild();
         return prev;
     }
 
@@ -305,15 +232,11 @@ class JSUTreeIterator {
         return *this;
     }
 
-    T& operator*() {
-        return *this->getObject();
-    }
+    T& operator*() { return *this->getObject(); }
 
-    T* operator->() {
-        return this->getObject();
-    }
+    T* operator->() { return this->getObject(); }
 
-  private:
+private:
     JSUTree<T>* mTree;
 };
 
diff --git a/include/JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h b/include/JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h
index 25aea926fc..0caddd1743 100644
--- a/include/JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h
+++ b/include/JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h
@@ -4,9 +4,8 @@
 #include "dolphin/types.h"
 
 class JSURandomInputStream {
-  public:
+public:
     void getAvailable(void) const;
 };
 
-
 #endif
diff --git a/include/JSystem/JUtility/JUTFont/JUTFont.h b/include/JSystem/JUtility/JUTFont/JUTFont.h
index 0c51043c7f..82c7489aed 100644
--- a/include/JSystem/JUtility/JUTFont/JUTFont.h
+++ b/include/JSystem/JUtility/JUTFont/JUTFont.h
@@ -9,13 +9,9 @@ static const unsigned int CLR_BLACK = 0;
 typedef const char* ResFONT;
 
 struct TColor {
-    TColor() {
-        *(u32*)&r = 0xFFFFFFFF;
-    }
+    TColor() { *(u32*)&r = 0xFFFFFFFF; }
 
-    TColor(u32 raw) { 
-        *(u32*)&r = raw;
-    }
+    TColor(u32 raw) { *(u32*)&r = raw; }
 
     u32 Raw() { return *(u32*)&r; }
 
@@ -29,7 +25,7 @@ class JUTFont {
 public:
     JUTFont();
     virtual ~JUTFont();
-    
+
     struct TWidth {};
 
     virtual void setGX() = 0;
@@ -51,7 +47,8 @@ public:
     void initialize_state();
     void setCharColor(TColor col1);
     void setGradColor(TColor col1, TColor col2);
-    float drawString_size_scale(float a1, float a2, float a3, float a4, char* a5, unsigned long usz, bool a7);
+    float drawString_size_scale(float a1, float a2, float a3, float a4, char* a5, unsigned long usz,
+                                bool a7);
 
     bool unk4;
     bool unk5;
diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h
index 6721221db8..ab27062c7c 100644
--- a/include/JSystem/JUtility/JUTResFont.h
+++ b/include/JSystem/JUtility/JUTResFont.h
@@ -1,15 +1,15 @@
 #ifndef JSYSTEM_JUTILITY_JUT_RES_FONT
-#define JSYSTEM_JUTILITY_JUT_RES_FONT 
+#define JSYSTEM_JUTILITY_JUT_RES_FONT
 
-#include "JSystem/JUtility/JUTFont/JUTFont.h"
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
+#include "JSystem/JUtility/JUTFont/JUTFont.h"
 
 class JUTResFont : JUTFont {
 public:
     JUTResFont();
     JUTResFont(ResFONT font, JKRHeap* heap);
     ~JUTResFont();
-    
+
     struct Unknown {
         struct Unknown2 {
             u32 filler0;
@@ -54,5 +54,4 @@ public:
     bool (**unk6C)(s32 a1);
 };
 
-
 #endif  // JSYSTEM_JUTILITY_JUT_RES_FONT
diff --git a/include/JSystem/JUtility/JUTXfb/JUTXfb.h b/include/JSystem/JUtility/JUTXfb/JUTXfb.h
index 3cf89bc431..0eaa499a78 100644
--- a/include/JSystem/JUtility/JUTXfb/JUTXfb.h
+++ b/include/JSystem/JUtility/JUTXfb/JUTXfb.h
@@ -6,8 +6,9 @@
 class JUTXfb {
 public:
     void clearIndex();
+
 private:
-    void * xfb_buffer[3];
+    void* xfb_buffer[3];
     bool is_xfb_allocated[3];
     u8 padding_1;
     s32 num_xfbs;
diff --git a/include/SComponent/c_bg_s_poly_info.h b/include/SComponent/c_bg_s_poly_info.h
index e484af1a93..e82aaade48 100644
--- a/include/SComponent/c_bg_s_poly_info.h
+++ b/include/SComponent/c_bg_s_poly_info.h
@@ -1,8 +1,6 @@
 #ifndef C_BG_S_POLY_INFO_H_
 #define C_BG_S_POLY_INFO_H_
 
-struct cBgS_PolyInfo{
-
-};
+struct cBgS_PolyInfo {};
 
 #endif
\ No newline at end of file
diff --git a/include/SComponent/c_list.h b/include/SComponent/c_list.h
index 7a7e6066c0..65cc47f1a0 100644
--- a/include/SComponent/c_list.h
+++ b/include/SComponent/c_list.h
@@ -5,20 +5,19 @@
 #include "SComponent/c_node.h"
 
 struct node_list_class {
-    node_class *mpHead;
-    node_class *mpTail;
+    node_class* mpHead;
+    node_class* mpTail;
     int mSize;
 };
 
 extern "C" {
 
-void cLs_Init(node_list_class *pList);
-int cLs_SingleCut(node_class *pNode);
-int cLs_Addition(node_list_class *pList, node_class *pNode);
-int cLs_Insert(node_list_class *pList, int idx, node_class *pNode);
-node_class * cLs_GetFirst(node_list_class *pList);
-void cLs_Create(node_list_class *pList);
-
+void cLs_Init(node_list_class* pList);
+int cLs_SingleCut(node_class* pNode);
+int cLs_Addition(node_list_class* pList, node_class* pNode);
+int cLs_Insert(node_list_class* pList, int idx, node_class* pNode);
+node_class* cLs_GetFirst(node_list_class* pList);
+void cLs_Create(node_list_class* pList);
 };
 
 #endif
diff --git a/include/SComponent/c_list_iter.h b/include/SComponent/c_list_iter.h
index 06c06590a9..3898341e79 100644
--- a/include/SComponent/c_list_iter.h
+++ b/include/SComponent/c_list_iter.h
@@ -7,9 +7,8 @@
 
 extern "C" {
 
-int cLsIt_Method(node_list_class *pList, cNdIt_MethodFunc pMethod, void *pUserData);
-void * cLsIt_Judge(node_list_class *pList, cNdIt_JudgeFunc pJudge, void *pUserData);
-
+int cLsIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod, void* pUserData);
+void* cLsIt_Judge(node_list_class* pList, cNdIt_JudgeFunc pJudge, void* pUserData);
 };
 
 #endif
diff --git a/include/SComponent/c_node.h b/include/SComponent/c_node.h
index 73573c0bae..dc3402dbfe 100644
--- a/include/SComponent/c_node.h
+++ b/include/SComponent/c_node.h
@@ -3,27 +3,26 @@
 #define SCOMPONENT_C_NODE_H
 
 struct node_class {
-    node_class *mpPrevNode;
-    void *mpData;
-    node_class *mpNextNode;
+    node_class* mpPrevNode;
+    void* mpData;
+    node_class* mpNextNode;
 };
 
 extern "C" {
 
-void cNd_Join(node_class *pA, node_class *pB);
-int cNd_LengthOf(node_class *pNode);
-node_class * cNd_First(node_class *pNode);
-node_class * cNd_Last(node_class *pNode);
-node_class * cNd_Order(node_class *pNode, int idx);
-void cNd_SingleCut(node_class *pNode);
-void cNd_Cut(node_class *pNode);
-void cNd_Addition(node_class *pA, node_class *pB);
-void cNd_Insert(node_class *pA, node_class *pB);
-void cNd_SetObject(node_class *pNode, void *pData);
-void cNd_ClearObject(node_class *pNode);
-void cNd_ForcedClear(node_class *pNode);
-void cNd_Create(node_class *pNode, void *pData);
-
+void cNd_Join(node_class* pA, node_class* pB);
+int cNd_LengthOf(node_class* pNode);
+node_class* cNd_First(node_class* pNode);
+node_class* cNd_Last(node_class* pNode);
+node_class* cNd_Order(node_class* pNode, int idx);
+void cNd_SingleCut(node_class* pNode);
+void cNd_Cut(node_class* pNode);
+void cNd_Addition(node_class* pA, node_class* pB);
+void cNd_Insert(node_class* pA, node_class* pB);
+void cNd_SetObject(node_class* pNode, void* pData);
+void cNd_ClearObject(node_class* pNode);
+void cNd_ForcedClear(node_class* pNode);
+void cNd_Create(node_class* pNode, void* pData);
 };
 
 #endif
diff --git a/include/SComponent/c_node_iter.h b/include/SComponent/c_node_iter.h
index 8d76321c05..2a58390380 100644
--- a/include/SComponent/c_node_iter.h
+++ b/include/SComponent/c_node_iter.h
@@ -6,12 +6,11 @@
 
 extern "C" {
 
-typedef int (*cNdIt_MethodFunc)(node_class *pNode, void *pUserData);
-int cNdIt_Method(node_class *pNode, cNdIt_MethodFunc pMethod, void *pUserData);
-
-typedef void * (*cNdIt_JudgeFunc)(node_class *pNode, void *pUserData);
-void * cNdIt_Judge(node_class *pNode, cNdIt_JudgeFunc pJudge, void *pUserData);
+typedef int (*cNdIt_MethodFunc)(node_class* pNode, void* pUserData);
+int cNdIt_Method(node_class* pNode, cNdIt_MethodFunc pMethod, void* pUserData);
 
+typedef void* (*cNdIt_JudgeFunc)(node_class* pNode, void* pUserData);
+void* cNdIt_Judge(node_class* pNode, cNdIt_JudgeFunc pJudge, void* pUserData);
 };
 
 #endif
diff --git a/include/SComponent/c_phase.h b/include/SComponent/c_phase.h
index c923711dd4..2c9e399071 100644
--- a/include/SComponent/c_phase.h
+++ b/include/SComponent/c_phase.h
@@ -2,31 +2,31 @@
 #ifndef SCOMPONENT_C_PHASE_H
 #define SCOMPONENT_C_PHASE_H
 
-typedef int (*cPhs__Handler)(void *);
+typedef int (*cPhs__Handler)(void*);
 
 enum cPhs__Step {
-    cPhs_ZERO_e      = 0x00,
+    cPhs_ZERO_e = 0x00,
     // names from Wind Waker debug strings
     cPhs_COMPLEATE_e = 0x04,
-    cPhs_ERROR_e     = 0x05,
-    cPhs_NEXT_e      = 0x06,
+    cPhs_ERROR_e = 0x05,
+    cPhs_NEXT_e = 0x06,
 };
 
 struct request_of_phase_process_class {
-    cPhs__Handler *mpHandlerTable;
+    cPhs__Handler* mpHandlerTable;
     int mPhaseStep;
 };
 
 extern "C" {
 
-void cPhs_Reset(request_of_phase_process_class *pPhase);
-void cPhs_Set(request_of_phase_process_class *pPhase, cPhs__Handler *pHandlerTable);
-void cPhs_UnCompleate(request_of_phase_process_class *pPhase);
-int cPhs_Compleate(request_of_phase_process_class *pPhase);
-int cPhs_Next(request_of_phase_process_class *pPhase);
-int cPhs_Do(request_of_phase_process_class *pPhase, void *pUserData);
-int cPhs_Handler(request_of_phase_process_class *pPhase, cPhs__Handler *pHandlerTable, void *pUserData);
-
+void cPhs_Reset(request_of_phase_process_class* pPhase);
+void cPhs_Set(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable);
+void cPhs_UnCompleate(request_of_phase_process_class* pPhase);
+int cPhs_Compleate(request_of_phase_process_class* pPhase);
+int cPhs_Next(request_of_phase_process_class* pPhase);
+int cPhs_Do(request_of_phase_process_class* pPhase, void* pUserData);
+int cPhs_Handler(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable,
+                 void* pUserData);
 };
 
 #endif
diff --git a/include/SComponent/c_tag.h b/include/SComponent/c_tag.h
index 316a5ee4b2..22c26c25c9 100644
--- a/include/SComponent/c_tag.h
+++ b/include/SComponent/c_tag.h
@@ -2,28 +2,27 @@
 #ifndef SCOMPONENT_C_TAG_H
 #define SCOMPONENT_C_TAG_H
 
-#include "global.h"
-#include "SComponent/c_node.h"
 #include "SComponent/c_list.h"
+#include "SComponent/c_node.h"
 #include "SComponent/c_tree.h"
+#include "global.h"
 
 struct create_tag_class {
     node_class mpNode;
-    void *mpTagData;
+    void* mpTagData;
     s8 mbIsUse;
 };
 
 extern "C" {
 
-int cTg_IsUse(create_tag_class *pTag);
-int cTg_SingleCutFromTree(create_tag_class *pTag);
-int cTg_AdditionToTree(node_lists_tree_class *pTree, int listIdx, create_tag_class *pTag);
-int cTg_InsertToTree(node_lists_tree_class *pTree, int listIdx, create_tag_class *pTag, int idx);
-node_class * cTg_GetFirst(node_list_class *pTag);
-int cTg_SingleCut(create_tag_class *pTag);
-int cTg_Addition(node_list_class *pList, create_tag_class *pTag);
-void cTg_Create(create_tag_class *pTag, void *pData);
-
+int cTg_IsUse(create_tag_class* pTag);
+int cTg_SingleCutFromTree(create_tag_class* pTag);
+int cTg_AdditionToTree(node_lists_tree_class* pTree, int listIdx, create_tag_class* pTag);
+int cTg_InsertToTree(node_lists_tree_class* pTree, int listIdx, create_tag_class* pTag, int idx);
+node_class* cTg_GetFirst(node_list_class* pTag);
+int cTg_SingleCut(create_tag_class* pTag);
+int cTg_Addition(node_list_class* pList, create_tag_class* pTag);
+void cTg_Create(create_tag_class* pTag, void* pData);
 };
 
 #endif
diff --git a/include/SComponent/c_tag_iter.h b/include/SComponent/c_tag_iter.h
index b750ac9c76..022752458f 100644
--- a/include/SComponent/c_tag_iter.h
+++ b/include/SComponent/c_tag_iter.h
@@ -2,24 +2,23 @@
 #ifndef SCOMPONENT_C_TAG_ITER_H
 #define SCOMPONENT_C_TAG_ITER_H
 
-#include "SComponent/c_tag.h"
 #include "SComponent/c_node_iter.h"
+#include "SComponent/c_tag.h"
 
 struct method_filter {
     cNdIt_MethodFunc mpMethodFunc;
-    void *mpUserData;
+    void* mpUserData;
 };
 
 struct judge_filter {
     cNdIt_JudgeFunc mpJudgeFunc;
-    void *mpUserData;
+    void* mpUserData;
 };
 
 extern "C" {
 
-int cTgIt_MethodCall(create_tag_class *pTag, method_filter *pMethodFilter);
-void * cTgIt_JudgeFilter(create_tag_class *pTag, judge_filter *pJudgeFilter);
-
+int cTgIt_MethodCall(create_tag_class* pTag, method_filter* pMethodFilter);
+void* cTgIt_JudgeFilter(create_tag_class* pTag, judge_filter* pJudgeFilter);
 };
 
 #endif
diff --git a/include/SComponent/c_tree.h b/include/SComponent/c_tree.h
index 215b5a58e4..8fb3ed7e49 100644
--- a/include/SComponent/c_tree.h
+++ b/include/SComponent/c_tree.h
@@ -2,22 +2,21 @@
 #ifndef SCOMPONENT_C_TREE_H
 #define SCOMPONENT_C_TREE_H
 
-#include "global.h"
 #include "SComponent/c_list.h"
 #include "SComponent/c_node.h"
+#include "global.h"
 
 struct node_lists_tree_class {
-    node_list_class *mpLists;
+    node_list_class* mpLists;
     int mNumLists;
 };
 
 extern "C" {
 
-int cTr_SingleCut(node_class *pNode);
-int cTr_Addition(node_lists_tree_class *pTree, int listIdx, node_class *pNode);
-int cTr_Insert(node_lists_tree_class *pTree, int listIdx, node_class *pNode, int idx);
-void cTr_Create(node_lists_tree_class *pTree, node_list_class *pLists, int numLists);
-
+int cTr_SingleCut(node_class* pNode);
+int cTr_Addition(node_lists_tree_class* pTree, int listIdx, node_class* pNode);
+int cTr_Insert(node_lists_tree_class* pTree, int listIdx, node_class* pNode, int idx);
+void cTr_Create(node_lists_tree_class* pTree, node_list_class* pLists, int numLists);
 };
 
 #endif
diff --git a/include/SComponent/c_tree_iter.h b/include/SComponent/c_tree_iter.h
index 0334500efe..438a142474 100644
--- a/include/SComponent/c_tree_iter.h
+++ b/include/SComponent/c_tree_iter.h
@@ -2,14 +2,13 @@
 #ifndef SCOMPONENT_C_TREE_ITER_H
 #define SCOMPONENT_C_TREE_ITER_H
 
-#include "SComponent/c_tree.h"
 #include "SComponent/c_node_iter.h"
+#include "SComponent/c_tree.h"
 
 extern "C" {
 
-int cTrIt_Method(node_lists_tree_class *pTree, cNdIt_MethodFunc pJudgeFunc, void *pUserData);
-void * cTrIt_Judge(node_lists_tree_class *pTree, cNdIt_JudgeFunc pJudgeFunc, void *pUserData);
-
+int cTrIt_Method(node_lists_tree_class* pTree, cNdIt_MethodFunc pJudgeFunc, void* pUserData);
+void* cTrIt_Judge(node_lists_tree_class* pTree, cNdIt_JudgeFunc pJudgeFunc, void* pUserData);
 };
 
 #endif
diff --git a/include/Z2AudioLib/Z2Calc/Z2Calc.h b/include/Z2AudioLib/Z2Calc/Z2Calc.h
index b26793f521..f9b5cb63da 100644
--- a/include/Z2AudioLib/Z2Calc/Z2Calc.h
+++ b/include/Z2AudioLib/Z2Calc/Z2Calc.h
@@ -1,11 +1,11 @@
 #include "global.h"
 
-namespace Z2Calc{
-struct CurveSign{
-// temp
+namespace Z2Calc {
+struct CurveSign {
+    // temp
 };
 
-struct FNoise1f{
+struct FNoise1f {
     void setParam(float, float, float);
     float tau(float);
     float calcNoise1f();
@@ -20,4 +20,4 @@ float linearTransform(float, float, float, float, float, bool);
 float getParamByExp(float, float, float, float, float, float, Z2Calc::CurveSign);
 float getRandom(float, float, float);
 float getRandom_0_1(void);
-}
\ No newline at end of file
+}  // namespace Z2Calc
\ No newline at end of file
diff --git a/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h b/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h
index 6f981b6885..bb5d940e43 100644
--- a/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h
+++ b/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h
@@ -1,61 +1,60 @@
-#include "global.h"
 #include "JSystem/JAudio2/JAISe/JAISe.h"
 #include "JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h"
+#include "global.h"
 
-struct Z2SoundObjBase{
-
-};
+struct Z2SoundObjBase {};
 
 struct Z2CreatureLink {
-     void setLinkState(u8);
-     void setLinkGroupInfo(u8);
-     void setLinkHp(s32, s32);
-     void setLinkSwordType(s32, s32);
-     void setLinkShieldType(s32, s32);
-     void setLinkBootsType(s32);
-     Z2CreatureLink(void);
-     ~Z2CreatureLink();
-     void deleteObject();
-     void init(Vec*, Vec*, Vec*);
-     void initKantera(Vec*);
-     void deleteKantera(void);
-     void setKanteraState(u8);
-     void framework(u32, s8);
-     void setSinkDepth(s8);
-     void setRiding(bool);
-     void setMagnetized(bool);
-     void setWolfEyeOpen(bool);
-     void startLinkSound(JAISoundID, u32, s8);
-     void startLinkSoundLevel(JAISoundID, u32, s8);
-     void startLinkVoice(JAISoundID, s8);
-     void startLinkVoiceLevel(JAISoundID, s8);
-     void startLinkSwordSound(JAISoundID, u32, s8);
-     void startCollisionSE(u32, u32);
-     int startHitItemSE(u32, u32, Z2SoundObjBase*, float);
-     void setResumeAttack(bool);
+    void setLinkState(u8);
+    void setLinkGroupInfo(u8);
+    void setLinkHp(s32, s32);
+    void setLinkSwordType(s32, s32);
+    void setLinkShieldType(s32, s32);
+    void setLinkBootsType(s32);
+    Z2CreatureLink(void);
+    ~Z2CreatureLink();
+    void deleteObject();
+    void init(Vec*, Vec*, Vec*);
+    void initKantera(Vec*);
+    void deleteKantera(void);
+    void setKanteraState(u8);
+    void framework(u32, s8);
+    void setSinkDepth(s8);
+    void setRiding(bool);
+    void setMagnetized(bool);
+    void setWolfEyeOpen(bool);
+    void startLinkSound(JAISoundID, u32, s8);
+    void startLinkSoundLevel(JAISoundID, u32, s8);
+    void startLinkVoice(JAISoundID, s8);
+    void startLinkVoiceLevel(JAISoundID, s8);
+    void startLinkSwordSound(JAISoundID, u32, s8);
+    void startCollisionSE(u32, u32);
+    int startHitItemSE(u32, u32, Z2SoundObjBase*, float);
+    void setResumeAttack(bool);
 
-     u8 unk0[179];
-     u8 unk179;
-     float unk180;
-     float unk184;
-     float unk188;
-     u8 link_state;
-     u8 unk193;
-     u8 unk194;
-     u8 link_hp;
-     u8 unk196;
-     u8 lantern_state;
-     u8 unk198;
-     u8 unk199;
-     u8 unk200;
-     u8 unk201;
-     u8 sink_depth;
-     u8 unk203;
-     u8 unk204;
+    u8 unk0[179];
+    u8 unk179;
+    float unk180;
+    float unk184;
+    float unk188;
+    u8 link_state;
+    u8 unk193;
+    u8 unk194;
+    u8 link_hp;
+    u8 unk196;
+    u8 lantern_state;
+    u8 unk198;
+    u8 unk199;
+    u8 unk200;
+    u8 unk201;
+    u8 sink_depth;
+    u8 unk203;
+    u8 unk204;
 };
 
-struct Z2LinkSoundStarter{
+struct Z2LinkSoundStarter {
     Z2LinkSoundStarter(void);
     ~Z2LinkSoundStarter();
-    //u32 startSound(JAISoundID, JAISoundHandle, TVec3<float>*, u32, float, float, float, float, float, u32);
+    // u32 startSound(JAISoundID, JAISoundHandle, TVec3<float>*, u32, float, float, float, float,
+    // float, u32);
 };
\ No newline at end of file
diff --git a/include/Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h b/include/Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h
index a25aff3424..f55dc7067b 100644
--- a/include/Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h
+++ b/include/Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h
@@ -1,20 +1,20 @@
-#include "global.h"
 #include "JSystem/JAudio2/JAISe/JAISe.h"
 #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
+#include "global.h"
 
-struct JAISoundParamsMove{
+struct JAISoundParamsMove {
     void moveVolume(float param_1, u32 param_2);
 
     float unk_1;
 };
 
-struct Z2SoundMgr{
+struct Z2SoundMgr {
     void resetFilterAll();
     u8 p1[0x3ec];
     JAISoundParamsMove* JAISoundParamsMove;
 };
 
-struct Z2SceneMgr{
+struct Z2SceneMgr {
     long BGM_ID;
     int sceneNum;
     int timer;
diff --git a/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h b/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h
index 51b468e90c..1744b17b77 100644
--- a/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h
+++ b/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h
@@ -1,15 +1,15 @@
 #ifndef Z2SEMGR_H_
 #define Z2SEMGR_H_
 
-#include "global.h"
 #include "JSystem/JAudio2/JAISe/JAISe.h"
 #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
+#include "global.h"
 
-struct Z2MultiSeObj{
+struct Z2MultiSeObj {
     Z2MultiSeObj();
 };
 
-struct Z2SeMgr{
+struct Z2SeMgr {
     Z2SeMgr(void);
     void initSe(void);
     void resetModY(void);
@@ -32,7 +32,7 @@ struct Z2SeMgr{
     bool isSoundCulling(JAISoundID);
 };
 
-struct Z2MultiSeMgr{
+struct Z2MultiSeMgr {
     Z2MultiSeMgr();
     ~Z2MultiSeMgr();
     u32 registMultiSePos(Vec*);
@@ -41,42 +41,44 @@ struct Z2MultiSeMgr{
     float getDolbyPower(void);
 };
 
-extern "C"{
-    void Z2MultiSeObj(void);
-    void __ct__12Z2MultiSeObjFv(void);
-    void resetModY__7Z2SeMgrFv(void);
-    void JAISoundHandles_NS_getFreeHandle(void);
-    void JAISoundHandles_NS_getHandleSoundID(void);
-    void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8);
-    void JAISoundParamsMove_NS_moveDolby(void);
-    void JAISoundParamsMove_NS_movePan(void);
-    void JAISoundParamsMove_NS_moveFxMix(void);
-    void Z2Audience_NS_calcOffMicSound(void);
-    void modHeightAtCamera__7Z2SeMgrFPPC3Vec(Vec const** );
-    void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8);
-    void JAISoundHandle_NS_releaseSound(void);
-    void seStop__7Z2SeMgrF10JAISoundIDUl(JAISoundID, u32);
-    void JAISeCategoryMgr_NS_stop(void);
-    void seMoveVolumeAll__7Z2SeMgrFfUl(float, u32);
-    void Z2SpeechMgr2_NS_playOneShotVoice(void);
-    void setLevObjSE__7Z2SeMgrFUlP3VecSc(u32, Vec*, s8);
-    void setMultiTriggerSE__7Z2SeMgrFUlP3VecSc(u32, Vec*, s8);
-    void isLevelSe__7Z2SeMgrF10JAISoundID(JAISoundID);
-    void Z2SoundMgr_NS_stopSoundID(void);
-    void Z2SoundMgr_NS_multiVolumeSoundID(void);
-    void isSoundCulling__7Z2SeMgrF10JAISoundID(JAISoundID);
-    void __ct__12Z2MultiSeMgrFv(void);
-    void Z2Audience_NS_calcRelPosDolby(void);
-    void Z2Audience_NS_calcRelPosPan(void);
-    void Z2Audience_NS_calcRelPosVolume(void);
-    void Z2Audience_NS_convertAbsToRel(void);
-    void registMultiSePos__12Z2MultiSeMgrFP3Vec(Vec*);
-    void resetMultiSePos__12Z2MultiSeMgrFv(void);
-    float getPanPower__12Z2MultiSeMgrFv(void);
-    float getDolbyPower__12Z2MultiSeMgrFv(void);
+extern "C" {
+void Z2MultiSeObj(void);
+void __ct__12Z2MultiSeObjFv(void);
+void resetModY__7Z2SeMgrFv(void);
+void JAISoundHandles_NS_getFreeHandle(void);
+void JAISoundHandles_NS_getHandleSoundID(void);
+void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(JAISoundID, Vec const*, u32, s8, float, float,
+                                                    float, float, u8);
+void JAISoundParamsMove_NS_moveDolby(void);
+void JAISoundParamsMove_NS_movePan(void);
+void JAISoundParamsMove_NS_moveFxMix(void);
+void Z2Audience_NS_calcOffMicSound(void);
+void modHeightAtCamera__7Z2SeMgrFPPC3Vec(Vec const**);
+void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(JAISoundID, Vec const*, u32, s8, float,
+                                                         float, float, float, u8);
+void JAISoundHandle_NS_releaseSound(void);
+void seStop__7Z2SeMgrF10JAISoundIDUl(JAISoundID, u32);
+void JAISeCategoryMgr_NS_stop(void);
+void seMoveVolumeAll__7Z2SeMgrFfUl(float, u32);
+void Z2SpeechMgr2_NS_playOneShotVoice(void);
+void setLevObjSE__7Z2SeMgrFUlP3VecSc(u32, Vec*, s8);
+void setMultiTriggerSE__7Z2SeMgrFUlP3VecSc(u32, Vec*, s8);
+void isLevelSe__7Z2SeMgrF10JAISoundID(JAISoundID);
+void Z2SoundMgr_NS_stopSoundID(void);
+void Z2SoundMgr_NS_multiVolumeSoundID(void);
+void isSoundCulling__7Z2SeMgrF10JAISoundID(JAISoundID);
+void __ct__12Z2MultiSeMgrFv(void);
+void Z2Audience_NS_calcRelPosDolby(void);
+void Z2Audience_NS_calcRelPosPan(void);
+void Z2Audience_NS_calcRelPosVolume(void);
+void Z2Audience_NS_convertAbsToRel(void);
+void registMultiSePos__12Z2MultiSeMgrFP3Vec(Vec*);
+void resetMultiSePos__12Z2MultiSeMgrFv(void);
+float getPanPower__12Z2MultiSeMgrFv(void);
+float getDolbyPower__12Z2MultiSeMgrFv(void);
 }
 
-extern Z2SeMgr* lbl_80450B88; // Z2SeMgr sInstance
+extern Z2SeMgr* lbl_80450B88;  // Z2SeMgr sInstance
 extern double lbl_804558D8;
 extern float lbl_804558D0;
 extern float lbl_804558D4;
@@ -141,29 +143,29 @@ extern float lbl_80455994;
 extern u32 lbl_8039B9F0;
 extern u32 lbl_8039B9FC;
 extern u8 lbl_803C9D98[0x60];
-extern u32 lbl_804507F8; //VOL_SE_SYSTEM_DEFAULT
-extern u32 lbl_804507FC; //VOL_SE_LINK_VOICE_DEFAULT
-extern u32 lbl_80450800; //VOL_SE_LINK_MOTION_DEFAULT
-extern u32 lbl_80450804; //VOL_SE_LINK_FOOTNOTE_DEFAULT
-extern u32 lbl_80450808; //VOL_SE_CHAR_VOICE_DEFAULT
-extern u32 lbl_8045080C; //VOL_SE_CHAR_MOVE_DEFAULT
-extern u32 lbl_80450810; //VOL_SE_OBJECT_DEFAULT
-extern u32 lbl_80450814; //VOL_SE_ATMOSPHERE_DEFAULT
-extern u32 lbl_8045081C; //VOL_SE_SYSTEM_TALKING
-extern u32 lbl_80450820; //VOL_SE_LINK_VOICE_TALKING
-extern u32 lbl_80450824; //VOL_SE_LINK_MOTION_TALKING
-extern u32 lbl_80450828; //VOL_SE_LINK_FOOTNOTE_TALKING
-extern u32 lbl_8045082C; //VOL_SE_CHAR_VOICE_TALKING
-extern u32 lbl_80450830; //VOL_SE_CHAR_MOVE_TALKING
-extern u32 lbl_80450834; //VOL_SE_OBJECT_TALKING
-extern u32 lbl_80450838; //VOL_SE_ATMOSPHERE_TALKING
-extern u32 lbl_80450840; //VOL_SE_SYSTEM_PAUSING
-extern u32 lbl_80450844; //VOL_SE_LINK_VOICE_PAUSING
-extern u32 lbl_80450848; //VOL_SE_LINK_MOTION_PAUSING
-extern u32 lbl_8045084C; //VOL_VOL_SE_LINK_FOOTNOTE_PAUSING
-extern u32 lbl_80450850; //VOL_SE_CHAR_VOICE_PAUSING
-extern u32 lbl_80450854; //VOL_SE_CHAR_MOVE_PAUSING
-extern u32 lbl_80450858; //VOL_SE_OBJECT_PAUSING
-extern u32 lbl_8045085C; //VOL_SE_ATMOSPHERE_PAUSING
+extern u32 lbl_804507F8;  // VOL_SE_SYSTEM_DEFAULT
+extern u32 lbl_804507FC;  // VOL_SE_LINK_VOICE_DEFAULT
+extern u32 lbl_80450800;  // VOL_SE_LINK_MOTION_DEFAULT
+extern u32 lbl_80450804;  // VOL_SE_LINK_FOOTNOTE_DEFAULT
+extern u32 lbl_80450808;  // VOL_SE_CHAR_VOICE_DEFAULT
+extern u32 lbl_8045080C;  // VOL_SE_CHAR_MOVE_DEFAULT
+extern u32 lbl_80450810;  // VOL_SE_OBJECT_DEFAULT
+extern u32 lbl_80450814;  // VOL_SE_ATMOSPHERE_DEFAULT
+extern u32 lbl_8045081C;  // VOL_SE_SYSTEM_TALKING
+extern u32 lbl_80450820;  // VOL_SE_LINK_VOICE_TALKING
+extern u32 lbl_80450824;  // VOL_SE_LINK_MOTION_TALKING
+extern u32 lbl_80450828;  // VOL_SE_LINK_FOOTNOTE_TALKING
+extern u32 lbl_8045082C;  // VOL_SE_CHAR_VOICE_TALKING
+extern u32 lbl_80450830;  // VOL_SE_CHAR_MOVE_TALKING
+extern u32 lbl_80450834;  // VOL_SE_OBJECT_TALKING
+extern u32 lbl_80450838;  // VOL_SE_ATMOSPHERE_TALKING
+extern u32 lbl_80450840;  // VOL_SE_SYSTEM_PAUSING
+extern u32 lbl_80450844;  // VOL_SE_LINK_VOICE_PAUSING
+extern u32 lbl_80450848;  // VOL_SE_LINK_MOTION_PAUSING
+extern u32 lbl_8045084C;  // VOL_VOL_SE_LINK_FOOTNOTE_PAUSING
+extern u32 lbl_80450850;  // VOL_SE_CHAR_VOICE_PAUSING
+extern u32 lbl_80450854;  // VOL_SE_CHAR_MOVE_PAUSING
+extern u32 lbl_80450858;  // VOL_SE_OBJECT_PAUSING
+extern u32 lbl_8045085C;  // VOL_SE_ATMOSPHERE_PAUSING
 
 #endif
\ No newline at end of file
diff --git a/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h
index c748aae464..f9efcb7330 100644
--- a/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h
+++ b/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h
@@ -1,14 +1,14 @@
 #ifndef Z2SEQMGR_H_
 #define Z2SEQMGR_H_
 
-#include "global.h"
 #include "JSystem/JAudio2/JAISe/JAISe.h"
 #include "JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h"
+#include "global.h"
 
-struct Z2SeqMgr{
+struct Z2SeqMgr {
     Z2SeqMgr(void);
-    void bgmStart(u32,u32,s32);
-    void bgmStop(u32,s32);
+    void bgmStart(u32, u32, s32);
+    void bgmStop(u32, s32);
     void subBgmStart(u32);
     void subBgmStop(void);
     void subBgmStopInner(void);
@@ -42,7 +42,7 @@ struct Z2SeqMgr{
     void setBattleLastHit(u8);
     void battleBgmFramework(void);
     void startBattleBgm(bool);
-    void stopBattleBgm(u8,u8);
+    void stopBattleBgm(u8, u8);
     void fieldBgmStart(void);
     void fieldRidingMute(void);
     void onFieldBgmJumpStart(void);
@@ -59,40 +59,40 @@ struct Z2SeqMgr{
     u8 unk_1;
 };
 
-extern "C"{
-    void Z2SeqMgr_NS_fieldBgmStart(void);
-    void JAIStreamMgr_NS_stop_X1_(void);
-    void JAISeqMgr_NS_stop_X1_(void);
-    void bgmStart__8Z2SeqMgrFUlUll(u32,u32,s32);
-    void bgmStop__8Z2SeqMgrFUll(u32, s32);
-    void JAISoundHandle_NS_releaseSound(void);
-    void Z2SeqMgr_NS_subBgmStop(void);
-    void subBgmStop__8Z2SeqMgrFv(void);
-    void subBgmStopInner__8Z2SeqMgrFv(void);
-    void JAISoundStatus__NS_lockWhenPrepared();
-    void bgmStreamPrepare__8Z2SeqMgrFUl(u32);
-    void JAISound_NS_stop_X1_(void);
-    void JAISoundStatus__NS_unlockIfLocked(void);
-    void bgmStreamPlay__8Z2SeqMgrFv(void);
-    void bgmStreamStop__8Z2SeqMgrFUl(u32);
-    void subBgmStart__8Z2SeqMgrFUl(u32);
-    void Z2SeqMgr_NS_setChildTrackVolume(void);
-    void changeBgmStatus__8Z2SeqMgrFl(s32);
-    void changeSubBgmStatus__8Z2SeqMgrFl(s32);
-    void JAISeqMgr_NS_mixOut(void);
-    void JAISeqMgr_NS_calc(void);
+extern "C" {
+void Z2SeqMgr_NS_fieldBgmStart(void);
+void JAIStreamMgr_NS_stop_X1_(void);
+void JAISeqMgr_NS_stop_X1_(void);
+void bgmStart__8Z2SeqMgrFUlUll(u32, u32, s32);
+void bgmStop__8Z2SeqMgrFUll(u32, s32);
+void JAISoundHandle_NS_releaseSound(void);
+void Z2SeqMgr_NS_subBgmStop(void);
+void subBgmStop__8Z2SeqMgrFv(void);
+void subBgmStopInner__8Z2SeqMgrFv(void);
+void JAISoundStatus__NS_lockWhenPrepared();
+void bgmStreamPrepare__8Z2SeqMgrFUl(u32);
+void JAISound_NS_stop_X1_(void);
+void JAISoundStatus__NS_unlockIfLocked(void);
+void bgmStreamPlay__8Z2SeqMgrFv(void);
+void bgmStreamStop__8Z2SeqMgrFUl(u32);
+void subBgmStart__8Z2SeqMgrFUl(u32);
+void Z2SeqMgr_NS_setChildTrackVolume(void);
+void changeBgmStatus__8Z2SeqMgrFl(s32);
+void changeSubBgmStatus__8Z2SeqMgrFl(s32);
+void JAISeqMgr_NS_mixOut(void);
+void JAISeqMgr_NS_calc(void);
 }
 
-extern u8 lbl_8039BA08[0x280]; // Z2AudioLib stringBase0
+extern u8 lbl_8039BA08[0x280];  // Z2AudioLib stringBase0
 extern u32 lbl_803C9DF8;
 extern u32 lbl_803CA08C;
 extern u32 lbl_803CA308;
 extern u32 lbl_80450860;
 extern u8 lbl_80450861;
 extern u8 lbl_80450862;
-extern float lbl_804507F4; // SONIC_SPEED
-extern float lbl_80450818; // VOL_BGM_TALKING
-extern float lbl_8045083C; // VOL_BGM_PAUSING
+extern float lbl_804507F4;  // SONIC_SPEED
+extern float lbl_80450818;  // VOL_BGM_TALKING
+extern float lbl_8045083C;  // VOL_BGM_PAUSING
 extern float lbl_80455998;
 extern float lbl_8045599C;
 extern float lbl_804559A0;
@@ -112,7 +112,6 @@ extern float lbl_804559DC;
 extern float lbl_804559E0;
 extern double lbl_804559E8;
 
-
-extern Z2SeqMgr* lbl_80450B84; // Z2SeqMgr sInstance
+extern Z2SeqMgr* lbl_80450B84;  // Z2SeqMgr sInstance
 
 #endif
\ No newline at end of file
diff --git a/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h b/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h
index 69208e3c7a..7d45c5a018 100644
--- a/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h
+++ b/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-struct Z2StatusMgr{
+struct Z2StatusMgr {
     Z2StatusMgr(void);
     void heartGaugeOn(void);
     void processHeartGaugeSound(void);
@@ -39,29 +39,29 @@ struct Z2StatusMgr{
     u8 padding3[2];
 };
 
-extern "C"{
-    void menuIn__11Z2StatusMgrFv(void);
-    void menuOut__11Z2StatusMgrFv(void);
-    bool isMovieDemo__11Z2StatusMgrFv(void);
-    void Z2SceneMgr_NS_sceneBgmStart(void);
-    void setDemoName__11Z2StatusMgrFPc(char*);
-    bool checkDayTime__11Z2StatusMgrFv(void);
-    void processTime__11Z2StatusMgrFv(void);
-    void setEventBit__11Z2StatusMgrFPv(void*);
-    void setCameraPolygonPos__11Z2StatusMgrFP3Vec(Vec*);
-    void setCameraGroupInfo__11Z2StatusMgrFUc(u8);
-    void Z2FxLineMgr_NS_setUnderWaterFx(void);
+extern "C" {
+void menuIn__11Z2StatusMgrFv(void);
+void menuOut__11Z2StatusMgrFv(void);
+bool isMovieDemo__11Z2StatusMgrFv(void);
+void Z2SceneMgr_NS_sceneBgmStart(void);
+void setDemoName__11Z2StatusMgrFPc(char*);
+bool checkDayTime__11Z2StatusMgrFv(void);
+void processTime__11Z2StatusMgrFv(void);
+void setEventBit__11Z2StatusMgrFPv(void*);
+void setCameraPolygonPos__11Z2StatusMgrFP3Vec(Vec*);
+void setCameraGroupInfo__11Z2StatusMgrFUc(u8);
+void Z2FxLineMgr_NS_setUnderWaterFx(void);
 }
 
-extern Z2StatusMgr* lbl_80450B7C; // Z2StatusMgr sInstance
-extern u8 lbl_8039BC88[0x320]; // stringBase0
+extern Z2StatusMgr* lbl_80450B7C;  // Z2StatusMgr sInstance
+extern u8 lbl_8039BC88[0x320];     // stringBase0
 extern double lbl_80455A28;
 extern u32 lbl_803CA508;
-extern float lbl_80455A18; // polygon_position init to 1.0E7
-extern float lbl_80455A1C; // underwater_depth / unk28 init to 0.0
-extern float lbl_80455A20; // processHeartGaugeSound etc
-extern float lbl_80455A24; // processHeartGaugeSound
-extern u8 lbl_80451124; // used in processHeartGaugeSound
+extern float lbl_80455A18;  // polygon_position init to 1.0E7
+extern float lbl_80455A1C;  // underwater_depth / unk28 init to 0.0
+extern float lbl_80455A20;  // processHeartGaugeSound etc
+extern float lbl_80455A24;  // processHeartGaugeSound
+extern u8 lbl_80451124;     // used in processHeartGaugeSound
 extern float lbl_80455A30;
 extern float lbl_80455A34;
 
diff --git a/include/d/d_a/d_a_alink/d_a_alink.h b/include/d/d_a/d_a_alink/d_a_alink.h
index 8792a24510..3196958c6d 100644
--- a/include/d/d_a/d_a_alink/d_a_alink.h
+++ b/include/d/d_a/d_a_alink/d_a_alink.h
@@ -1,30 +1,30 @@
 #ifndef D_A_ALINK_H_
 #define D_A_ALINK_H_
 
-#include "global.h"
-#include "f/f_op/f_op_actor.h"
-#include "d/d_cc/d_cc_d.h"
+#include "JSystem/J3DGraphAnimator/J3DJoint.h"
+#include "JSystem/J3DGraphAnimator/J3DModel.h"
+#include "JSystem/J3DGraphAnimator/J3DModelData.h"
+#include "JSystem/J3DGraphAnimator/J3DModelLoader.h"
+#include "SComponent/c_bg_s_poly_info.h"
 #include "d/d_a/d_a_player/d_a_player.h"
+#include "d/d_cc/d_cc_d.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "d/d_resource/d_resource.h"
 #include "d/d_save/d_save/d_save.h"
-#include "SComponent/c_bg_s_poly_info.h"
-#include "JSystem/J3DGraphAnimator/J3DModelData.h"
-#include "JSystem/J3DGraphAnimator/J3DModel.h"
-#include "JSystem/J3DGraphAnimator/J3DModelLoader.h"
-#include "JSystem/J3DGraphAnimator/J3DJoint.h"
+#include "f/f_op/f_op_actor.h"
+#include "global.h"
 
 typedef u32 daAlink_ANM;
 typedef u32 daAlink_UPPER;
 typedef u32 daAlink_UNDER;
 typedef u32 daAlink_FTANM;
 
-class daAlink_matAnm_c{
-   public:
+class daAlink_matAnm_c {
+public:
     void init(void);
     void calc(J3DMaterial*) const;
 
-   private:
+private:
     u8 unk0[0xf4];
     float unk244;
     float unk248;
@@ -38,18 +38,18 @@ class daAlinkHIO_anm_c;
 class daPy_frameCtrl_c;
 struct cM3dGPla;
 
-struct csXyz{       //move later
-    s16 x,y,z;
+struct csXyz {  // move later
+    s16 x, y, z;
 };
 
-class daAlink_c{
-   public:
+class daAlink_c {
+public:
     u32 getE3Zhint(void);
     const char* getAlinkArcName(void);
     u32 checkStageName(const char*);
     void tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*);
     void coHitCallback(fopAc_ac_c*, dCcD_GObjInf*);
-    void setMatrixWorldAxisRot(float(*)[4],short,short,short,int,const cXyz*);
+    void setMatrixWorldAxisRot(float (*)[4], short, short, short, int, const cXyz*);
     bool jointControll(int);
     void setUpperFront(void);
     void changeBlendRate(int);
@@ -59,7 +59,7 @@ class daAlink_c{
     bool wolfModelCallBack(int);
     void setHatAngle(void);
     void calcHairAngle(short*);
-    void setHairAngle(cXyz*,float,float);
+    void setHairAngle(cXyz*, float, float);
     void setLookPosFromOut(cXyz*);
     int checkAttentionPosAngle(cXyz*);
     bool checkActorPosAngle(fopAc_ac_c*, cXyz**);
@@ -68,13 +68,13 @@ class daAlink_c{
     double setEyeMove(cXyz*, short, short);
     void setNeckAngle(void);
     bool getStickAngleFromPlayerShape(short*) const;
-    void commonLineCheck(cXyz*,cXyz*);
+    void commonLineCheck(cXyz*, cXyz*);
     int getMoveBGActorName(cBgS_PolyInfo&, int);
     bool checkGoronRide(void);
     void setMoveSlantAngle(void);
     bool setArmMatrix(void);
     bool setFootMatrix(void);
-    void setMatrixOffset(float*,float);
+    void setMatrixOffset(float*, float);
     bool setLegAngle(float, daAlink_footData_c*, short*, short*, int);
     void footBgCheck(void);
     void handBgCheck(void);
@@ -134,7 +134,8 @@ class daAlink_c{
     bool checkUnderMove1BckNoArc(daAlink_ANM) const;
     u32 getUnderUpperAnime(daAlink_ANM, J3DAnmTransform**, J3DAnmTransform**, int, u32);
     void setDoubleAnimeBlendRatio(float);
-    void commonDoubleAnime(J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*, float, float, float, int);
+    void commonDoubleAnime(J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*,
+                           float, float, float, int);
     bool setDoubleAnime(float, float, float, daAlink_ANM, daAlink_ANM, int, float);
     void commonSingleAnime(J3DAnmTransform*, J3DAnmTransform*, float, float, short);
     void setSingleAnimeBase(daAlink_ANM);
@@ -192,111 +193,114 @@ class daAlink_c{
     bool checkSlope(void) const;
     void setPlayerPosAndAngle(cXyz const*, short, int);
     void setPlayerPosAndAngle(cXyz const*, csXyz const*);
-    void setPlayerPosAndAngle(float(*)[4]);
+    void setPlayerPosAndAngle(float (*)[4]);
     u32 itemTriggerCheck(u8);
     u32 itemButtonCheck(u8);
 
-   private:
+private:
     u8 unk[14268];
 };
 
-extern "C"{
-    void tgHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfP12dCcD_GObjInf(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*);
-    void coHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInf(fopAc_ac_c*, dCcD_GObjInf*);
-    void J3DMaterialAnm_NS_calc(void);
-    void PSVECAdd(Vec*, Vec*, Vec*);
-    void mDoMtx_stack_c_NS_transM(float, float, float);
-    void daAlink_c_NS_concatMagneBootInvMtx(void);
-    void mDoMtx_ZXYrotM(void);
-    void mDoMtx_YrotM(void);
-    void daAlink_c_NS_concatMagneBootMtx(void);
-    void mDoMtx_stack_c_NS_transS(void);
-    void PSMTXQuat(void);
-    void PSMTXInverse(void);
-    void mDoMtx_stack_c_NS_quatM(void);
-    void PSMTXTrans(void);
-    void daAlink_c_NS_checkUnderMove0BckNoArc(void);
-    void mDoMtx_QuatConcat(void);
-    void JMAEulerToQuat(void);
-    void daAlink_c_NS_checkBowAnime(void);
-    void setMatrixWorldAxisRot__9daAlink_cFPA4_fsssiPC4cXyz(float(*)[4],short,short,short,int,const cXyz*);
-    void daAlink_c_NS_checkHorseLieAnime(void);
-    void csXyz_X1_(void);
-    void daAlink_c_NS_checkNoUpperAnime(void);
-    void daAlink_c_NS_checkUpperReadyThrowAnime(void);
-    void daAlink_c_NS_setDoubleAnimeBlendRatio(void);
-    void changeBlendRate__9daAlink_cFi(int);
-    void daAlink_c_NS_setArmMatrix(void);
-    void daAlink_c_NS_setFootMatrix(void);
-    void setUpperFront__9daAlink_cFv(void);
-    bool jointControll__9daAlink_cFi(int);
-    void resetRootMtx__9daAlink_cFv(void);
-    bool modelCallBack__9daAlink_cFi(int);
-    void daAlink_c_NS_checkZoraWearAbility(void);
-    void mDoMtx_stack_c_NS_scaleM(void);
-    void mDoMtx_XYZrotM(void);
-    void mDoMtx_ZrotM(void);
-    bool headModelCallBack__9daAlink_cFi(int);
-    void daAlink_c_NS_changeWolfBlendRate(void);
-    void daAlink_c_NS_setWolfFootMatrix(void);
-    bool wolfModelCallBack__9daAlink_cFi(int);
-    void cLib_addCalcAngleS2(void);
-    void PSMTXMultVec(void);
-    void daAlink_c_NS_getMoveBGActorName(void);
-    void daAlink_c_NS_multVecMagneBootInvMtx(void);
-    void cXyz_NS___ml(void);
-    void cXyz_NS_atan2sY_XZ(void);
-    void cM_atan2s(void);
-    void cLib_distanceAngleS(void);
-    void cXyz_NS_atan2sX_Z(void);
-    void PSMTXMultVecSR(void);
-    void cXyz_NS___mi(void);
-    void dKyw_get_AllWind_vec(void);
-    void PSVECSquareMag(void);
-    void cLib_addCalcAngleS(void);
-    void cM_rndF(void);
-    void calcHairAngle__9daAlink_cFPs(short*);
-    void setHairAngle__9daAlink_cFP4cXyzff(cXyz*,float,float);
-    void cLib_targetAngleY(void);
-    void daAlink_c_NS_checkEnemyGroup(void);
-    int checkAttentionPosAngle__9daAlink_cFP4cXyz(cXyz*);
-    void daAlink_c_NS_getDemoLookActor(void);
-    void daAlink_c_NS_checkDemoMoveMode(void);
-    bool isTransformLV__21dSv_player_status_b_cCFi(int);
-    void dKy_darkworld_check(void);
-    void daAlink_c_NS_checkAttentionState(void);
-    void daAlink_c_NS_checkUnderMove0BckNoArcWolf(void);
-    void daAlink_c_NS_checkWindSpeedOnAngleAnime(void);
-    void daAlink_c_NS_getCopyRodControllActor(void);
-    void dAttLook_c_NS_convPId(void);
-    void daAlink_c_NS_checkEventRun(void);
-    bool checkActorPosAngle__9daAlink_cFP10fopAc_ac_cPP4cXyz(fopAc_ac_c*, cXyz**);
-    void dCamera_c_NS_GetForceLockOnActor(void);
-    void dCam_getBody(void);
-    void dAttention_c_NS_LockonTarget(void);
-    void cM_rnd(void);
-    void fopAcIt_Judge(void);
-    void dAttList_c_NS_getActor(void);
-    void dAttention_c_NS_GetLockonList(void);
-    void fopAcM_getTalkEventPartner(void);
+extern "C" {
+void tgHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfP12dCcD_GObjInf(fopAc_ac_c*,
+                                                                           dCcD_GObjInf*,
+                                                                           dCcD_GObjInf*);
+void coHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInf(fopAc_ac_c*, dCcD_GObjInf*);
+void J3DMaterialAnm_NS_calc(void);
+void PSVECAdd(Vec*, Vec*, Vec*);
+void mDoMtx_stack_c_NS_transM(float, float, float);
+void daAlink_c_NS_concatMagneBootInvMtx(void);
+void mDoMtx_ZXYrotM(void);
+void mDoMtx_YrotM(void);
+void daAlink_c_NS_concatMagneBootMtx(void);
+void mDoMtx_stack_c_NS_transS(void);
+void PSMTXQuat(void);
+void PSMTXInverse(void);
+void mDoMtx_stack_c_NS_quatM(void);
+void PSMTXTrans(void);
+void daAlink_c_NS_checkUnderMove0BckNoArc(void);
+void mDoMtx_QuatConcat(void);
+void JMAEulerToQuat(void);
+void daAlink_c_NS_checkBowAnime(void);
+void setMatrixWorldAxisRot__9daAlink_cFPA4_fsssiPC4cXyz(float (*)[4], short, short, short, int,
+                                                        const cXyz*);
+void daAlink_c_NS_checkHorseLieAnime(void);
+void csXyz_X1_(void);
+void daAlink_c_NS_checkNoUpperAnime(void);
+void daAlink_c_NS_checkUpperReadyThrowAnime(void);
+void daAlink_c_NS_setDoubleAnimeBlendRatio(void);
+void changeBlendRate__9daAlink_cFi(int);
+void daAlink_c_NS_setArmMatrix(void);
+void daAlink_c_NS_setFootMatrix(void);
+void setUpperFront__9daAlink_cFv(void);
+bool jointControll__9daAlink_cFi(int);
+void resetRootMtx__9daAlink_cFv(void);
+bool modelCallBack__9daAlink_cFi(int);
+void daAlink_c_NS_checkZoraWearAbility(void);
+void mDoMtx_stack_c_NS_scaleM(void);
+void mDoMtx_XYZrotM(void);
+void mDoMtx_ZrotM(void);
+bool headModelCallBack__9daAlink_cFi(int);
+void daAlink_c_NS_changeWolfBlendRate(void);
+void daAlink_c_NS_setWolfFootMatrix(void);
+bool wolfModelCallBack__9daAlink_cFi(int);
+void cLib_addCalcAngleS2(void);
+void PSMTXMultVec(void);
+void daAlink_c_NS_getMoveBGActorName(void);
+void daAlink_c_NS_multVecMagneBootInvMtx(void);
+void cXyz_NS___ml(void);
+void cXyz_NS_atan2sY_XZ(void);
+void cM_atan2s(void);
+void cLib_distanceAngleS(void);
+void cXyz_NS_atan2sX_Z(void);
+void PSMTXMultVecSR(void);
+void cXyz_NS___mi(void);
+void dKyw_get_AllWind_vec(void);
+void PSVECSquareMag(void);
+void cLib_addCalcAngleS(void);
+void cM_rndF(void);
+void calcHairAngle__9daAlink_cFPs(short*);
+void setHairAngle__9daAlink_cFP4cXyzff(cXyz*, float, float);
+void cLib_targetAngleY(void);
+void daAlink_c_NS_checkEnemyGroup(void);
+int checkAttentionPosAngle__9daAlink_cFP4cXyz(cXyz*);
+void daAlink_c_NS_getDemoLookActor(void);
+void daAlink_c_NS_checkDemoMoveMode(void);
+bool isTransformLV__21dSv_player_status_b_cCFi(int);
+void dKy_darkworld_check(void);
+void daAlink_c_NS_checkAttentionState(void);
+void daAlink_c_NS_checkUnderMove0BckNoArcWolf(void);
+void daAlink_c_NS_checkWindSpeedOnAngleAnime(void);
+void daAlink_c_NS_getCopyRodControllActor(void);
+void dAttLook_c_NS_convPId(void);
+void daAlink_c_NS_checkEventRun(void);
+bool checkActorPosAngle__9daAlink_cFP10fopAc_ac_cPP4cXyz(fopAc_ac_c*, cXyz**);
+void dCamera_c_NS_GetForceLockOnActor(void);
+void dCam_getBody(void);
+void dAttention_c_NS_LockonTarget(void);
+void cM_rnd(void);
+void fopAcIt_Judge(void);
+void dAttList_c_NS_getActor(void);
+void dAttention_c_NS_GetLockonList(void);
+void fopAcM_getTalkEventPartner(void);
 }
 
-//daalink_matanm init
+// daalink_matanm init
 extern float lbl_80452CC0;
 extern u8 lbl_80450FC8;
 extern u8 lbl_80450FC9;
 
-//daalink_matanm calc
+// daalink_matanm calc
 extern double lbl_80452CB0;
 extern float lbl_80452CB8;
 
-//daalink setmatrixworldaxisrot
-struct now{ // m_Do_mtx::mDoMtx_stack_c::now
+// daalink setmatrixworldaxisrot
+struct now {  // m_Do_mtx::mDoMtx_stack_c::now
     float unk0[4];
     float unk10[4];
     float unk20[4];
 };
-struct mCurrentMtx{ // J3DGraphBase::J3DSys::mCurrentMtx
+struct mCurrentMtx {  // J3DGraphBase::J3DSys::mCurrentMtx
     float unk0[4];
     float unk10[4];
     float unk20[4];
@@ -304,14 +308,14 @@ struct mCurrentMtx{ // J3DGraphBase::J3DSys::mCurrentMtx
 extern now lbl_803DD470;
 extern mCurrentMtx lbl_80434BE4;
 
-//daalink modelcallback
-struct j3dsys;      // J3DGraphBase::j3dSys
+// daalink modelcallback
+struct j3dsys;  // J3DGraphBase::j3dSys
 extern j3dsys lbl_80434AC8;
 
-//daalink headmodelcallback
+// daalink headmodelcallback
 extern float lbl_80452EDC;
 
-//daalink sethatangle
+// daalink sethatangle
 extern float lbl_80452CE0;
 extern double lbl_80452CE8;
 extern float lbl_80452D50;
@@ -328,12 +332,12 @@ extern float lbl_80453058;
 extern float lbl_80453100;
 extern float lbl_804531F0;
 extern float lbl_804531F4;
-extern cXyz lbl_80430CF4; // SComponent::cXyz::Zero
-extern cXyz lbl_80430D0C; // SComponent::cXyz::BaseX
-extern cXyz lbl_80430D24; // SComponent::cXyz::BaseY
-extern u8 lbl_80439A20[65536]; // JMath::JMath::sincosTable_
+extern cXyz lbl_80430CF4;       // SComponent::cXyz::Zero
+extern cXyz lbl_80430D0C;       // SComponent::cXyz::BaseX
+extern cXyz lbl_80430D24;       // SComponent::cXyz::BaseY
+extern u8 lbl_80439A20[65536];  // JMath::JMath::sincosTable_
 
-//daalink sethairangle
+// daalink sethairangle
 extern float lbl_80452C98;
 extern float lbl_80452D18;
 extern float lbl_80452D5C;
@@ -354,15 +358,14 @@ extern float lbl_80453208;
 extern float lbl_8045320C;
 extern float lbl_80453210;
 
-//daalink checkattentionposangle
-extern u8 lbl_8038E5A4[0x6C]; // daAlinkHIO_horse_c0::m
+// daalink checkattentionposangle
+extern u8 lbl_8038E5A4[0x6C];  // daAlinkHIO_horse_c0::m
 
-//daalink getneckaimpos
-extern u32 lbl_80451018; // daPy_py_c::m_midnaActor
+// daalink getneckaimpos
+extern u32 lbl_80451018;  // daPy_py_c::m_midnaActor
 extern float lbl_80452D68;
 extern float lbl_80452DB0;
 extern float lbl_80452DE0;
 extern float lbl_80452E44;
 
-
 #endif
\ No newline at end of file
diff --git a/include/d/d_a/d_a_horse_static/d_a_horse_static.h b/include/d/d_a/d_a_horse_static/d_a_horse_static.h
index 470b71596e..ecb166535e 100644
--- a/include/d/d_a/d_a_horse_static/d_a_horse_static.h
+++ b/include/d/d_a/d_a_horse_static/d_a_horse_static.h
@@ -1,21 +1,21 @@
 #include "dolphin/types.h"
 
-class e_wb_class{
-  public:
-   u32 checkWait(void);
-   void setPlayerRideNow(void);
-   void setPlayerRide(void);
-   void getOff(void);
-   u8 checkDownDamage(void);
-   u8 checkNormalRideMode(void) const;
-   void setRunRideMode(void);
+class e_wb_class {
+public:
+    u32 checkWait(void);
+    void setPlayerRideNow(void);
+    void setPlayerRide(void);
+    void getOff(void);
+    u8 checkDownDamage(void);
+    u8 checkNormalRideMode(void) const;
+    void setRunRideMode(void);
 
-  private:
-   u8 unk0[0x5b4];
-   s16 unk1460;
-   u8 unk1462[0xd9];
-   s16 unk1680;
-   u16 unk1682;
-   u8 unk1684[0x2a];
-   u16 unk1726;
+private:
+    u8 unk0[0x5b4];
+    s16 unk1460;
+    u8 unk1462[0xd9];
+    s16 unk1680;
+    u16 unk1682;
+    u8 unk1684[0x2a];
+    u16 unk1726;
 };
\ No newline at end of file
diff --git a/include/d/d_a/d_a_item_static/d_a_item_static.h b/include/d/d_a/d_a_item_static/d_a_item_static.h
index f1508cf86c..b5000d0776 100644
--- a/include/d/d_a/d_a_item_static/d_a_item_static.h
+++ b/include/d/d_a/d_a_item_static/d_a_item_static.h
@@ -1,14 +1,14 @@
 #include "dolphin/types.h"
 
-class daItem_c{
-  public:
-  u32 startCtrl(void);
-  u32 startControl(void);
-  u32 endControl(void);
+class daItem_c {
+public:
+    u32 startCtrl(void);
+    u32 startControl(void);
+    u32 endControl(void);
 
-  private:
-  u8 unk0[0x948];
-  u8 unk2376;
-  u8 unk2377;
-  u8 unk2378;
+private:
+    u8 unk0[0x948];
+    u8 unk2376;
+    u8 unk2377;
+    u8 unk2378;
 };
\ No newline at end of file
diff --git a/include/d/d_a/d_a_player/d_a_player.h b/include/d/d_a/d_a_player/d_a_player.h
index 8689ae6977..02e3aab329 100644
--- a/include/d/d_a/d_a_player/d_a_player.h
+++ b/include/d/d_a/d_a_player/d_a_player.h
@@ -1,8 +1,6 @@
 #ifndef D_A_PLAYER_H_
 #define D_A_PLAYER_H_
 
-class daPy_anmHeap_c{
-
-};
+class daPy_anmHeap_c {};
 
 #endif
\ No newline at end of file
diff --git a/include/d/d_bomb/d_bomb.h b/include/d/d_bomb/d_bomb.h
index a859ffe784..2f7d0dc0a5 100644
--- a/include/d/d_bomb/d_bomb.h
+++ b/include/d/d_bomb/d_bomb.h
@@ -1,12 +1,13 @@
-#include "global.h"
 #include "f/f_op/f_op_actor.h"
+#include "global.h"
 
-class dBomb_c{
+class dBomb_c {
 public:
     bool checkStateCarry();
     bool checkFlowerBombWait(fopAc_ac_c* param_1);
     bool checkWaterBomb(fopAc_ac_c* param_1);
     bool checkInsectBombMove(fopAc_ac_c* param_1);
+
 private:
     u8 p1[0x8];
     s16 unk_1;
diff --git a/include/d/d_cc/d_cc_d.h b/include/d/d_cc/d_cc_d.h
index cabb243b6e..5f34ddd609 100644
--- a/include/d/d_cc/d_cc_d.h
+++ b/include/d/d_cc/d_cc_d.h
@@ -1,8 +1,6 @@
 #ifndef D_CC_D_H_
 #define D_CC_D_H_
 
-struct dCcD_GObjInf{
-
-};
+struct dCcD_GObjInf {};
 
 #endif
\ No newline at end of file
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 8ff028206b..89f1f6dc4b 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
@@ -8,19 +8,19 @@
 #include "d/d_save/d_save/d_save.h"
 
 class dComIfG_play_c {
-   public:
+public:
     void ct(void);
     void init(void);
     u8 unk[0x100];
 };
 
 class dCcMassS_Mng {
-   public:
+public:
     u8 unk[0x274];
 };
 
 class dAttDraw_c {
-   public:
+public:
     u8 unk[0x178];
 };
 
@@ -36,34 +36,32 @@ class dComIfG_camera_info_class {
     u8 unk[0x38];
 };
 
-struct mDoExt_bckAnm{
+struct mDoExt_bckAnm {};
 
-};
-
-struct item_func{
-    float hearts;         //bf80
-    u32 rupees;         //bf84
-    s16 small_keys;     //bf88
-    s16 kakera_heart;   //bf8a
-    s16 magic;          //bf8c
-    u16 unk;            //bf8e
-    s16 magic_lv;       //bf90
-    u8 unk2[2];         //bf92/93 // removed stuff?
-    u32 unk3;           //bf94  //related to lantern?
-    u32 unk4;           //bf98  //related to lantern?
-    u32 unk5;           //bf9c  //related to lantern?
-    u32 unk6;           //bfa0  //related to oxygen?
-    u32 unk7;           //bfa4  //related to oxygen?
-    u32 unk8;           //bfa8  //related to oxygen?
-    u32 unk9;           //bfac  //related to oxygen?
-    u32 unk10;          //bfb0  //related to oxygen?
-    s16 arrows;         //bfb4
-    s16 seeds;          //bfb6
+struct item_func {
+    float hearts;      // bf80
+    u32 rupees;        // bf84
+    s16 small_keys;    // bf88
+    s16 kakera_heart;  // bf8a
+    s16 magic;         // bf8c
+    u16 unk;           // bf8e
+    s16 magic_lv;      // bf90
+    u8 unk2[2];        // bf92/93 // removed stuff?
+    u32 unk3;          // bf94  //related to lantern?
+    u32 unk4;          // bf98  //related to lantern?
+    u32 unk5;          // bf9c  //related to lantern?
+    u32 unk6;          // bfa0  //related to oxygen?
+    u32 unk7;          // bfa4  //related to oxygen?
+    u32 unk8;          // bfa8  //related to oxygen?
+    u32 unk9;          // bfac  //related to oxygen?
+    u32 unk10;         // bfb0  //related to oxygen?
+    s16 arrows;        // bfb4
+    s16 seeds;         // bfb6
 };
 
 // 16 bytes too big, figure out later
 class dComIfG_inf_c {
-   public:
+public:
     /* 0x00000 */ dSv_info_c info;
     /* 0x00EEC */ u8 unk2[0x4C];
     /* 0x00F38 */ dComIfG_play_c play;
diff --git a/include/d/d_drawlist/d_drawlist.h b/include/d/d_drawlist/d_drawlist.h
index de4f091bb1..88b7bee0be 100644
--- a/include/d/d_drawlist/d_drawlist.h
+++ b/include/d/d_drawlist/d_drawlist.h
@@ -4,21 +4,21 @@
 #include "dolphin/types.h"
 
 class dDlst_FileInfo_c {
-   public:
+public:
     void draw(void);
     ~dDlst_FileInfo_c();
 
-   private:
+private:
 };
 
 class dDlst_list_c {
-   public:
+public:
     static u32 mWipeColor;
     static u32 mWipeDlst;
     static u32 mWipeRate;
     static u32 mWipeSpeed;
 
-   private:
+private:
     u8 unk[0x161A0];
 };
 
diff --git a/include/d/d_event/d_event/d_event.h b/include/d/d_event/d_event/d_event.h
index 77b92fa105..ebe5e42bbb 100644
--- a/include/d/d_event/d_event/d_event.h
+++ b/include/d/d_event/d_event/d_event.h
@@ -4,8 +4,8 @@
 #include "dolphin/types.h"
 
 class dEvt_control_c {
-    public:
-     u8 unk[0x130];
+public:
+    u8 unk[0x130];
 };
 
 #endif
\ No newline at end of file
diff --git a/include/d/d_event/d_event_manager/d_event_manager.h b/include/d/d_event/d_event_manager/d_event_manager.h
index 74ff13e8ba..3f06e27ed3 100644
--- a/include/d/d_event/d_event_manager/d_event_manager.h
+++ b/include/d/d_event/d_event_manager/d_event_manager.h
@@ -4,8 +4,8 @@
 #include "dolphin/types.h"
 
 class dEvent_manager_c {
-    public:
-     u8 unk[0x6C8];
+public:
+    u8 unk[0x6C8];
 };
 
 #endif
\ No newline at end of file
diff --git a/include/d/d_file/d_file_sel_info/d_file_sel_info.h b/include/d/d_file/d_file_sel_info/d_file_sel_info.h
index 72d90ec7e5..a26369b4f7 100644
--- a/include/d/d_file/d_file_sel_info/d_file_sel_info.h
+++ b/include/d/d_file/d_file_sel_info/d_file_sel_info.h
@@ -5,8 +5,8 @@
 #include "JSystem/JKernel/JKRArchive/JKRArchive.h"
 #include "JSystem/JUtility/JUTFont/JUTFont.h"
 #include "d/d_drawlist/d_drawlist.h"
-#include "d/d_save/d_save/d_save.h"
 #include "d/d_pane/d_pane_class_alpha/d_pane_class_alpha.h"
+#include "d/d_save/d_save/d_save.h"
 
 struct dFile_info_c_vtable {
     u32* addr1;
@@ -15,8 +15,8 @@ struct dFile_info_c_vtable {
 };
 
 class dFile_info_c {
-   public:
-    dFile_info_c(JKRArchive*,u8);
+public:
+    dFile_info_c(JKRArchive*, u8);
     ~dFile_info_c();
     void screenSet(void);
     s32 setSaveData(dSv_save_c*, int, u8);
@@ -27,7 +27,7 @@ class dFile_info_c {
     void modeMove(void);
     void _draw(void);
 
-   private:
+private:
     dFile_info_c_vtable vtable;
     JKRArchive* archive;
     dDlst_FileInfo_c file_info_draw_list;
diff --git a/include/d/d_item/d_item/d_item.h b/include/d/d_item/d_item/d_item.h
index ea0e7e5ca0..8a08078186 100644
--- a/include/d/d_item/d_item/d_item.h
+++ b/include/d/d_item/d_item/d_item.h
@@ -1,7 +1,7 @@
 #ifndef D_ITEM_H_
 #define D_ITEM_H_
 
-int checkItemGet(u8,int);
+int checkItemGet(u8, int);
 
 extern int (*item_func_ptr[256])(void);
 extern int (*item_getcheck_func_ptr[256])(void);
diff --git a/include/d/d_meter2/d_meter2_info/d_meter2_info.h b/include/d/d_meter2/d_meter2_info/d_meter2_info.h
index e018083aef..4e641ab284 100644
--- a/include/d/d_meter2/d_meter2_info/d_meter2_info.h
+++ b/include/d/d_meter2/d_meter2_info/d_meter2_info.h
@@ -7,7 +7,7 @@ struct dMeter2Info_c_vtable {
 };
 
 class dMeter2Info_c {
-   public:
+public:
     dMeter2Info_c::dMeter2Info_c();
     dMeter2Info_c::~dMeter2Info_c();
     void init(void);
@@ -31,7 +31,8 @@ class dMeter2Info_c {
     void resetMeterString(void);
     void setWarpInfo(const char*, const cXyz&, s16, u8, u8, u8);
     u8 getItemType(u8);
-    u8 readItemTexture(u8, void*, J2DPicture*, void*, J2DPicture*, void*, J2DPicture*, void*, J2DPicture*, int);  // define J2DPicture
+    u8 readItemTexture(u8, void*, J2DPicture*, void*, J2DPicture*, void*, J2DPicture*, void*,
+                       J2DPicture*, int);  // define J2DPicture
     void setItemColor(u8, J2DPicture*, J2DPicture*, J2DPicture*, J2DPicture*);
     u8 get2ndTexture(u8);
     u8 get3rdTexture(u8);
@@ -48,7 +49,7 @@ class dMeter2Info_c {
     void setMiniGameCount(s8);
     void setSaveStageName(const char*);
 
-   private:
+private:
     dMeter2Info_c_vtable* vtable;
     u8 unk4[4];
     u32 unk8;
diff --git a/include/d/d_pane/d_pane_class_alpha/d_pane_class_alpha.h b/include/d/d_pane/d_pane_class_alpha/d_pane_class_alpha.h
index 9242c5b812..3ac4e08257 100644
--- a/include/d/d_pane/d_pane_class_alpha/d_pane_class_alpha.h
+++ b/include/d/d_pane/d_pane_class_alpha/d_pane_class_alpha.h
@@ -1,8 +1,6 @@
 #ifndef D_PANE_CLASS_ALPHA_H_
 #define D_PANE_CLASS_ALPHA_H_
 
-class CPaneMgrAlpha {
-
-};
+class CPaneMgrAlpha {};
 
 #endif
\ No newline at end of file
diff --git a/include/d/d_resource/d_resource.h b/include/d/d_resource/d_resource.h
index 1443040c5b..48ab4b9e24 100644
--- a/include/d/d_resource/d_resource.h
+++ b/include/d/d_resource/d_resource.h
@@ -8,8 +8,8 @@
 #include "m_Do/m_Do_dvd_thread/m_Do_dvd_thread.h"
 
 class dRes_info_c {
-   public:
-   private:
+public:
+private:
     u8 unk[0x24];
     // u8* name;
     // u32 unk4;
@@ -23,12 +23,8 @@ class dRes_info_c {
     // void** resource_buffer;
 };
 
-struct J3DAnmBase{
+struct J3DAnmBase {};
 
-};
-
-struct J3DAnmTransform{
-
-};
+struct J3DAnmTransform {};
 
 #endif
\ No newline at end of file
diff --git a/include/d/d_save/d_save/d_save.h b/include/d/d_save/d_save/d_save.h
index 02c626d220..0263a3863e 100644
--- a/include/d/d_save/d_save/d_save.h
+++ b/include/d/d_save/d_save/d_save.h
@@ -14,11 +14,7 @@
 #define BOMB_BAG_MAX 3
 #define BOTTLE_MAX 4
 
-enum Wallets {
-    WALLET,
-    BIG_WALLET,
-    GIANT_WALLET
-};
+enum Wallets { WALLET, BIG_WALLET, GIANT_WALLET };
 
 enum ItemSlots {
     SLOT_0,
@@ -306,44 +302,20 @@ enum ItemTable {
     noentry9 = 60
 };
 
-enum EquipmentBits {
-    CLOTHING_BITFIELD,
-    SWORD_BITFIELD,
-    SHIELD_BITFIELD
-};
+enum EquipmentBits { CLOTHING_BITFIELD, SWORD_BITFIELD, SHIELD_BITFIELD };
 
-enum Swords {
-    ORDON_SWORD_FLAG,
-    MASTER_SWORD_FLAG,
-    WOODEN_SWORD_FLAG,
-    LIGHT_SWORD_FLAG
-};
+enum Swords { ORDON_SWORD_FLAG, MASTER_SWORD_FLAG, WOODEN_SWORD_FLAG, LIGHT_SWORD_FLAG };
 
-enum Shields {
-    ORDON_SHIELD_FLAG,
-    HYLIAN_SHIELD_FLAG,
-    WOODEN_SHIELD_FLAG
-};
+enum Shields { ORDON_SHIELD_FLAG, HYLIAN_SHIELD_FLAG, WOODEN_SHIELD_FLAG };
 
-enum Armors {
-    KOKIRI_CLOTHES_FLAG
-};
+enum Armors { KOKIRI_CLOTHES_FLAG };
 
-enum DungeonItem {
-    MAP_FLAG,
-    COMPASS_FLAG,
-    BOSS_KEY_FLAG,
-    OOCCOO_NOTE_FLAG = 6
-};
+enum DungeonItem { MAP_FLAG, COMPASS_FLAG, BOSS_KEY_FLAG, OOCCOO_NOTE_FLAG = 6 };
 
-enum AreaVessel {
-    FARON_VESSEL,
-    ELDIN_VESSEL,
-    LANAYRU_VESSEL
-};
+enum AreaVessel { FARON_VESSEL, ELDIN_VESSEL, LANAYRU_VESSEL };
 
 class dSv_player_status_a_c {
-   public:
+public:
     void init(void);
     void setSelectItemIndex(signed int, u8);
     u8 getSelectItemIndex(signed int) const;
@@ -353,12 +325,14 @@ class dSv_player_status_a_c {
     int isMagicFlag(u8) const;
 
     u16& getCurrentHealth() { return mCurrentHealth; }
-    u8& getScent() { return mEquipment[3];}
-    void setWalletLV(u8 lv) { mCurrentWallet = lv;}
-    void setLanternOil(u16 amount) { mMaxLanternOil = amount; mCurrentLanternOil = amount; }
+    u8& getScent() { return mEquipment[3]; }
+    void setWalletLV(u8 lv) { mCurrentWallet = lv; }
+    void setLanternOil(u16 amount) {
+        mMaxLanternOil = amount;
+        mCurrentLanternOil = amount;
+    }
 
-
-   private:
+private:
     u16 mMaxHealth;
     u16 mCurrentHealth;
     u16 mCurrentRupees;
@@ -381,14 +355,14 @@ class dSv_player_status_a_c {
 };
 
 class dSv_player_status_b_c {
-   public:
+public:
     void init(void);
     void onDarkClearLV(int);
     BOOL isDarkClearLV(int) const;
     void onTransformLV(int);
     BOOL isTransformLV(int) const;
 
-   private:
+private:
     u32 unk0;
     u32 unk4;
     u8 mTransformLevelFlag;
@@ -403,16 +377,16 @@ class dSv_player_status_b_c {
 
 // move to SComponent later
 class cXyz {
-   public:
+public:
     float x, y, z;
 };
 
 class dSv_horse_place_c {
-   public:
+public:
     void init(void);
     void set(const char*, const cXyz&, s16, s8);
 
-   private:
+private:
     cXyz mPosition;
     u16 mXRotation;
     char mCurrentStage[8];
@@ -421,11 +395,11 @@ class dSv_horse_place_c {
 };
 
 class dSv_player_return_place_c {
-   public:
+public:
     void init(void);
     void set(const char*, s8, u8);
 
-   private:
+private:
     char mCurrentStage[8];
     u8 mSpawnId;
     u8 mRoomId;
@@ -434,13 +408,13 @@ class dSv_player_return_place_c {
 };
 
 class dSv_player_field_last_stay_info_c {
-   public:
+public:
     void init(void);
     BOOL isRegionBit(int unk) const;
     void onRegionBit(int unk);
     void set(const char*, const cXyz&, s16, s8, u8);
 
-   private:
+private:
     cXyz mLastPosition;
     s16 mLastAngle;
     char mLastStage[8];
@@ -452,11 +426,11 @@ class dSv_player_field_last_stay_info_c {
 };
 
 class dSv_player_last_mark_info_c {
-   public:
+public:
     void init(void);
     void setWarpItemData(const char*, const cXyz&, s16, s8, u8, u8);
 
-   private:
+private:
     cXyz mOoccooPosition;
     s16 mOoccooXRotation;
     char mOoccooStage[8];
@@ -467,7 +441,7 @@ class dSv_player_last_mark_info_c {
 };
 
 class dSv_player_item_c {
-   public:
+public:
     void init(void);
     void setItem(int, u8);
     u8 getItem(int, bool) const;
@@ -493,25 +467,25 @@ class dSv_player_item_c {
     void setRodTypeLevelUp(void);
     void setBaitItem(u8);
 
-   private:
+private:
     u8 mItems[24];
     u8 mItemSlots[24];
 };
 
 class dSv_player_get_item_c {
-   public:
+public:
     void init(void);
     void onFirstBit(u8);
     void offFirstBit(u8);
     int isFirstBit(u8) const;
 
-   private:
+private:
     u32 mPauseMenuBitFields[4];
     u8 padding[16];
 };
 
 class dSv_player_item_record_c {
-   public:
+public:
     void init(void);
     void setBombNum(u8, u8);
     u8 getBombNum(u8) const;
@@ -521,7 +495,7 @@ class dSv_player_item_record_c {
 
     void setBowAmount(u8 amount) { mBow = amount; }
 
-   private:
+private:
     u8 mBow;
     u8 mBombBags[3];
     u8 mBottles[4];
@@ -530,20 +504,20 @@ class dSv_player_item_record_c {
 };
 
 class dSv_player_item_max_c {
-   public:
+public:
     void init(void);
     void setBombNum(u8, u8);
     u8 getBombNum(u8) const;
 
     void setBowCapacity(u8 max) { mItemCapacities[0] = max; }
-    u8 getBowCapacity(){ return mItemCapacities[0];}
+    u8 getBowCapacity() { return mItemCapacities[0]; }
 
-   private:
+private:
     u8 mItemCapacities[8];
 };
 
 class dSv_player_collect_c {
-   public:
+public:
     void init(void);
     void setCollect(int, u8);
     BOOL isCollect(int, u8) const;
@@ -554,7 +528,7 @@ class dSv_player_collect_c {
 
     u8 getPoeCount() { return mPoeCount; }
 
-   private:
+private:
     u8 unk0[8];
     u8 unk8;
     u8 mCrystal;
@@ -565,59 +539,59 @@ class dSv_player_collect_c {
 };
 
 class dSv_player_wolf_c {
-   public:
+public:
     void init(void);
 
-   private:
+private:
     u8 unk0[3];
     u8 unk3;
 };
 
 class dSv_light_drop_c {
-   public:
+public:
     void init(void);
     void setLightDropNum(u8, u8);
     u8 getLightDropNum(u8) const;
     void onLightDropGetFlag(u8);
     BOOL isLightDropGetFlag(u8) const;
 
-   private:
+private:
     u8 mLightDropCounts[4];
     u8 mLightDropGetFlag;
     u8 unk5[3];
 };
 
 class dSv_letter_info_c {
-   public:
+public:
     void init(void);
     void onLetterGetFlag(int);
     BOOL isLetterGetFlag(int) const;
     void onLetterReadFlag(int);
     int isLetterReadFlag(int) const;
 
-   private:
+private:
     u32 mLetterGetBitfields[2];
     u32 mLetterReadBitfields[2];
     u8 unk16[64];
 };
 
 class dSv_fishing_info_c {
-   public:
+public:
     void init(void);
     void addFishCount(u8);  // merged with init in the assembly
 
-   private:
+private:
     u16 mFishCount[16];
     u8 unk32[16];
     u8 padding[4];
 };
 
 class dSv_player_info_c {
-   public:
+public:
     void init(void);
     char* getLinkName() { return (char*)link_name; }
 
-   private:
+private:
     u32 unk0;
     u32 unk4;
     u32 unk8;
@@ -634,7 +608,7 @@ class dSv_player_info_c {
 };
 
 class dSv_player_config_c {
-   public:
+public:
     void init(void);
     u32 checkVibration(void) const;
     u8 getSound(void);
@@ -642,7 +616,7 @@ class dSv_player_config_c {
     u8 getVibration(void);
     void setVibration(u8);
 
-   private:
+private:
     u8 unk0;
     u8 mSoundMode;
     u8 unk2;
@@ -658,7 +632,7 @@ class dSv_player_config_c {
 };
 
 class dSv_player_c {
-   public:
+public:
     void init(void);
     dSv_player_info_c& getPlayerInfo() { return mPlayerInfo; }
     dSv_player_status_a_c& getPlayerStatusA() { return player_status_a; }
@@ -672,7 +646,7 @@ class dSv_player_c {
     void setPlayerStatusAWalletLV(u8 lv) { player_status_a.setWalletLV(lv); }
     void setPlayerStatusAOil(u16 amount) { player_status_a.setLanternOil(amount); }
 
-   private:
+private:
     dSv_player_status_a_c player_status_a;
     dSv_player_status_b_c player_status_b;
     dSv_horse_place_c horse_place;
@@ -694,7 +668,7 @@ class dSv_player_c {
 
 #pragma pack(push, 1)
 class dSv_memBit_c {
-   public:
+public:
     void init(void);
     void onTbox(int);
     void offTbox(int);
@@ -708,11 +682,9 @@ class dSv_memBit_c {
     void onDungeonItem(int);
     bool isDungeonItem(int) const;
 
-    u8 getSmallKeys() {
-        return small_key_flags;
-    }
+    u8 getSmallKeys() { return small_key_flags; }
 
-   private:
+private:
     u32 area_flags_bitfields1[2];
     u32 area_flags_bitfields2[4];
     u32 rupee_flags_bitfields;
@@ -722,7 +694,7 @@ class dSv_memBit_c {
 #pragma pack(pop)
 
 class dSv_event_c {
-   public:
+public:
     void init(void);
     void onEventBit(u16);
     void offEventBit(u16);
@@ -730,15 +702,15 @@ class dSv_event_c {
     void setEventReg(u16, u8);
     u8 getEventReg(u16) const;
 
-   private:
+private:
     u8 events[256];
 };
 
 class dSv_MiniGame_c {
-   public:
+public:
     void init(void);
 
-   private:
+private:
     u8 unk0;
     u8 unk1[3];
     u32 unk4;
@@ -749,30 +721,30 @@ class dSv_MiniGame_c {
 };
 
 class dSv_memory_c {
-   public:
+public:
     dSv_memory_c(void);  // the assembly for this is in d_com_inf_game.s
     void init(void);
     dSv_memBit_c& getTempFlags() { return temp_flags; }
 
-   private:
+private:
     dSv_memBit_c temp_flags;
     u8 padding30[2];
 };
 
 class dSv_memory2_c {
-   public:
+public:
     dSv_memory2_c(void);  // the assembly for this is in d_com_inf_game.s
     void init(void);
     void onVisitedRoom(int);
     void offVisitedRoom(int);
     BOOL isVisitedRoom(int);
 
-   private:
+private:
     u32 unk0[2];
 };
 
 class dSv_danBit_c {
-   public:
+public:
     bool init(s8);
     void onSwitch(int);
     void offSwitch(int);
@@ -781,7 +753,7 @@ class dSv_danBit_c {
     void onItem(int);
     BOOL isItem(int) const;
 
-   private:
+private:
     s8 mStageNum;
     u8 unk1;
     u8 unk2[2];
@@ -791,7 +763,7 @@ class dSv_danBit_c {
 };
 
 class dSv_zoneBit_c {
-   public:
+public:
     void init(void);
     void clearRoomSwitch(void);
     void clearRoomItem(void);
@@ -808,7 +780,7 @@ class dSv_zoneBit_c {
     void onOneItem(int);
     BOOL isOneItem(int) const;
 
-   private:
+private:
     u16 switch_bitfield[2];
     u16 room_switch;
     u16 item_bitfield[2];
@@ -817,7 +789,7 @@ class dSv_zoneBit_c {
 };
 
 class dSv_zoneActor_c {
-   public:
+public:
     void init(void);
     void on(int);
     void off(int);
@@ -825,12 +797,12 @@ class dSv_zoneActor_c {
 
     static const int ACTOR_MAX = 0xFFFF;
 
-   private:
+private:
     u32 actor_bitfield[4];
 };
 
 class dSv_zone_c {
-   public:
+public:
     dSv_zone_c(void);  // the assembly for this is in d_com_inf_game.s
     void init(int);
     dSv_zoneBit_c& getZoneBit() { return zone_bit; }
@@ -838,7 +810,7 @@ class dSv_zone_c {
 
     s8& getUnk0() { return unk0; }
 
-   private:
+private:
     s8 unk0;
     u8 unk1;
     dSv_zoneBit_c zone_bit;
@@ -846,10 +818,10 @@ class dSv_zone_c {
 };
 
 class dSv_restart_c {
-   public:
+public:
     void setRoom(const cXyz&, s16, s8);
 
-   private:
+private:
     u8 unk0;
     u8 unk1[5];
     s16 mXRotation;
@@ -858,10 +830,10 @@ class dSv_restart_c {
 };
 
 class dSv_turnRestart_c {
-   public:
+public:
     void set(const cXyz&, s16, s8, u32);
 
-   private:
+private:
     cXyz mPosition;
     u32 unk12;
     s16 mXRotation;
@@ -869,13 +841,13 @@ class dSv_turnRestart_c {
 };
 
 class dSv_reserve_c {
-   public:
-   private:
+public:
+private:
     u8 unk[80];
 };
 
 class dSv_save_c {
-   public:
+public:
     void init(void);
     dSv_memory2_c* getSave2(int);
     dSv_player_c& getPlayer() { return player; }
@@ -888,7 +860,7 @@ class dSv_save_c {
 
     static const int STAGE_MAX = 4;
 
-   private:
+private:
     dSv_player_c player;
     dSv_memory_c area_flags[32];
     dSv_memory2_c unk_flags[64];
@@ -898,7 +870,7 @@ class dSv_save_c {
 };
 
 class dSv_info_c {
-   public:
+public:
     void init(void);
     void getSave(int);
     void putSave(int);
@@ -917,10 +889,10 @@ class dSv_info_c {
     void card_to_memory(char*, int);
     void initdata_to_card(char*, int);
 
-    dSv_save_c& getSaveFile(){ return save_file; }
-    dSv_memory_c& getMemory(){ return memory; }
+    dSv_save_c& getSaveFile() { return save_file; }
+    dSv_memory_c& getMemory() { return memory; }
 
-   private:
+private:
     dSv_save_c save_file;
     dSv_memory_c memory;
     dSv_danBit_c dungeon_bit;
diff --git a/include/d/d_save/d_save_HIO/d_save_HIO.h b/include/d/d_save/d_save_HIO/d_save_HIO.h
index 6779793b13..8d133e4af0 100644
--- a/include/d/d_save/d_save_HIO/d_save_HIO.h
+++ b/include/d/d_save/d_save_HIO/d_save_HIO.h
@@ -10,14 +10,14 @@ struct dSvBit_childSwPerfectionHIO_c_vtable {
 };
 
 class dSvBit_childSwPerfectionHIO_c {
-    public:
-     dSvBit_childSwPerfectionHIO_c();
-     void init(void);
-     ~dSvBit_childSwPerfectionHIO_c();
-     dSvBit_childSwPerfectionHIO_c_vtable* __vt;
+public:
+    dSvBit_childSwPerfectionHIO_c();
+    void init(void);
+    ~dSvBit_childSwPerfectionHIO_c();
+    dSvBit_childSwPerfectionHIO_c_vtable* __vt;
 
-    private:
-     u8 unk0[10];
+private:
+    u8 unk0[10];
 };
 
 #endif
\ No newline at end of file
diff --git a/include/dolphin/types.h b/include/dolphin/types.h
index ab7eff70c6..c7fac25145 100644
--- a/include/dolphin/types.h
+++ b/include/dolphin/types.h
@@ -1,30 +1,30 @@
 #ifndef __TYPES_H__
 #define __TYPES_H__
 
-typedef signed char         s8;
-typedef signed short        s16;
-typedef signed long         s32;
-typedef signed long long    s64;
-typedef unsigned char       u8;
-typedef unsigned short      u16;
-typedef unsigned long       u32;
-typedef unsigned long long  u64;
+typedef signed char s8;
+typedef signed short s16;
+typedef signed long s32;
+typedef signed long long s64;
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef unsigned long u32;
+typedef unsigned long long u64;
 
-typedef volatile u8         vu8;
-typedef volatile u16        vu16;
-typedef volatile u32        vu32;
-typedef volatile u64        vu64;
-typedef volatile s8         vs8;
-typedef volatile s16        vs16;
-typedef volatile s32        vs32;
-typedef volatile s64        vs64;
+typedef volatile u8 vu8;
+typedef volatile u16 vu16;
+typedef volatile u32 vu32;
+typedef volatile u64 vu64;
+typedef volatile s8 vs8;
+typedef volatile s16 vs16;
+typedef volatile s32 vs32;
+typedef volatile s64 vs64;
 
-typedef float               f32;
-typedef double              f64;
-typedef volatile f32        vf32;
-typedef volatile f64        vf64;
+typedef float f32;
+typedef double f64;
+typedef volatile f32 vf32;
+typedef volatile f64 vf64;
 
-typedef int                 BOOL;
+typedef int BOOL;
 
 #define TRUE 1
 #define FALSE 0
diff --git a/include/dvd/dvd.h b/include/dvd/dvd.h
index f5563d5430..c85048ed7d 100644
--- a/include/dvd/dvd.h
+++ b/include/dvd/dvd.h
@@ -4,41 +4,39 @@
 extern "C" {
 
 typedef enum DVDState {
-    DVD_STATE_END           = 0x0,
-    DVD_STATE_BUSY          = 0x1,
-    DVD_STATE_WAITING       = 0x2,
-    DVD_STATE_COVER_CLOSED  = 0x3,
-    DVD_STATE_NO_DISK       = 0x4,
-    DVD_STATE_COVER_OPEN    = 0x5,
-    DVD_STATE_WRONG_DISK    = 0x6,
+    DVD_STATE_END = 0x0,
+    DVD_STATE_BUSY = 0x1,
+    DVD_STATE_WAITING = 0x2,
+    DVD_STATE_COVER_CLOSED = 0x3,
+    DVD_STATE_NO_DISK = 0x4,
+    DVD_STATE_COVER_OPEN = 0x5,
+    DVD_STATE_WRONG_DISK = 0x6,
     DVD_STATE_MOTOR_STOPPED = 0x7,
-    DVD_STATE_IGNORED       = 0x8,
-    DVD_STATE_CANCELED      = 0xa, // lmao they skipped 9
-    DVD_STATE_RETRY         = 0xb,
-    DVD_STATE_FATAL_ERROR   = -1,
+    DVD_STATE_IGNORED = 0x8,
+    DVD_STATE_CANCELED = 0xa,  // lmao they skipped 9
+    DVD_STATE_RETRY = 0xb,
+    DVD_STATE_FATAL_ERROR = -1,
     __DVD_STATE_ENUM_FORCE_S32 = INT32_MAX,
 } DVDState;
 }
 
 class DVDFileInfo;
 extern "C" {
-    s32 DVDOpen(const char*, u8[48]);
-    s32 DVDClose(u8[48]);
-    void DVDReadPrio(void);
-    void DVDGetCurrentDiskID(void);
-    s32 DVDFastOpen(long, u8[48]);
-    int DVDGetCommandBlockStatus(u8[48]);
-    s32 DVDReadAsyncPrio(u8[48], void*, long, long, void(*)(long,DVDFileInfo*), long);
-    void DVDConvertPathToEntrynum(void);
-    DVDState DVDGetDriveStatus(void);
-    s32 DVDCheckDisk(void);
-
-    void DVDChangeDir(void);
-    void DVDCloseDir(void);
-    void DVDOpenDir(void);
-    void DVDReadDir(void);
+s32 DVDOpen(const char*, u8[48]);
+s32 DVDClose(u8[48]);
+void DVDReadPrio(void);
+void DVDGetCurrentDiskID(void);
+s32 DVDFastOpen(long, u8[48]);
+int DVDGetCommandBlockStatus(u8[48]);
+s32 DVDReadAsyncPrio(u8[48], void*, long, long, void (*)(long, DVDFileInfo*), long);
+void DVDConvertPathToEntrynum(void);
+DVDState DVDGetDriveStatus(void);
+s32 DVDCheckDisk(void);
 
+void DVDChangeDir(void);
+void DVDCloseDir(void);
+void DVDOpenDir(void);
+void DVDReadDir(void);
 }
 
-
 #endif
\ No newline at end of file
diff --git a/include/f/f_op/f_op_actor.h b/include/f/f_op/f_op_actor.h
index f1820b1018..ad72869201 100644
--- a/include/f/f_op/f_op_actor.h
+++ b/include/f/f_op/f_op_actor.h
@@ -1,8 +1,6 @@
 #ifndef F_OP_ACTOR_H_
 #define F_OP_ACTOR_H_
 
-class fopAc_ac_c{
-
-};
+class fopAc_ac_c {};
 
 #endif
\ No newline at end of file
diff --git a/include/f/f_op/f_op_actor_tag.h b/include/f/f_op/f_op_actor_tag.h
index 335b9284c9..1a52a62aed 100644
--- a/include/f/f_op/f_op_actor_tag.h
+++ b/include/f/f_op/f_op_actor_tag.h
@@ -1,15 +1,14 @@
 #ifndef F_OP_ACTOR_TAG_H
 #define F_OP_ACTOR_TAG_H
 
-#include "global.h"
 #include "SComponent/c_tag.h"
+#include "global.h"
 
 extern "C" {
 
 u32 fopAcTg_ToActorQ(create_tag_class* c);
 u32 fopAcTg_ActorQTo(create_tag_class* c);
 u32 fopAcTg_Init(create_tag_class* c, void* data);
-
 }
 
 #endif
\ No newline at end of file
diff --git a/include/f/f_pc/f_pc_base.h b/include/f/f_pc/f_pc_base.h
index f3fe09b97c..c1d93676ca 100644
--- a/include/f/f_pc/f_pc_base.h
+++ b/include/f/f_pc/f_pc_base.h
@@ -2,12 +2,12 @@
 #ifndef F_PC_BASE_H
 #define F_PC_BASE_H
 
-#include "global.h"
 #include "SComponent/c_tag.h"
-#include "f/f_pc/f_pc_line_tag.h"
-#include "f/f_pc/f_pc_layer_tag.h"
 #include "f/f_pc/f_pc_delete_tag.h"
+#include "f/f_pc/f_pc_layer_tag.h"
+#include "f/f_pc/f_pc_line_tag.h"
 #include "f/f_pc/f_pc_priority.h"
+#include "global.h"
 
 struct create_request;
 struct profile_method_class;
@@ -21,14 +21,14 @@ struct base_process_class {
     s8 mInitState;
     u8 mUnk2;
     s16 mBsTypeId;
-    void *mpProf;
-    create_request *mpCtRq;
+    void* mpProf;
+    create_request* mpCtRq;
     layer_management_tag_class mLyTg;
     line_tag mLnTg;
     delete_tag_class mDtTg;
     process_priority_class mPi;
-    profile_method_class *mpPcMtd;
-    void *mpUserData;
+    profile_method_class* mpPcMtd;
+    void* mpUserData;
     u32 mParameters;
     u32 mSubType;
 };
@@ -36,8 +36,7 @@ struct base_process_class {
 extern "C" {
 
 int fpcBs_Is_JustOfType(int a, int b);
-int fpcBs_Execute(base_process_class *pProc);
-
+int fpcBs_Execute(base_process_class* pProc);
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_create_iter.h b/include/f/f_pc/f_pc_create_iter.h
index 58f3a998a8..7a767d7236 100644
--- a/include/f/f_pc/f_pc_create_iter.h
+++ b/include/f/f_pc/f_pc_create_iter.h
@@ -6,9 +6,8 @@
 
 extern "C" {
 
-int fpcCtIt_Method(cNdIt_MethodFunc pJudge, void *pUserData);
-void * fpcCtIt_Judge(cNdIt_JudgeFunc pJudge, void *pUserData);
-
+int fpcCtIt_Method(cNdIt_MethodFunc pJudge, void* pUserData);
+void* fpcCtIt_Judge(cNdIt_JudgeFunc pJudge, void* pUserData);
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_create_req.h b/include/f/f_pc/f_pc_create_req.h
index 289b10123f..a30e4c31c1 100644
--- a/include/f/f_pc/f_pc_create_req.h
+++ b/include/f/f_pc/f_pc_create_req.h
@@ -2,12 +2,12 @@
 #ifndef F_PC_CREATE_REQ_H
 #define F_PC_CREATE_REQ_H
 
-#include "global.h"
 #include "SComponent/c_phase.h"
 #include "SComponent/c_tag.h"
 #include "f/f_pc/f_pc_create_tag.h"
 #include "f/f_pc/f_pc_method.h"
 #include "f/f_pc/f_pc_method_tag.h"
+#include "global.h"
 
 struct base_process_class;
 struct layer_class;
@@ -22,25 +22,25 @@ struct create_request : public create_tag {
     s8 mbIsCreating;
     s8 mbIsCancelling;
     process_method_tag_class mMtdTg;
-    create_request_method_class *mpCtRqMtd;
-    void *mpUnk1;
+    create_request_method_class* mpCtRqMtd;
+    void* mpUnk1;
     int mBsPcId;
-    base_process_class *mpRes;
-    layer_class *mpLayer;
+    base_process_class* mpRes;
+    layer_class* mpLayer;
 };
 
 extern "C" {
 
-bool fpcCtRq_isCreatingByID(create_tag *pTag, int *pId);
+bool fpcCtRq_isCreatingByID(create_tag* pTag, int* pId);
 bool fpcCtRq_IsCreatingByID(unsigned int id);
-void fpcCtRq_CreateQTo(create_request *pReq);
-void fpcCtRq_ToCreateQ(create_request *pReq);
-bool fpcCtRq_Delete(create_request *pReq);
-bool fpcCtRq_Cancel(create_request *pReq);
-int fpcCtRq_IsDoing(create_request *pReq);
+void fpcCtRq_CreateQTo(create_request* pReq);
+void fpcCtRq_ToCreateQ(create_request* pReq);
+bool fpcCtRq_Delete(create_request* pReq);
+bool fpcCtRq_Cancel(create_request* pReq);
+int fpcCtRq_IsDoing(create_request* pReq);
 void fpcCtRq_Handler(void);
-create_request * fpcCtRq_Create(layer_class *pLayer, unsigned long size, create_request_method_class *pCtRqMtd);
-
+create_request* fpcCtRq_Create(layer_class* pLayer, unsigned long size,
+                               create_request_method_class* pCtRqMtd);
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_create_tag.h b/include/f/f_pc/f_pc_create_tag.h
index d851f02094..3163c767c8 100644
--- a/include/f/f_pc/f_pc_create_tag.h
+++ b/include/f/f_pc/f_pc_create_tag.h
@@ -2,18 +2,16 @@
 #ifndef F_PC_CREATE_TAG_H
 #define F_PC_CREATE_TAG_H
 
-#include "global.h"
 #include "SComponent/c_tag.h"
+#include "global.h"
 
-struct create_tag : public create_tag_class {
-};
+struct create_tag : public create_tag_class {};
 
 extern "C" {
 
-void fpcCtTg_ToCreateQ(create_tag_class *pTag);
-void fpcCtTg_CreateQTo(create_tag_class *pTag);
-int fpcCtTg_Init(create_tag *pTag, void *pUserData);
-
+void fpcCtTg_ToCreateQ(create_tag_class* pTag);
+void fpcCtTg_CreateQTo(create_tag_class* pTag);
+int fpcCtTg_Init(create_tag* pTag, void* pUserData);
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_creator.h b/include/f/f_pc/f_pc_creator.h
index 8a0a171b85..276b2e0ccd 100644
--- a/include/f/f_pc/f_pc_creator.h
+++ b/include/f/f_pc/f_pc_creator.h
@@ -9,10 +9,9 @@ struct base_process_class;
 extern "C" {
 
 bool fpcCt_IsCreatingByID(unsigned int id);
-int fpcCt_IsDoing(base_process_class *pProc);
-void fpcCt_Abort(base_process_class *pProc);
+int fpcCt_IsDoing(base_process_class* pProc);
+void fpcCt_Abort(base_process_class* pProc);
 void fpcCt_Handler(void);
-
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_delete_tag.h b/include/f/f_pc/f_pc_delete_tag.h
index 767a8e5cb9..72ccb5341b 100644
--- a/include/f/f_pc/f_pc_delete_tag.h
+++ b/include/f/f_pc/f_pc_delete_tag.h
@@ -2,26 +2,25 @@
 #ifndef F_PC_DELETE_TAG_H
 #define F_PC_DELETE_TAG_H
 
-#include "global.h"
 #include "SComponent/c_tag.h"
+#include "global.h"
 
 struct layer_class;
 
 typedef int (*delete_tag_func)(void*);
 
 struct delete_tag_class : public create_tag_class {
-    layer_class *mpLayer;
+    layer_class* mpLayer;
     s16 mTimer;
 };
 
 extern "C" {
 
-bool fpcDtTg_IsEmpty(delete_tag_class *pTag);
-void fpcDtTg_ToDeleteQ(delete_tag_class *pTag);
-void fpcDtTg_DeleteQTo(delete_tag_class *pTag);
-int fpcDtTg_Do(delete_tag_class *pTag, delete_tag_func pFunc);
-int fpcDtTg_Init(delete_tag_class *pTag, void *pUserData);
-
+bool fpcDtTg_IsEmpty(delete_tag_class* pTag);
+void fpcDtTg_ToDeleteQ(delete_tag_class* pTag);
+void fpcDtTg_DeleteQTo(delete_tag_class* pTag);
+int fpcDtTg_Do(delete_tag_class* pTag, delete_tag_func pFunc);
+int fpcDtTg_Init(delete_tag_class* pTag, void* pUserData);
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_deletor.h b/include/f/f_pc/f_pc_deletor.h
index 90cf677220..9e22a82d35 100644
--- a/include/f/f_pc/f_pc_deletor.h
+++ b/include/f/f_pc/f_pc_deletor.h
@@ -9,11 +9,10 @@ struct base_process_class;
 extern "C" {
 
 bool fpcDt_IsComplete(void);
-int fpcDt_ToDeleteQ(base_process_class *pProc);
-int fpcDt_ToQueue(base_process_class *pProc);
+int fpcDt_ToDeleteQ(base_process_class* pProc);
+int fpcDt_ToQueue(base_process_class* pProc);
 void fpcDt_Handler(void);
-int fpcDt_Delete(base_process_class *pProc);
-
+int fpcDt_Delete(base_process_class* pProc);
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_draw_priority.h b/include/f/f_pc/f_pc_draw_priority.h
index fab5b3e711..914231e85f 100644
--- a/include/f/f_pc/f_pc_draw_priority.h
+++ b/include/f/f_pc/f_pc_draw_priority.h
@@ -8,10 +8,9 @@ struct draw_priority_class {
 
 extern "C" {
 
-int fpcDwPi_Get(draw_priority_class *pDwPi);
-void fpcDwPi_Set(draw_priority_class *pDwPi, int p);
-void fpcDwPi_Init(draw_priority_class *pDwPi, int p);
-
+int fpcDwPi_Get(draw_priority_class* pDwPi);
+void fpcDwPi_Set(draw_priority_class* pDwPi, int p);
+void fpcDwPi_Init(draw_priority_class* pDwPi, int p);
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_executor.h b/include/f/f_pc/f_pc_executor.h
index ffffa1b3dd..c7fcb5a27e 100644
--- a/include/f/f_pc/f_pc_executor.h
+++ b/include/f/f_pc/f_pc_executor.h
@@ -8,11 +8,10 @@ struct base_process_class;
 
 extern "C" {
 
-int fpcEx_ToLineQ(base_process_class *pProc);
-int fpcEx_ExecuteQTo(base_process_class *pProc);
-int fpcEx_ToExecuteQ(base_process_class *pProc);
+int fpcEx_ToLineQ(base_process_class* pProc);
+int fpcEx_ExecuteQTo(base_process_class* pProc);
+int fpcEx_ToExecuteQ(base_process_class* pProc);
 void fpcEx_Handler(cNdIt_MethodFunc pFunc);
-
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_layer.h b/include/f/f_pc/f_pc_layer.h
index 69b0bf6675..a1d16459e3 100644
--- a/include/f/f_pc/f_pc_layer.h
+++ b/include/f/f_pc/f_pc_layer.h
@@ -2,53 +2,55 @@
 #ifndef F_PC_LAYER_H
 #define F_PC_LAYER_H
 
-#include "global.h"
 #include "SComponent/c_node.h"
-#include "SComponent/c_tree.h"
 #include "SComponent/c_tag.h"
+#include "SComponent/c_tree.h"
+#include "global.h"
 
 struct process_method_tag_class;
 struct process_node_class;
 
 struct layer_class {
-    node_class mNode; // generates different asm for struct copy if using inheritance
+    node_class mNode;  // generates different asm for struct copy if using inheritance
     u32 mLayerID;
     node_lists_tree_class mNodeListTree;
-    process_node_class *mpPcNode;
+    process_node_class* mpPcNode;
     node_list_class mCancelList;
-    s32 mCreatingCount:16;// for some reason, the compiler only optimized these into a single word load/store instead of 2 halfword load/store, but only if they are written like this
-    s32 mDeletingCount:16;
+    s32 mCreatingCount : 16;  // for some reason, the compiler only optimized these into a single
+                              // word load/store instead of 2 halfword load/store, but only if they
+                              // are written like this
+    s32 mDeletingCount : 16;
 };
 
 extern "C" {
 
-void fpcLy_SetCurrentLayer(layer_class *pLayer);
-layer_class * fpcLy_CurrentLayer(void);
-layer_class * fpcLy_RootLayer(void);
-layer_class * fpcLy_Layer(unsigned int id);
-layer_class * fpcLy_Search(unsigned int id);
-void fpcLy_Regist(layer_class *pLayer);
+void fpcLy_SetCurrentLayer(layer_class* pLayer);
+layer_class* fpcLy_CurrentLayer(void);
+layer_class* fpcLy_RootLayer(void);
+layer_class* fpcLy_Layer(unsigned int id);
+layer_class* fpcLy_Search(unsigned int id);
+void fpcLy_Regist(layer_class* pLayer);
 
-void fpcLy_CreatedMesg(layer_class *pLayer);
-void fpcLy_CreatingMesg(layer_class *pLayer);
-void fpcLy_DeletedMesg(layer_class *pLayer);
-void fpcLy_DeletingMesg(layer_class *pLayer);
-bool fpcLy_IsCreatingMesg(layer_class *pLayer);
-bool fpcLy_IsDeletingMesg(layer_class *pLayer);
+void fpcLy_CreatedMesg(layer_class* pLayer);
+void fpcLy_CreatingMesg(layer_class* pLayer);
+void fpcLy_DeletedMesg(layer_class* pLayer);
+void fpcLy_DeletingMesg(layer_class* pLayer);
+bool fpcLy_IsCreatingMesg(layer_class* pLayer);
+bool fpcLy_IsDeletingMesg(layer_class* pLayer);
 
-int fpcLy_IntoQueue(layer_class *pLayer, int treeListIdx, create_tag_class *pTag, int idx);
-int fpcLy_ToQueue(layer_class *pLayer, int treeListIdx, create_tag_class *pTag);
-int fpcLy_QueueTo(layer_class *pLayer, create_tag_class *pTag);
+int fpcLy_IntoQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag, int idx);
+int fpcLy_ToQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag);
+int fpcLy_QueueTo(layer_class* pLayer, create_tag_class* pTag);
 
-void fpcLy_Cancel(layer_class *pLayer);
-bool fpcLy_CancelMethod(process_method_tag_class *pLayer);
+void fpcLy_Cancel(layer_class* pLayer);
+bool fpcLy_CancelMethod(process_method_tag_class* pLayer);
 
-void fpcLy_CancelQTo(process_method_tag_class *pMthd);
-int fpcLy_ToCancelQ(layer_class *pLayer, process_method_tag_class *pMthd);
-
-void fpcLy_Create(layer_class *pLayer, process_node_class *pPcNode, node_list_class *pLists, int listNum);
-int fpcLy_Delete(layer_class *pLayer);
+void fpcLy_CancelQTo(process_method_tag_class* pMthd);
+int fpcLy_ToCancelQ(layer_class* pLayer, process_method_tag_class* pMthd);
 
+void fpcLy_Create(layer_class* pLayer, process_node_class* pPcNode, node_list_class* pLists,
+                  int listNum);
+int fpcLy_Delete(layer_class* pLayer);
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_layer_iter.h b/include/f/f_pc/f_pc_layer_iter.h
index f8cdeeade2..99cbe2cdc9 100644
--- a/include/f/f_pc/f_pc_layer_iter.h
+++ b/include/f/f_pc/f_pc_layer_iter.h
@@ -1,9 +1,9 @@
 #ifndef F_PC_LAYER_ITER_H
 #define F_PC_LAYER_ITER_H
 
-#include "global.h"
-#include "f/f_pc/f_pc_layer.h"
 #include "SComponent/c_node_iter.h"
+#include "f/f_pc/f_pc_layer.h"
+#include "global.h"
 
 struct layer_iter {
     void* mpFunc;
@@ -12,11 +12,10 @@ struct layer_iter {
 
 extern "C" {
 
-int fpcLyIt_OnlyHere(layer_class *pLayer, cNdIt_MethodFunc pFunc, void *pUserData);
-int fpcLyIt_OnlyHereLY(layer_class *pLayer, cNdIt_MethodFunc pFunc, void *pUserData);
-void * fpcLyIt_Judge(layer_class *pLayer, cNdIt_MethodFunc pFunc, void *pUserData);
-void * fpcLyIt_AllJudge(cNdIt_MethodFunc pFunc, void *pUserData);
-
+int fpcLyIt_OnlyHere(layer_class* pLayer, cNdIt_MethodFunc pFunc, void* pUserData);
+int fpcLyIt_OnlyHereLY(layer_class* pLayer, cNdIt_MethodFunc pFunc, void* pUserData);
+void* fpcLyIt_Judge(layer_class* pLayer, cNdIt_MethodFunc pFunc, void* pUserData);
+void* fpcLyIt_AllJudge(cNdIt_MethodFunc pFunc, void* pUserData);
 }
 
 #endif
\ No newline at end of file
diff --git a/include/f/f_pc/f_pc_layer_tag.h b/include/f/f_pc/f_pc_layer_tag.h
index e44fbbf53c..33f7414190 100644
--- a/include/f/f_pc/f_pc_layer_tag.h
+++ b/include/f/f_pc/f_pc_layer_tag.h
@@ -2,25 +2,24 @@
 #ifndef F_PC_LAYER_TAG_H
 #define F_PC_LAYER_TAG_H
 
-#include "global.h"
 #include "SComponent/c_tag.h"
+#include "global.h"
 
 struct layer_class;
 
 struct layer_management_tag_class {
     create_tag_class mCreateTag;
-    layer_class *mpLayer;
+    layer_class* mpLayer;
     u16 mNodeListID;
     u16 mNodeListIdx;
 };
 
 extern "C" {
 
-s32 fpcLyTg_QueueTo(layer_management_tag_class *pTag);
-s32 fpcLyTg_ToQueue(layer_management_tag_class *pTag, u32 layerID, u16 listID, u16 listPrio);
-s32 fpcLyTg_Move(layer_management_tag_class *, u32, u16, u16);
-s32 fpcLyTg_Init(layer_management_tag_class *, u32, void *);
-
+s32 fpcLyTg_QueueTo(layer_management_tag_class* pTag);
+s32 fpcLyTg_ToQueue(layer_management_tag_class* pTag, u32 layerID, u16 listID, u16 listPrio);
+s32 fpcLyTg_Move(layer_management_tag_class*, u32, u16, u16);
+s32 fpcLyTg_Init(layer_management_tag_class*, u32, void*);
 }
 
 #endif
diff --git a/include/f/f_pc/f_pc_leaf.h b/include/f/f_pc/f_pc_leaf.h
index 5d31ecf2cb..94b92e4190 100644
--- a/include/f/f_pc/f_pc_leaf.h
+++ b/include/f/f_pc/f_pc_leaf.h
@@ -11,7 +11,7 @@ struct leafdraw_method_class : public process_method_class {
 };
 
 struct leafdraw_class : public base_process_class {
-    leafdraw_method_class *mpDrawMtd;
+    leafdraw_method_class* mpDrawMtd;
     u8 mbUnk0;
     u8 mbUnk1;
     draw_priority_class mDwPi;
@@ -19,10 +19,9 @@ struct leafdraw_class : public base_process_class {
 
 extern "C" {
 
-int fpcLf_GetPriority(leafdraw_class *pLeaf);
-int fpcLf_DrawMethod(leafdraw_method_class *pMthd, void *pUserData);
-int fpcLf_Draw(leafdraw_class *pMthd);
-
+int fpcLf_GetPriority(leafdraw_class* pLeaf);
+int fpcLf_DrawMethod(leafdraw_method_class* pMthd, void* pUserData);
+int fpcLf_Draw(leafdraw_class* pMthd);
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_line_iter.h b/include/f/f_pc/f_pc_line_iter.h
index 1373bb3217..5fe61af256 100644
--- a/include/f/f_pc/f_pc_line_iter.h
+++ b/include/f/f_pc/f_pc_line_iter.h
@@ -7,7 +7,6 @@
 extern "C" {
 
 void fpcLnIt_Queue(cNdIt_MethodFunc pFunc);
-
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_line_tag.h b/include/f/f_pc/f_pc_line_tag.h
index 8ee5d49e85..ef4614de62 100644
--- a/include/f/f_pc/f_pc_line_tag.h
+++ b/include/f/f_pc/f_pc_line_tag.h
@@ -10,11 +10,10 @@ struct line_tag : public create_tag_class {
 
 extern "C" {
 
-int fpcLnTg_Move(line_tag *pLineTag, int newLineListID);
-void fpcLnTg_QueueTo(line_tag *pLineTag);
-int fpcLnTg_ToQueue(line_tag *pLineTag, int lineListID);
-void fpcLnTg_Init(line_tag *pLineTag, void *pData);
-
+int fpcLnTg_Move(line_tag* pLineTag, int newLineListID);
+void fpcLnTg_QueueTo(line_tag* pLineTag);
+int fpcLnTg_ToQueue(line_tag* pLineTag, int lineListID);
+void fpcLnTg_Init(line_tag* pLineTag, void* pData);
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_load.h b/include/f/f_pc/f_pc_load.h
index 8989ff6a01..62e04f7c7c 100644
--- a/include/f/f_pc/f_pc_load.h
+++ b/include/f/f_pc/f_pc_load.h
@@ -10,7 +10,6 @@ bool fpcLd_Use(u16 procName);
 int fpcLd_IsLoaded(u16 procName);
 void fpcLd_Free(u16 procName);
 int fpcLd_Load(u16 procName);
-
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_method.h b/include/f/f_pc/f_pc_method.h
index 6ff4ab121c..ec2f4c90b0 100644
--- a/include/f/f_pc/f_pc_method.h
+++ b/include/f/f_pc/f_pc_method.h
@@ -2,7 +2,7 @@
 #ifndef F_PC_METHOD_H
 #define F_PC_METHOD_H
 
-typedef int (*process_method_func)(void *);
+typedef int (*process_method_func)(void*);
 
 struct process_method_class {
     process_method_func mpCreateFunc;
@@ -13,12 +13,11 @@ struct process_method_class {
 
 extern "C" {
 
-int fpcMtd_Method(process_method_func pFunc, void *pUserData);
-int fpcMtd_Execute(process_method_class *pMthd, void *pUserData);
-int fpcMtd_IsDelete(process_method_class *pMthd, void *pUserData);
-int fpcMtd_Delete(process_method_class *pMthd, void *pUserData);
-int fpcMtd_Create(process_method_class *pMthd, void *pUserData);
-
+int fpcMtd_Method(process_method_func pFunc, void* pUserData);
+int fpcMtd_Execute(process_method_class* pMthd, void* pUserData);
+int fpcMtd_IsDelete(process_method_class* pMthd, void* pUserData);
+int fpcMtd_Delete(process_method_class* pMthd, void* pUserData);
+int fpcMtd_Create(process_method_class* pMthd, void* pUserData);
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_method_iter.h b/include/f/f_pc/f_pc_method_iter.h
index 4cabf574da..8fa13a3c48 100644
--- a/include/f/f_pc/f_pc_method_iter.h
+++ b/include/f/f_pc/f_pc_method_iter.h
@@ -6,8 +6,7 @@
 
 extern "C" {
 
-void fpcMtdIt_Method(node_list_class *pList, cNdIt_MethodFunc pMethod);
-
+void fpcMtdIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod);
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_method_tag.h b/include/f/f_pc/f_pc_method_tag.h
index f97c3ddce3..61d927b606 100644
--- a/include/f/f_pc/f_pc_method_tag.h
+++ b/include/f/f_pc/f_pc_method_tag.h
@@ -4,20 +4,19 @@
 
 #include "SComponent/c_tag.h"
 
-typedef int (*process_method_tag_func)(void *);
+typedef int (*process_method_tag_func)(void*);
 
 struct process_method_tag_class : public create_tag_class {
     process_method_tag_func mpFunc;
-    void *mpMthdData;
+    void* mpMthdData;
 };
 
 extern "C" {
 
-int fpcMtdTg_Do(process_method_tag_class *pMthd);
-int fpcMtdTg_ToMethodQ(node_list_class *pList, process_method_tag_class *pMthd);
-void fpcMtdTg_MethodQTo(process_method_tag_class *pMthd);
-int fpcMtdTg_Init(process_method_tag_class *pMthd, process_method_tag_func pFunc, void *pMthdData);
-
+int fpcMtdTg_Do(process_method_tag_class* pMthd);
+int fpcMtdTg_ToMethodQ(node_list_class* pList, process_method_tag_class* pMthd);
+void fpcMtdTg_MethodQTo(process_method_tag_class* pMthd);
+int fpcMtdTg_Init(process_method_tag_class* pMthd, process_method_tag_func pFunc, void* pMthdData);
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_node.h b/include/f/f_pc/f_pc_node.h
index 9c840127a5..c2cfac60fa 100644
--- a/include/f/f_pc/f_pc_node.h
+++ b/include/f/f_pc/f_pc_node.h
@@ -3,11 +3,11 @@
 #define F_PC_NODE_H
 
 #include "f/f_pc/f_pc_base.h"
-#include "f/f_pc/f_pc_method.h"
 #include "f/f_pc/f_pc_layer.h"
+#include "f/f_pc/f_pc_method.h"
 
 struct process_node_class : public base_process_class {
-    process_method_class *mpNodeMtd;
+    process_method_class* mpNodeMtd;
     layer_class mLayer;
     node_list_class mLayerNodeLists[16];
     u8 mUnk0;
@@ -15,9 +15,8 @@ struct process_node_class : public base_process_class {
 
 extern "C" {
 
-int fpcNd_Create(process_node_class *pNode);
+int fpcNd_Create(process_node_class* pNode);
 bool fpcNd_IsDeleteTiming(void);
-
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_pause.h b/include/f/f_pc/f_pc_pause.h
index 57e1950151..09a47a84f0 100644
--- a/include/f/f_pc/f_pc_pause.h
+++ b/include/f/f_pc/f_pc_pause.h
@@ -6,11 +6,10 @@
 
 extern "C" {
 
-bool fpcPause_IsEnable(void *pProcess, u8 flag);
-int fpcPause_Enable(void *pProcess, u8 flag);
-int fpcPause_Disable(void *pProcess, u32 flag);
-void fpcPause_Init(void *pProcess);
-
+bool fpcPause_IsEnable(void* pProcess, u8 flag);
+int fpcPause_Enable(void* pProcess, u8 flag);
+int fpcPause_Disable(void* pProcess, u32 flag);
+void fpcPause_Init(void* pProcess);
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_priority.h b/include/f/f_pc/f_pc_priority.h
index 8114503719..530e979090 100644
--- a/include/f/f_pc/f_pc_priority.h
+++ b/include/f/f_pc/f_pc_priority.h
@@ -2,9 +2,9 @@
 #ifndef F_PC_PRIORITY_H
 #define F_PC_PRIORITY_H
 
-#include "global.h"
 #include "SComponent/c_tag.h"
 #include "f/f_pc/f_pc_method_tag.h"
+#include "global.h"
 
 struct process_priority_queue_info {
     u32 mLayer;
@@ -20,16 +20,17 @@ struct process_priority_class : public create_tag_class {
 
 extern "C" {
 
-int fpcPi_IsInQueue(process_priority_class *pPi);
-int fpcPi_QueueTo(process_priority_class *pPi);
-int fpcPi_ToQueue(process_priority_class *pPi);
-process_priority_class * fpcPi_GetFromQueue(void);
-int fpcPi_Delete(process_priority_class *pPi);
+int fpcPi_IsInQueue(process_priority_class* pPi);
+int fpcPi_QueueTo(process_priority_class* pPi);
+int fpcPi_ToQueue(process_priority_class* pPi);
+process_priority_class* fpcPi_GetFromQueue(void);
+int fpcPi_Delete(process_priority_class* pPi);
 int fpcPi_IsNormal(unsigned int layer, unsigned short listID, unsigned short priority);
-int fpcPi_Change(process_priority_class *pPi, unsigned int layer, unsigned short listID, unsigned short priority);
+int fpcPi_Change(process_priority_class* pPi, unsigned int layer, unsigned short listID,
+                 unsigned short priority);
 int fpcPi_Handler(void);
-int fpcPi_Init(process_priority_class *pPi, void *pUserData, unsigned int layer, unsigned short listID, unsigned short priority);
-
+int fpcPi_Init(process_priority_class* pPi, void* pUserData, unsigned int layer,
+               unsigned short listID, unsigned short priority);
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_profile.h b/include/f/f_pc/f_pc_profile.h
index da105bf003..9283a803c4 100644
--- a/include/f/f_pc/f_pc_profile.h
+++ b/include/f/f_pc/f_pc_profile.h
@@ -6,8 +6,7 @@
 
 extern "C" {
 
-void * fpcPf_Get(s16 profileID);
-
+void* fpcPf_Get(s16 profileID);
 };
 
 #endif
diff --git a/include/f/f_pc/f_pc_searcher.h b/include/f/f_pc/f_pc_searcher.h
index 2362b90244..bdefebe4c2 100644
--- a/include/f/f_pc/f_pc_searcher.h
+++ b/include/f/f_pc/f_pc_searcher.h
@@ -8,9 +8,8 @@ struct base_process_class;
 
 extern "C" {
 
-void * fpcSch_JudgeForPName(base_process_class *pProc, void *pUserData);
-void * fpcSch_JudgeByID(base_process_class *pProc, void *pUserData);
-
+void* fpcSch_JudgeForPName(base_process_class* pProc, void* pUserData);
+void* fpcSch_JudgeByID(base_process_class* pProc, void* pUserData);
 };
 
 #endif
diff --git a/include/functions.h b/include/functions.h
index 43109edd73..35272e3b79 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -1,338 +1,337 @@
 #include "os/OS.h"
 
-extern "C" { 
-    void J2DScreen_NS_draw(void);
-    void PSMTXCopy(void);
-    void PSMTXConcat(void);
-    void PSMTXScale(void);
-    void screenSet__12dFile_info_cFv(void);
-    void dFile_info_c_NS_screenSet(void);
-    void mDoExt_removeMesgFont(void);
-    void func_80362210(void);
-    void JKRAramHeap_NS_getTotalFreeSize(void);
-    void JKRAramHeap_NS_getFreeSize(void);
-    void heapDisplay__9HeapCheckCFv(void);
-    void func_803621C4(void);
-    void init__20dSv_player_collect_cFv(void);
-    void dComIfGp_setSelectItem(int);
-    void getUsedCount__9HeapCheckCFv(void);
-    void isEventBit__11dSv_event_cCFUs(void);
-    void dComIfGs_setMixItemIndex(void);
-    void dComIfGs_setSelectItemIndex(void);
-    void dComIfGs_getMixItemIndex(void);
-    char* strcpy(char*,const char*);
-    int strcmp(char*,char*);
-    void setBombNum__21dSv_player_item_max_cFUcUc(void);
-    void func_80362224(void);
-    void func_803621D8(void);
-    void func_803621CC(void);
-    void func_80362218(void);
-    void _restgpr_26(void);
-    void _savegpr_26(void);
-    void func_8036221C(void);
-    void func_803621D0(void);
-    void func_803620AC(void);
-    void func_803626BC(void);
-    void func_803664DC(void);
-    void _restgpr_29(void);
-    void _savegpr_29(void);
-    void _restgpr_28(void);
-    void _savegpr_28(void);
-    void _restgpr_27(void);
-    void _savegpr_27(void);
-    void _savegpr_26(void);
-    void _restgpr_26(void);
-    void JKRAramHeap_NS_dump(void);
-    void dRes_control_c_NS_dump(void);
-    void JUTConsole_NS_getLineOffset(void);
-    void JUTConsole_NS_dumpToTerminal(void);
-    void JUTConsole_NS_scroll(void);
-    void JUTConsole_NS_clear(void);
-    void JUTReport_X1_(void);
-    void JUTAssertion_NS_setMessageCount(void);
-    void DynamicModuleControlBase_NS_dump(void);
-    void _restgpr_25(void);
-    unsigned int getSelectItemIndex__21dSv_player_status_a_cCFi(int);
-    void setLineUpItem__17dSv_player_item_cFv(void);
-    void dMeter2Info_c_NS_setHotSpringTimer(void);
-    void setItem__17dSv_player_item_cFiUc(void);
-    void dSv_item_rename__FUc(void);
-    void setBottleItemIn__17dSv_player_item_cFUcUc(void);
-    void getItem__17dSv_player_item_cCFib(void);
-    void setEquipBottleItemIn__17dSv_player_item_cFUcUc(u8,u8);
-    void isFirstBit__21dSv_player_get_item_cCFUc(void);
-    void setBombNum__24dSv_player_item_record_cFUcUc(void);
-    void setItem__17dSv_player_item_cFiUc(void);
-    void dMeter2Info_c_NS_getString(void);
-    void Z2AudioMgr_NS_setOutputMode(void*,unsigned long);
-    u32 Z2AudioMgr_NS_hasReset(void*);
-    void dComIfG_play_c_NS_getNowVibration(void);
-    void setInitEventBit(void);
-    void daObjCarry_c_NS_clrSaveFlag(void);
-    void daObjCarry_c_NS_setSaveFlag(void);
-    void init__14dSv_MiniGame_cFv(void);
-    void init__11dSv_event_cFv(void);
-    void init__13dSv_memory2_cFv(void);
-    void init__12dSv_memory_cFv(void);
-    void init__12dSv_player_cFv(void);
-    void init__10dSv_info_cFvZone(void);
-    void init__10dSv_zone_cFi(void);
-    void onOneSwitch__13dSv_zoneBit_cFi(void);
-    void onSwitch__13dSv_zoneBit_cFi(void);
-    int dStage_roomControl_c_NS_getZoneNo(int,int);
-    void onSwitch__12dSv_danBit_cFi(void);
-    void onSwitch__12dSv_memBit_cFi(void);
-    void revOneSwitch__13dSv_zoneBit_cFi(void);
-    void revSwitch__13dSv_zoneBit_cFi(void);
-    void revSwitch__12dSv_danBit_cFi(void);
-    void revSwitch__12dSv_memBit_cFi(void);
-    void isOneSwitch__13dSv_zoneBit_cCFi(void);
-    void isSwitch__13dSv_zoneBit_cCFi(void);
-    void isSwitch__12dSv_danBit_cCFi(void);
-    void isSwitch__12dSv_memBit_cCFi(void);
-    void isOneItem__13dSv_zoneBit_cCFi(void);
-    void isItem__13dSv_zoneBit_cCFi(void);
-    void isItem__12dSv_memBit_cCFi(void);
-    void isItem__12dSv_danBit_cCFi(void);
-    void off__15dSv_zoneActor_cFi(void);
-    void is__15dSv_zoneActor_cCFi(void);
-    void func_8036220C(void);
-    void onEventBit__11dSv_event_cFUs(void);
-    void func_8036687C(void);
-    void func_80003540(void);
-    void func_80362324(void);
-    void func_8036221C(void);
-    void func_8036221C(void);
-    void countUsed__FP10JKRExpHeap(void);
-    void JUTReport(void);
-    void func_803621D0(void);
-    void offEventBit__11dSv_event_cFUs(void);
-    void func_803621C0(void);
-    void dMeter2Info_c_NS_setSaveStageName(void);
-    void dComIfG_play_c_NS_setNowVibration(void);
-    void getVibration__19dSv_player_config_cFv(void);
-    void dComIfGs_setKeyNum(void);
-    void getSound__19dSv_player_config_cFv(void);
-    void setSound__19dSv_player_config_cFUc(void);
-    void getTotalUsedSize__10JKRExpHeapCFv(void);
-    void HeapCheck_NS_getUsedCount(void);
-    void CheckHeap1__9HeapCheckFv(void);
-    void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...);
-    void Debug_console__FUl(void);
-    void debugDisplay__Fv(void);
-    void CheckHeap__FUl(void);
-    void debug__Fv(void);
-    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 cDyl_InitAsync(void);
-    void fopAcM_initManager(void);
-    void fapGm_Create(void);
-    void mDoDvdThd_callback_c_NS_create(void);
-    void mDoExt_getCommandHeap(void);
-    void mDoExt_getHostIOHeap(void);
-    void mDoExt_getJ2dHeap(void);
-    void mDoExt_getArchiveHeap(void);
-    void mDoExt_getGameHeap(void);
-    void mDoExt_getZeldaHeap(void);
-    void mDoCPd_c_NS_create(void);
-    void mDoGph_Create(void);
-    void mDoMch_Create(void);
-    void init__10dSv_save_cFv(void);
-    void func_80361D60(void);
-    void dComIfG_inf_c_NS_ct(void);
-    void version_check__Fv(void);
-    void J2DTextBox_NS_getStringPtr(void);
-    void J2DTextBox_NS_setString_X1_(void);
-    void CPaneMgrAlpha_X1_(void);
-    void mDoExt_getMesgFont(void);
-    void J2DScreen_NS_setPriority(void);
-    void __ct__9J2DScreenFv(void);
-    void dFile_info_c_NS_setPlayTime(void);
-    void dFile_info_c_NS_setSaveDate(void);
-    void dFile_info_c_NS_setHeartCnt(void);
-    void setHeartCnt__12dFile_info_cFP10dSv_save_c(void);
-    void setSaveDate__12dFile_info_cFP10dSv_save_c(void);
-    void func_803664DC(void);
-    void setPlayTime__12dFile_info_cFP10dSv_save_c(void);
-    void func_80362540(void);
-    void dDlst_list_c_NS_set(void);
-    void init__14dComIfG_play_cFv(void);
-    void func_80003458(void);
-    void dStage_roomControl_c_NS_initZone(void);
-    void JUTWarningConsole(void);
-    void JUTConsole_NS_print(void);
-    void JUTConsole_NS_check(void);
-    void JUTConsole_NS_print_f(void);
-    void JUTConsole_NS_clear(void);
-    void JUTReportConsole_f(void);
-    void JUTWarningConsole(void);
-    void JUTWarningConsole_f(void);
+extern "C" {
+void J2DScreen_NS_draw(void);
+void PSMTXCopy(void);
+void PSMTXConcat(void);
+void PSMTXScale(void);
+void screenSet__12dFile_info_cFv(void);
+void dFile_info_c_NS_screenSet(void);
+void mDoExt_removeMesgFont(void);
+void func_80362210(void);
+void JKRAramHeap_NS_getTotalFreeSize(void);
+void JKRAramHeap_NS_getFreeSize(void);
+void heapDisplay__9HeapCheckCFv(void);
+void func_803621C4(void);
+void init__20dSv_player_collect_cFv(void);
+void dComIfGp_setSelectItem(int);
+void getUsedCount__9HeapCheckCFv(void);
+void isEventBit__11dSv_event_cCFUs(void);
+void dComIfGs_setMixItemIndex(void);
+void dComIfGs_setSelectItemIndex(void);
+void dComIfGs_getMixItemIndex(void);
+char* strcpy(char*, const char*);
+int strcmp(char*, char*);
+void setBombNum__21dSv_player_item_max_cFUcUc(void);
+void func_80362224(void);
+void func_803621D8(void);
+void func_803621CC(void);
+void func_80362218(void);
+void _restgpr_26(void);
+void _savegpr_26(void);
+void func_8036221C(void);
+void func_803621D0(void);
+void func_803620AC(void);
+void func_803626BC(void);
+void func_803664DC(void);
+void _restgpr_29(void);
+void _savegpr_29(void);
+void _restgpr_28(void);
+void _savegpr_28(void);
+void _restgpr_27(void);
+void _savegpr_27(void);
+void _savegpr_26(void);
+void _restgpr_26(void);
+void JKRAramHeap_NS_dump(void);
+void dRes_control_c_NS_dump(void);
+void JUTConsole_NS_getLineOffset(void);
+void JUTConsole_NS_dumpToTerminal(void);
+void JUTConsole_NS_scroll(void);
+void JUTConsole_NS_clear(void);
+void JUTReport_X1_(void);
+void JUTAssertion_NS_setMessageCount(void);
+void DynamicModuleControlBase_NS_dump(void);
+void _restgpr_25(void);
+unsigned int getSelectItemIndex__21dSv_player_status_a_cCFi(int);
+void setLineUpItem__17dSv_player_item_cFv(void);
+void dMeter2Info_c_NS_setHotSpringTimer(void);
+void setItem__17dSv_player_item_cFiUc(void);
+void dSv_item_rename__FUc(void);
+void setBottleItemIn__17dSv_player_item_cFUcUc(void);
+void getItem__17dSv_player_item_cCFib(void);
+void setEquipBottleItemIn__17dSv_player_item_cFUcUc(u8, u8);
+void isFirstBit__21dSv_player_get_item_cCFUc(void);
+void setBombNum__24dSv_player_item_record_cFUcUc(void);
+void setItem__17dSv_player_item_cFiUc(void);
+void dMeter2Info_c_NS_getString(void);
+void Z2AudioMgr_NS_setOutputMode(void*, unsigned long);
+u32 Z2AudioMgr_NS_hasReset(void*);
+void dComIfG_play_c_NS_getNowVibration(void);
+void setInitEventBit(void);
+void daObjCarry_c_NS_clrSaveFlag(void);
+void daObjCarry_c_NS_setSaveFlag(void);
+void init__14dSv_MiniGame_cFv(void);
+void init__11dSv_event_cFv(void);
+void init__13dSv_memory2_cFv(void);
+void init__12dSv_memory_cFv(void);
+void init__12dSv_player_cFv(void);
+void init__10dSv_info_cFvZone(void);
+void init__10dSv_zone_cFi(void);
+void onOneSwitch__13dSv_zoneBit_cFi(void);
+void onSwitch__13dSv_zoneBit_cFi(void);
+int dStage_roomControl_c_NS_getZoneNo(int, int);
+void onSwitch__12dSv_danBit_cFi(void);
+void onSwitch__12dSv_memBit_cFi(void);
+void revOneSwitch__13dSv_zoneBit_cFi(void);
+void revSwitch__13dSv_zoneBit_cFi(void);
+void revSwitch__12dSv_danBit_cFi(void);
+void revSwitch__12dSv_memBit_cFi(void);
+void isOneSwitch__13dSv_zoneBit_cCFi(void);
+void isSwitch__13dSv_zoneBit_cCFi(void);
+void isSwitch__12dSv_danBit_cCFi(void);
+void isSwitch__12dSv_memBit_cCFi(void);
+void isOneItem__13dSv_zoneBit_cCFi(void);
+void isItem__13dSv_zoneBit_cCFi(void);
+void isItem__12dSv_memBit_cCFi(void);
+void isItem__12dSv_danBit_cCFi(void);
+void off__15dSv_zoneActor_cFi(void);
+void is__15dSv_zoneActor_cCFi(void);
+void func_8036220C(void);
+void onEventBit__11dSv_event_cFUs(void);
+void func_8036687C(void);
+void func_80003540(void);
+void func_80362324(void);
+void func_8036221C(void);
+void func_8036221C(void);
+void countUsed__FP10JKRExpHeap(void);
+void JUTReport(void);
+void func_803621D0(void);
+void offEventBit__11dSv_event_cFUs(void);
+void func_803621C0(void);
+void dMeter2Info_c_NS_setSaveStageName(void);
+void dComIfG_play_c_NS_setNowVibration(void);
+void getVibration__19dSv_player_config_cFv(void);
+void dComIfGs_setKeyNum(void);
+void getSound__19dSv_player_config_cFv(void);
+void setSound__19dSv_player_config_cFUc(void);
+void getTotalUsedSize__10JKRExpHeapCFv(void);
+void HeapCheck_NS_getUsedCount(void);
+void CheckHeap1__9HeapCheckFv(void);
+void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...);
+void Debug_console__FUl(void);
+void debugDisplay__Fv(void);
+void CheckHeap__FUl(void);
+void debug__Fv(void);
+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 cDyl_InitAsync(void);
+void fopAcM_initManager(void);
+void fapGm_Create(void);
+void mDoDvdThd_callback_c_NS_create(void);
+void mDoExt_getCommandHeap(void);
+void mDoExt_getHostIOHeap(void);
+void mDoExt_getJ2dHeap(void);
+void mDoExt_getArchiveHeap(void);
+void mDoExt_getGameHeap(void);
+void mDoExt_getZeldaHeap(void);
+void mDoCPd_c_NS_create(void);
+void mDoGph_Create(void);
+void mDoMch_Create(void);
+void init__10dSv_save_cFv(void);
+void func_80361D60(void);
+void dComIfG_inf_c_NS_ct(void);
+void version_check__Fv(void);
+void J2DTextBox_NS_getStringPtr(void);
+void J2DTextBox_NS_setString_X1_(void);
+void CPaneMgrAlpha_X1_(void);
+void mDoExt_getMesgFont(void);
+void J2DScreen_NS_setPriority(void);
+void __ct__9J2DScreenFv(void);
+void dFile_info_c_NS_setPlayTime(void);
+void dFile_info_c_NS_setSaveDate(void);
+void dFile_info_c_NS_setHeartCnt(void);
+void setHeartCnt__12dFile_info_cFP10dSv_save_c(void);
+void setSaveDate__12dFile_info_cFP10dSv_save_c(void);
+void func_803664DC(void);
+void setPlayTime__12dFile_info_cFP10dSv_save_c(void);
+void func_80362540(void);
+void dDlst_list_c_NS_set(void);
+void init__14dComIfG_play_cFv(void);
+void func_80003458(void);
+void dStage_roomControl_c_NS_initZone(void);
+void JUTWarningConsole(void);
+void JUTConsole_NS_print(void);
+void JUTConsole_NS_check(void);
+void JUTConsole_NS_print_f(void);
+void JUTConsole_NS_clear(void);
+void JUTReportConsole_f(void);
+void JUTWarningConsole(void);
+void JUTWarningConsole_f(void);
 
-    void func_803621CC(void);
-    void func_80361C24(void);
+void func_803621CC(void);
+void func_80361C24(void);
 
-    void _restgpr_26(void);
-    void _restgpr_27(void);
-    void _restgpr_28(void);
-    void _restgpr_29(void);
-    void _savegpr_26(void);
-    void _savegpr_27(void);
-    void _savegpr_28(void);
-    void _savegpr_29(void);
-    void func_80003540(void);
-    void func_80365470(void);
-    void func_803688DC(void);
-    void func_80368ABC(void);
-    void func_80368BE4(void);
-    void JKRArchive_NS_getDirEntry(void);
-    
-    void _restgpr_29(void);
-    void _savegpr_29(void);
-    void func_80361C24(void);
+void _restgpr_26(void);
+void _restgpr_27(void);
+void _restgpr_28(void);
+void _restgpr_29(void);
+void _savegpr_26(void);
+void _savegpr_27(void);
+void _savegpr_28(void);
+void _savegpr_29(void);
+void func_80003540(void);
+void func_80365470(void);
+void func_803688DC(void);
+void func_80368ABC(void);
+void func_80368BE4(void);
+void JKRArchive_NS_getDirEntry(void);
 
-    void func_803621CC(void);
-    void func_80362218(void);
+void _restgpr_29(void);
+void _savegpr_29(void);
+void func_80361C24(void);
 
-    void JKRAramArchive(void);
-    void JKRArchive_NS_findDirectory(void);
-    void JKRArchive_NS_findFsResource(void);
-    void JKRArchive_NS_findIdResource(void);
-    void JKRArchive_NS_findIdxResource(void);
-    void JKRArchive_NS_findNameResource(void);
-    void JKRArchive_NS_findPtrResource(void);
-    void JKRArchive_NS_findTypeResource(void);
-    void JKRCompArchive(void);
+void func_803621CC(void);
+void func_80362218(void);
 
-    void func_80365470(void);
+void JKRAramArchive(void);
+void JKRArchive_NS_findDirectory(void);
+void JKRArchive_NS_findFsResource(void);
+void JKRArchive_NS_findIdResource(void);
+void JKRArchive_NS_findIdxResource(void);
+void JKRArchive_NS_findNameResource(void);
+void JKRArchive_NS_findPtrResource(void);
+void JKRArchive_NS_findTypeResource(void);
+void JKRCompArchive(void);
 
-    void DCInvalidateRange(void);
-    void JKRDvdRipper_NS_loadToMainRAM_X1_(void);
-    void func_80003458(void);
-    void func_803621CC(void);
-    void func_80362218(void);
-    void func_803650D0(void);
+void func_80365470(void);
 
-    void JKRDecomp_NS_orderSync(void);
-    void func_80003540(void);
+void DCInvalidateRange(void);
+void JKRDvdRipper_NS_loadToMainRAM_X1_(void);
+void func_80003458(void);
+void func_803621CC(void);
+void func_80362218(void);
+void func_803650D0(void);
 
-    void JKRAramHeap_NS_alloc(void);
-    void JKRAram_NS_aramToMainRam(void);
-    void JKRDvdAramRipper_NS_loadToAram(void);
-    void JKRAram_NS_mainRamToAram(void);
-    void JKRAramPiece_NS_sendCommand(void);
+void JKRDecomp_NS_orderSync(void);
+void func_80003540(void);
 
-    void DCInvalidateRange(void);
-    void DCStoreRangeNoSync(void);
-    void __RAS_OSDisableInterrupts_begin(void);
-    void func_80003540(void);
-    void func_80361C24(void);
-    void func_803621B0(void);
-    void func_803621C4(void);
-    void func_803621C8(void);
-    void func_803621FC(void);
-    void func_80362210(void);
-    void func_80362214(void);
+void JKRAramHeap_NS_alloc(void);
+void JKRAram_NS_aramToMainRam(void);
+void JKRDvdAramRipper_NS_loadToAram(void);
+void JKRAram_NS_mainRamToAram(void);
+void JKRAramPiece_NS_sendCommand(void);
 
-    void ARQPostRequest(void);
-    void DCStoreRange(void);
+void DCInvalidateRange(void);
+void DCStoreRangeNoSync(void);
+void __RAS_OSDisableInterrupts_begin(void);
+void func_80003540(void);
+void func_80361C24(void);
+void func_803621B0(void);
+void func_803621C4(void);
+void func_803621C8(void);
+void func_803621FC(void);
+void func_80362210(void);
+void func_80362214(void);
 
-    void JSUInputStream_NS_read(void);
-    void JSURandomInputStream_NS_seek(void);
+void ARQPostRequest(void);
+void DCStoreRange(void);
 
-    void DCInvalidateRange(void);
-    void JSUInputStream_NS_dtor(void);
-    void JSUFileInputStream_ct(void);
+void JSUInputStream_NS_read(void);
+void JSURandomInputStream_NS_seek(void);
 
-    void ARAlloc(void);
-    void ARGetSize(void);
-    void ARInit(void);
-    void ARQInit(void);
-    void DCStoreRangeNoSync(void);
-    void __RAS_OSDisableInterrupts_begin(void);
-    u8 dComIfGs_getBottleMax(void);
+void DCInvalidateRange(void);
+void JSUInputStream_NS_dtor(void);
+void JSUFileInputStream_ct(void);
 
+void ARAlloc(void);
+void ARGetSize(void);
+void ARInit(void);
+void ARQInit(void);
+void DCStoreRangeNoSync(void);
+void __RAS_OSDisableInterrupts_begin(void);
+u8 dComIfGs_getBottleMax(void);
 
-    void mDoDvdErr_ThdCleanup(void);
+void mDoDvdErr_ThdCleanup(void);
 }
 
 class mDoCPd_c;
 extern "C" {
-    void cAPICPad_recalibrate(void);
+void cAPICPad_recalibrate(void);
 }
 
 // JSystem/JSupport/JSUList
 extern "C" {
-    void __ct__10JSUPtrLinkFPv(void);
-    void __dt__10JSUPtrLinkFv(void);
-    void __ct__10JSUPtrListFb(void);
-    void __dt__10JSUPtrListFv(void);
-    void initiate__10JSUPtrListFv(void);
-    void setFirst__10JSUPtrListFP10JSUPtrLink(void);
-    void append__10JSUPtrListFP10JSUPtrLink(void);
-    void prepend__10JSUPtrListFP10JSUPtrLink(void);
-    void insert__10JSUPtrListFP10JSUPtrLinkP10JSUPtrLink(void);
-    void remove__10JSUPtrListFP10JSUPtrLink(void);
-    void getNthLink__10JSUPtrListCFUl(void);
+void __ct__10JSUPtrLinkFPv(void);
+void __dt__10JSUPtrLinkFv(void);
+void __ct__10JSUPtrListFb(void);
+void __dt__10JSUPtrListFv(void);
+void initiate__10JSUPtrListFv(void);
+void setFirst__10JSUPtrListFP10JSUPtrLink(void);
+void append__10JSUPtrListFP10JSUPtrLink(void);
+void prepend__10JSUPtrListFP10JSUPtrLink(void);
+void insert__10JSUPtrListFP10JSUPtrLinkP10JSUPtrLink(void);
+void remove__10JSUPtrListFP10JSUPtrLink(void);
+void getNthLink__10JSUPtrListCFUl(void);
 }
 
 // JSyste,/JKernel/JKRFile
 extern "C" {
-    void read__7JKRFileFPvll(void);
+void read__7JKRFileFPvll(void);
 }
 
 // JSystem/JKernel/JKRDisposer
 extern "C" {
-    void __ct__11JKRDisposerFv(void);
-    void __dt__11JKRDisposerFv(void);
+void __ct__11JKRDisposerFv(void);
+void __dt__11JKRDisposerFv(void);
 }
 
 // JSystem/JKernel/JKRHeap
 extern "C" {
-    void __ct__7JKRHeapFPvUlP7JKRHeapb(void);
-    void __dt__7JKRHeapFv(void);
-    void initArena__7JKRHeapFPPcPUli(void);
-    void becomeCurrentHeap__7JKRHeapFv(void);
-    void becomeSystemHeap__7JKRHeapFv(void);
-    void destroy__7JKRHeapFv(void);
-    void alloc__7JKRHeapFUliP7JKRHeap(void);
-    void alloc__7JKRHeapFUli(void);
-    void free__7JKRHeapFPvP7JKRHeap(void);
-    void free__7JKRHeapFPv(void);
-    void callAllDisposer__7JKRHeapFv(void);
-    void freeAll__7JKRHeapFv(void);
-    void freeTail__7JKRHeapFv(void);
-    void resize__7JKRHeapFPvUlP7JKRHeap(void);
-    void resize__7JKRHeapFPvUl(void);
-    void getSize__7JKRHeapFPvP7JKRHeap(void);
-    void getSize__7JKRHeapFPv(void);
-    void getFreeSize__7JKRHeapFv(void);
-    void getMaxFreeBlock__7JKRHeapFv(void);
-    void getTotalFreeSize__7JKRHeapFv(void);
-    void changeGroupID__7JKRHeapFUc(void);
-    void getMaxAllocatableSize__7JKRHeapFi(void);
-    void findFromRoot__7JKRHeapFPv(void);
-    void find__7JKRHeapCFPv(void);
-    void findAllHeap__7JKRHeapCFPv(void);
-    void dispose_subroutine__7JKRHeapFUlUl(void);
-    void dispose__7JKRHeapFPvUl(void);
-    void dispose__7JKRHeapFPvPv(void);
-    void dispose__7JKRHeapFv(void);
-    void copyMemory__7JKRHeapFPvPvUl(void);
-    void JKRDefaultMemoryErrorRoutine__FPvUli(void);
-    void setErrorFlag__7JKRHeapFb(void);
-    void setErrorHandler__7JKRHeapFPFPvUli_v(void);
-    void isSubHeap__7JKRHeapCFP7JKRHeap(void);
-    void __nw__FUl(void);
-    void __nw__FUli(void);
-    void __nw__FUlP7JKRHeapi(void);
-    void __nwa__FUl(void);
-    void __nwa__FUli(void);
-    void __nwa__FUlP7JKRHeapi(void);
-    void __dl__FPv(void);
-    void __dla__FPv(void);
+void __ct__7JKRHeapFPvUlP7JKRHeapb(void);
+void __dt__7JKRHeapFv(void);
+void initArena__7JKRHeapFPPcPUli(void);
+void becomeCurrentHeap__7JKRHeapFv(void);
+void becomeSystemHeap__7JKRHeapFv(void);
+void destroy__7JKRHeapFv(void);
+void alloc__7JKRHeapFUliP7JKRHeap(void);
+void alloc__7JKRHeapFUli(void);
+void free__7JKRHeapFPvP7JKRHeap(void);
+void free__7JKRHeapFPv(void);
+void callAllDisposer__7JKRHeapFv(void);
+void freeAll__7JKRHeapFv(void);
+void freeTail__7JKRHeapFv(void);
+void resize__7JKRHeapFPvUlP7JKRHeap(void);
+void resize__7JKRHeapFPvUl(void);
+void getSize__7JKRHeapFPvP7JKRHeap(void);
+void getSize__7JKRHeapFPv(void);
+void getFreeSize__7JKRHeapFv(void);
+void getMaxFreeBlock__7JKRHeapFv(void);
+void getTotalFreeSize__7JKRHeapFv(void);
+void changeGroupID__7JKRHeapFUc(void);
+void getMaxAllocatableSize__7JKRHeapFi(void);
+void findFromRoot__7JKRHeapFPv(void);
+void find__7JKRHeapCFPv(void);
+void findAllHeap__7JKRHeapCFPv(void);
+void dispose_subroutine__7JKRHeapFUlUl(void);
+void dispose__7JKRHeapFPvUl(void);
+void dispose__7JKRHeapFPvPv(void);
+void dispose__7JKRHeapFv(void);
+void copyMemory__7JKRHeapFPvPvUl(void);
+void JKRDefaultMemoryErrorRoutine__FPvUli(void);
+void setErrorFlag__7JKRHeapFb(void);
+void setErrorHandler__7JKRHeapFPFPvUli_v(void);
+void isSubHeap__7JKRHeapCFP7JKRHeap(void);
+void __nw__FUl(void);
+void __nw__FUli(void);
+void __nw__FUlP7JKRHeapi(void);
+void __nwa__FUl(void);
+void __nwa__FUli(void);
+void __nwa__FUlP7JKRHeapi(void);
+void __dl__FPv(void);
+void __dla__FPv(void);
 }
 
 extern "C" {
@@ -358,7 +357,7 @@ extern void GXSetBlendMode(u32, u32, u32, u32);
 extern void GXSetVtxAttrFmt(u32, u32, u32, u32, u32);
 extern void GXClearVtxDesc();
 extern void GXSetVtxDesc(u32, u32);
-typedef void (* GXDrawDoneCallback)(void);
+typedef void (*GXDrawDoneCallback)(void);
 extern void GXSetDrawDoneCallback(GXDrawDoneCallback);
 extern void GXDrawDone(void);
 extern void GXAbortFrame(void);
@@ -374,537 +373,542 @@ void VIFlush(void);
 }
 
 extern "C" {
-    void JUTReport__FiiPCce(int, int, const char*, ...);
-    void JUTReportConsole(const char*);
+void JUTReport__FiiPCce(int, int, const char*, ...);
+void JUTReportConsole(const char*);
 }
 
 // m_Do_main.h
 extern "C" {
-    void mDoMch_HeapCheckAll(void);
+void mDoMch_HeapCheckAll(void);
 }
 
-//Z2SoundMgr
-extern "C"{
-    void resetFilterAll__10Z2SoundMgrFv(void);
-    void moveVolume__18JAISoundParamsMoveFfUl(void);
-    void Z2SeqMgr_NS_setBattleBgmOff(void);
-    void setSceneExist__10Z2SceneMgrFb(void);
-    void func_803621F4(void);
-    void Z2SceneMgr_NS_sceneChange(void);
-    void __ct__10JAISoundIDFRC10JAISoundID(void);
-    void Z2EnvSeMgr_NS_initSceneEnvSe(void);
-    void setFieldBgmPlay__8Z2SeqMgrFb(void);
-    void Z2SeqMgr_NS_setTimeProcVolMod(void);
-    void Z2SeqMgr_NS_setHeightVolMod(void);
-    void JAISound_NS_stop(void);
-    void JAUSoundTable_NS_getTypeID(void);
-    void JAIStreamMgr_NS_isActive(void);
-    void JAISound_NS_getID(void);
-    void JSUList_X1_(void);
-    void dComIfGs_isStageSwitch(void);
-    void dComIfGs_getStartPoint(void);
-    void isSwitch__10dSv_info_cCFii(void);
-    void Z2SoundObjMgr_NS_setForceBattleArea(void);
-    void Z2SeqMgr_NS_unMuteSceneBgm(void);
-    void Z2SeqMgr_NS_muteSceneBgm(void);
-    void dComIfGs_isEventBit(void);
-    void JAISoundID_NS___as(void);
-    void dComIfGs_isSaveSwitch(void);
-    void Z2SoundObjMgr_NS_setGhostEnemyState(void);
-    void Z2SeMgr_NS_resetCrowdSize(void);
-    void Z2SeqMgr_NS_setTwilightGateVol(void);
-    void Z2SeqMgr_NS_setWindStoneVol(void);
-    void Z2SeqMgr_NS_resetBattleBgmParams(void);
-    void JAISoundID_X1_(void);
-    void func_803621A8(void);
-    void moveVolume__18JAISoundParamsMoveFfUl(void);
+// Z2SoundMgr
+extern "C" {
+void resetFilterAll__10Z2SoundMgrFv(void);
+void moveVolume__18JAISoundParamsMoveFfUl(void);
+void Z2SeqMgr_NS_setBattleBgmOff(void);
+void setSceneExist__10Z2SceneMgrFb(void);
+void func_803621F4(void);
+void Z2SceneMgr_NS_sceneChange(void);
+void __ct__10JAISoundIDFRC10JAISoundID(void);
+void Z2EnvSeMgr_NS_initSceneEnvSe(void);
+void setFieldBgmPlay__8Z2SeqMgrFb(void);
+void Z2SeqMgr_NS_setTimeProcVolMod(void);
+void Z2SeqMgr_NS_setHeightVolMod(void);
+void JAISound_NS_stop(void);
+void JAUSoundTable_NS_getTypeID(void);
+void JAIStreamMgr_NS_isActive(void);
+void JAISound_NS_getID(void);
+void JSUList_X1_(void);
+void dComIfGs_isStageSwitch(void);
+void dComIfGs_getStartPoint(void);
+void isSwitch__10dSv_info_cCFii(void);
+void Z2SoundObjMgr_NS_setForceBattleArea(void);
+void Z2SeqMgr_NS_unMuteSceneBgm(void);
+void Z2SeqMgr_NS_muteSceneBgm(void);
+void dComIfGs_isEventBit(void);
+void JAISoundID_NS___as(void);
+void dComIfGs_isSaveSwitch(void);
+void Z2SoundObjMgr_NS_setGhostEnemyState(void);
+void Z2SeMgr_NS_resetCrowdSize(void);
+void Z2SeqMgr_NS_setTwilightGateVol(void);
+void Z2SeqMgr_NS_setWindStoneVol(void);
+void Z2SeqMgr_NS_resetBattleBgmParams(void);
+void JAISoundID_X1_(void);
+void func_803621A8(void);
+void moveVolume__18JAISoundParamsMoveFfUl(void);
 }
 // Z2LinkMgr
 extern "C" {
-    void Z2CreatureLink_NS_startLinkSound(void);
-    void Z2SoundObjSimple(void);
-    void Z2LinkSoundStarter(void);
-    void Z2Creature(void);
-    void JAISoundStarter_NS_dtor(void);
-    void Z2Creature_NS_dtor(void);
-    void Z2SoundObjBase_NS_dtor(void);
-    void Z2Creature_NS_deleteObject(void);
-    void deleteKantera__14Z2CreatureLinkFv(void);
-    void Z2Creature_NS_init_X1_(void);
-    void Z2SoundObjBase_NS_deleteObject(void);
-    void PSVECSquareDistance(void);
-    void moveVolume__18JAISoundParamsMoveFfUl(void);
-    void Z2CreatureLink_NS_startLinkSoundLevel(void);
-    void Z2Creature_NS_framework(void);
-    void Z2Audience_NS_setTargetVolume(void);
-    void Z2SoundObjMgr_NS_setGhostEnemyState(void);
-    void Z2FxLineMgr_NS_setFxForceOff(void);
-    void JAISoundParamsMove_NS_movePitch(void);
-    void Z2Calc_NS_linearTransform(void);
-    void JAISound_NS_stop(void);
-    void Z2SoundHandles_NS_getHandleSoundID(void);
-    void Z2SeqMgr_NS_setBattleSeqState(void);
-    void startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc(void);
-    void startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc(void);
-    void Z2SoundStarter_NS_setPortData(void);
-    void Z2SoundObjBase_NS_startCollisionSE(void);
-    void Z2SeqMgr_NS_setBattleLastHit(void);
+void Z2CreatureLink_NS_startLinkSound(void);
+void Z2SoundObjSimple(void);
+void Z2LinkSoundStarter(void);
+void Z2Creature(void);
+void JAISoundStarter_NS_dtor(void);
+void Z2Creature_NS_dtor(void);
+void Z2SoundObjBase_NS_dtor(void);
+void Z2Creature_NS_deleteObject(void);
+void deleteKantera__14Z2CreatureLinkFv(void);
+void Z2Creature_NS_init_X1_(void);
+void Z2SoundObjBase_NS_deleteObject(void);
+void PSVECSquareDistance(void);
+void moveVolume__18JAISoundParamsMoveFfUl(void);
+void Z2CreatureLink_NS_startLinkSoundLevel(void);
+void Z2Creature_NS_framework(void);
+void Z2Audience_NS_setTargetVolume(void);
+void Z2SoundObjMgr_NS_setGhostEnemyState(void);
+void Z2FxLineMgr_NS_setFxForceOff(void);
+void JAISoundParamsMove_NS_movePitch(void);
+void Z2Calc_NS_linearTransform(void);
+void JAISound_NS_stop(void);
+void Z2SoundHandles_NS_getHandleSoundID(void);
+void Z2SeqMgr_NS_setBattleSeqState(void);
+void startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc(void);
+void startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc(void);
+void Z2SoundStarter_NS_setPortData(void);
+void Z2SoundObjBase_NS_startCollisionSE(void);
+void Z2SeqMgr_NS_setBattleLastHit(void);
 }
 
 // Z2Calc
 extern "C" {
-    void linearTransform__6Z2CalcFfffffb(void);
-    void func_8036C740(void);
-    void func_8036C780(void);
-    void getRandom_0_1__6Z2CalcFv(void);
-    void getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign(void);
-    void JMath_NS_TRandom_fast_(void);
+void linearTransform__6Z2CalcFfffffb(void);
+void func_8036C740(void);
+void func_8036C780(void);
+void getRandom_0_1__6Z2CalcFv(void);
+void getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign(void);
+void JMath_NS_TRandom_fast_(void);
 }
 
 // d_a_horse_static
-extern "C"{
-    void Z2CreatureRide_NS_setLinkRiding(void);
-    void checkDownDamage__10e_wb_classFv(void);
+extern "C" {
+void Z2CreatureRide_NS_setLinkRiding(void);
+void checkDownDamage__10e_wb_classFv(void);
 }
 
 // d_item
-extern "C"{
-    void onFirstBit__21dSv_player_get_item_cFUc(u8);
-    void addBombCount(u8,u8);
-    void onDungeonItem__12dSv_memBit_cFi(int);
-    int dComIfGs_getMaxLifeGauge(void);
-    void dComIfGs_setSelectEquipSword(u8);
-    void dComIfGs_setSelectEquipShield(u8);
-    void dComIfGs_setSelectEquipClothes(u8);
-    int item_getcheck_func_FISHING_ROD_1(void);
-    void onSwitch__10dSv_info_cFii(int, int);
-    void setCollect__20dSv_player_collect_cFiUc(int, u8);
-    void dMeter2Info_setSword(u8, bool);
-    void setEmptyBottleItemIn__17dSv_player_item_cFUc(u8);
-    void setBottleNum__24dSv_player_item_record_cFUcUc(u8,u8);
-    void item_func_BEE_CHILD(void);
-    int func_80368954(char*,char*,u32);
-    void dComIfG_play_c_NS_getLayerNo(int);
-    u32 isMagicFlag__21dSv_player_status_a_cCFUc(u8);
-    void func_80362204(void);
-    void dComIfG_play_c_NS_setItemBombNumCount(u8, s16);
-    void setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb(u8, bool);
-    u32 getBombNum__21dSv_player_item_max_cCFUc(u8);
-    u8 getBombNum__24dSv_player_item_record_cCFUc(u8);
-    void func_803621B8(void);
-    int checkItemGet__FUci(u8,int);
+extern "C" {
+void onFirstBit__21dSv_player_get_item_cFUc(u8);
+void addBombCount(u8, u8);
+void onDungeonItem__12dSv_memBit_cFi(int);
+int dComIfGs_getMaxLifeGauge(void);
+void dComIfGs_setSelectEquipSword(u8);
+void dComIfGs_setSelectEquipShield(u8);
+void dComIfGs_setSelectEquipClothes(u8);
+int item_getcheck_func_FISHING_ROD_1(void);
+void onSwitch__10dSv_info_cFii(int, int);
+void setCollect__20dSv_player_collect_cFiUc(int, u8);
+void dMeter2Info_setSword(u8, bool);
+void setEmptyBottleItemIn__17dSv_player_item_cFUc(u8);
+void setBottleNum__24dSv_player_item_record_cFUcUc(u8, u8);
+void item_func_BEE_CHILD(void);
+int func_80368954(char*, char*, u32);
+void dComIfG_play_c_NS_getLayerNo(int);
+u32 isMagicFlag__21dSv_player_status_a_cCFUc(u8);
+void func_80362204(void);
+void dComIfG_play_c_NS_setItemBombNumCount(u8, s16);
+void setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb(u8, bool);
+u32 getBombNum__21dSv_player_item_max_cCFUc(u8);
+u8 getBombNum__24dSv_player_item_record_cCFUc(u8);
+void func_803621B8(void);
+int checkItemGet__FUci(u8, int);
 }
 
 // JSystem/JKernel/JKRThread
 extern "C" {
-    void __ct__9JKRThreadFUlii(void);
-    void __ct__9JKRThreadFP7JKRHeapUlii(void);
-    void __ct__9JKRThreadFP8OSThreadi(void);
-    void __dt__9JKRThreadFv(void);
-    void setCommon_mesgQueue__9JKRThreadFP7JKRHeapi(void);
-    void setCommon_heapSpecified__9JKRThreadFP7JKRHeapUli(void);
-    void start__9JKRThreadFPv(void);
-    void searchThread__9JKRThreadFP8OSThread(void);
-    void __ct__15JKRThreadSwitchFP7JKRHeap(void);
-    void createManager__15JKRThreadSwitchFP7JKRHeap(void);
-    void enter__15JKRThreadSwitchFP9JKRThreadi(void);
-    void callback__15JKRThreadSwitchFP8OSThreadP8OSThread(void);
-    void draw__15JKRThreadSwitchFP14JKRThreadName_P10JUTConsole(void);
-    void run__9JKRThreadFv(void);
-    void draw__15JKRThreadSwitchFP14JKRThreadName_(void);
-    void __dt__15JKRThreadSwitchFv(void);
+void __ct__9JKRThreadFUlii(void);
+void __ct__9JKRThreadFP7JKRHeapUlii(void);
+void __ct__9JKRThreadFP8OSThreadi(void);
+void __dt__9JKRThreadFv(void);
+void setCommon_mesgQueue__9JKRThreadFP7JKRHeapi(void);
+void setCommon_heapSpecified__9JKRThreadFP7JKRHeapUli(void);
+void start__9JKRThreadFPv(void);
+void searchThread__9JKRThreadFP8OSThread(void);
+void __ct__15JKRThreadSwitchFP7JKRHeap(void);
+void createManager__15JKRThreadSwitchFP7JKRHeap(void);
+void enter__15JKRThreadSwitchFP9JKRThreadi(void);
+void callback__15JKRThreadSwitchFP8OSThreadP8OSThread(void);
+void draw__15JKRThreadSwitchFP14JKRThreadName_P10JUTConsole(void);
+void run__9JKRThreadFv(void);
+void draw__15JKRThreadSwitchFP14JKRThreadName_(void);
+void __dt__15JKRThreadSwitchFv(void);
 }
 
 // JSystem/JKernel/JKRDvdFile
 extern "C" {
-    void __ct__10JKRDvdFileFPCc(void);
-    void __ct__10JKRDvdFileFl(void);
-    void __ct__10JKRDvdFileFv(void);
-    void __dt__10JKRDvdFileFv(void);
-    void close__10JKRDvdFileFv(void);
-    void doneProcess__10JKRDvdFileFlP11DVDFileInfo(void);
-    void getFileSize__10JKRDvdFileCFv(void);
-    void initiate__10JKRDvdFileFv(void);
-    void open__10JKRDvdFileFPCc(void);
-    void open__10JKRDvdFileFl(void);
-    void readData__10JKRDvdFileFPvll(void);
-    void sync__10JKRDvdFileFv(void);
-    void writeData__10JKRDvdFileFPCvll(void);
+void __ct__10JKRDvdFileFPCc(void);
+void __ct__10JKRDvdFileFl(void);
+void __ct__10JKRDvdFileFv(void);
+void __dt__10JKRDvdFileFv(void);
+void close__10JKRDvdFileFv(void);
+void doneProcess__10JKRDvdFileFlP11DVDFileInfo(void);
+void getFileSize__10JKRDvdFileCFv(void);
+void initiate__10JKRDvdFileFv(void);
+void open__10JKRDvdFileFPCc(void);
+void open__10JKRDvdFileFl(void);
+void readData__10JKRDvdFileFPvll(void);
+void sync__10JKRDvdFileFv(void);
+void writeData__10JKRDvdFileFPCvll(void);
 }
 
 // JSystem/JKernel/JKRFileCache
 extern "C" {
-    void __ct__12JKRFileCacheFPCcPCc(void);
-    void __ct__Q212JKRFileCache11CCacheBlockFUlUlPCv(void);
-    void __dt__12JKRFileCacheFv(void);
-    void becomeCurrent__12JKRFileCacheFPCc(void);
-    void convStrLower__12JKRFileCacheCFPc(void);
-    void countFile__12JKRFileCacheCFPCc(void);
-    void detachResource__12JKRFileCacheFPv(void);
-    void findCacheBlock__12JKRFileCacheCFPCv(void);
-    void findCacheBlock__12JKRFileCacheCFUl(void);
-    void findFile__12JKRFileCacheCFPcPCc(void);
-    void getDvdPathName__12JKRFileCacheCFPCc(void);
-    void getFirstFile__12JKRFileCacheCFPCc(void);
-    void getFsResource__12JKRFileCacheFPCc(void);
-    void getNameResource__12JKRFileCacheFUlPCc(void);
-    void getResSize__12JKRFileCacheCFPCv(void);
-    void getResource__12JKRFileCacheFPCc(void);
-    void getResource__12JKRFileCacheFUlPCc(void);
-    void mount__12JKRFileCacheFPCcP7JKRHeapPCc(void);
-    void readFsResource__12JKRFileCacheFPvUlPCc(void);
-    void readNameResource__12JKRFileCacheFPvUlUlPCc(void);
-    void readResource__12JKRFileCacheFPvUlPCc(void);
-    void readResource__12JKRFileCacheFPvUlUlPCc(void);
-    void removeResourceAll__12JKRFileCacheFv(void);
-    void removeResource__12JKRFileCacheFPv(void);
+void __ct__12JKRFileCacheFPCcPCc(void);
+void __ct__Q212JKRFileCache11CCacheBlockFUlUlPCv(void);
+void __dt__12JKRFileCacheFv(void);
+void becomeCurrent__12JKRFileCacheFPCc(void);
+void convStrLower__12JKRFileCacheCFPc(void);
+void countFile__12JKRFileCacheCFPCc(void);
+void detachResource__12JKRFileCacheFPv(void);
+void findCacheBlock__12JKRFileCacheCFPCv(void);
+void findCacheBlock__12JKRFileCacheCFUl(void);
+void findFile__12JKRFileCacheCFPcPCc(void);
+void getDvdPathName__12JKRFileCacheCFPCc(void);
+void getFirstFile__12JKRFileCacheCFPCc(void);
+void getFsResource__12JKRFileCacheFPCc(void);
+void getNameResource__12JKRFileCacheFUlPCc(void);
+void getResSize__12JKRFileCacheCFPCv(void);
+void getResource__12JKRFileCacheFPCc(void);
+void getResource__12JKRFileCacheFUlPCc(void);
+void mount__12JKRFileCacheFPCcP7JKRHeapPCc(void);
+void readFsResource__12JKRFileCacheFPvUlPCc(void);
+void readNameResource__12JKRFileCacheFPvUlUlPCc(void);
+void readResource__12JKRFileCacheFPvUlPCc(void);
+void readResource__12JKRFileCacheFPvUlUlPCc(void);
+void removeResourceAll__12JKRFileCacheFv(void);
+void removeResource__12JKRFileCacheFPv(void);
 };
 
-
 // JSystem/JKernel/JKRFileFinder
 extern "C" {
-    void __ct__12JKRArcFinderFP10JKRArchivell(void);
-    void __ct__12JKRDvdFinderFPCc(void);
-    void __dt__12JKRArcFinderFv(void);
-    void __dt__12JKRDvdFinderFv(void);
-    void __dt__13JKRFileFinderFv(void);
-    void findNextFile__12JKRArcFinderFv(void);
-    void findNextFile__12JKRDvdFinderFv(void);
+void __ct__12JKRArcFinderFP10JKRArchivell(void);
+void __ct__12JKRDvdFinderFPCc(void);
+void __dt__12JKRArcFinderFv(void);
+void __dt__12JKRDvdFinderFv(void);
+void __dt__13JKRFileFinderFv(void);
+void findNextFile__12JKRArcFinderFv(void);
+void findNextFile__12JKRDvdFinderFv(void);
 };
 
 // JSystem/JKernel/JKRFileLoader
 extern "C" {
-    void __ct__13JKRFileLoaderFv(void);
-    void __dt__13JKRFileLoaderFv(void);
-    void detachResource__13JKRFileLoaderFPvP13JKRFileLoader(void);
-    void fetchVolumeName__13JKRFileLoaderFPclPCc(void);
-    void findVolume__13JKRFileLoaderFPPCc(void);
-    void getGlbResource__13JKRFileLoaderFPCc(void);
-    void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(void);
-    void removeResource__13JKRFileLoaderFPvP13JKRFileLoader(void);
-    void unmount__13JKRFileLoaderFv(void);
+void __ct__13JKRFileLoaderFv(void);
+void __dt__13JKRFileLoaderFv(void);
+void detachResource__13JKRFileLoaderFPvP13JKRFileLoader(void);
+void fetchVolumeName__13JKRFileLoaderFPclPCc(void);
+void findVolume__13JKRFileLoaderFPPCc(void);
+void getGlbResource__13JKRFileLoaderFPCc(void);
+void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(void);
+void removeResource__13JKRFileLoaderFPvP13JKRFileLoader(void);
+void unmount__13JKRFileLoaderFv(void);
 };
 
 // JSystem/JKernel/JKRAssertHeap
 extern "C" {
-    void __ct__13JKRAssertHeapFPvUlP7JKRHeapb(void);
-    void __dt__13JKRAssertHeapFv(void);
-    void check__13JKRAssertHeapFv(void);
-    void create__13JKRAssertHeapFP7JKRHeap(void);
-    void do_alloc__13JKRAssertHeapFUli(void);
-    void do_changeGroupID__13JKRAssertHeapFUc(void);
-    void do_destroy__13JKRAssertHeapFv(void);
-    void do_fillFreeArea__13JKRAssertHeapFv(void);
-    void do_freeAll__13JKRAssertHeapFv(void);
-    void do_freeTail__13JKRAssertHeapFv(void);
-    void do_free__13JKRAssertHeapFPv(void);
-    void do_getCurrentGroupId__13JKRAssertHeapFv(void);
-    void do_getFreeSize__13JKRAssertHeapFv(void);
-    void do_getMaxFreeBlock__13JKRAssertHeapFv(void);
-    void do_getSize__13JKRAssertHeapFPv(void);
-    void do_getTotalFreeSize__13JKRAssertHeapFv(void);
-    void do_resize__13JKRAssertHeapFPvUl(void);
-    void dump__13JKRAssertHeapFv(void);
-    void dump_sort__13JKRAssertHeapFv(void);
-    void getHeapType__13JKRAssertHeapFv(void);
+void __ct__13JKRAssertHeapFPvUlP7JKRHeapb(void);
+void __dt__13JKRAssertHeapFv(void);
+void check__13JKRAssertHeapFv(void);
+void create__13JKRAssertHeapFP7JKRHeap(void);
+void do_alloc__13JKRAssertHeapFUli(void);
+void do_changeGroupID__13JKRAssertHeapFUc(void);
+void do_destroy__13JKRAssertHeapFv(void);
+void do_fillFreeArea__13JKRAssertHeapFv(void);
+void do_freeAll__13JKRAssertHeapFv(void);
+void do_freeTail__13JKRAssertHeapFv(void);
+void do_free__13JKRAssertHeapFPv(void);
+void do_getCurrentGroupId__13JKRAssertHeapFv(void);
+void do_getFreeSize__13JKRAssertHeapFv(void);
+void do_getMaxFreeBlock__13JKRAssertHeapFv(void);
+void do_getSize__13JKRAssertHeapFPv(void);
+void do_getTotalFreeSize__13JKRAssertHeapFv(void);
+void do_resize__13JKRAssertHeapFPvUl(void);
+void dump__13JKRAssertHeapFv(void);
+void dump_sort__13JKRAssertHeapFv(void);
+void getHeapType__13JKRAssertHeapFv(void);
 };
 
 // JSystem/JKernel/JKRExpHeap
 extern "C" {
-    void __ct__10JKRExpHeapFPvUlP7JKRHeapb(void);
-    void __dt__10JKRExpHeapFv(void);
-    void allocBack__Q210JKRExpHeap9CMemBlockFUlUcUcUcUc(void);
-    void allocFore__Q210JKRExpHeap9CMemBlockFUlUcUcUcUc(void);
-    void allocFromHead__10JKRExpHeapFUl(void);
-    void allocFromHead__10JKRExpHeapFUli(void);
-    void allocFromTail__10JKRExpHeapFUl(void);
-    void allocFromTail__10JKRExpHeapFUli(void);
-    void appendUsedList__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void);
-    void check__10JKRExpHeapFv(void);
-    void createRoot__10JKRExpHeapFib(void);
-    void create__10JKRExpHeapFPvUlP7JKRHeapb(void);
-    void create__10JKRExpHeapFUlP7JKRHeapb(void);
-    void do_alloc__10JKRExpHeapFUli(void);
-    void do_changeGroupID__10JKRExpHeapFUc(void);
-    void do_destroy__10JKRExpHeapFv(void);
-    void do_fillFreeArea__10JKRExpHeapFv(void);
-    void do_freeAll__10JKRExpHeapFv(void);
-    void do_freeTail__10JKRExpHeapFv(void);
-    void do_free__10JKRExpHeapFPv(void);
-    void do_getCurrentGroupId__10JKRExpHeapFv(void);
-    void do_getFreeSize__10JKRExpHeapFv(void);
-    void do_getMaxFreeBlock__10JKRExpHeapFv(void);
-    void do_getSize__10JKRExpHeapFPv(void);
-    void do_getTotalFreeSize__10JKRExpHeapFv(void);
-    void do_resize__10JKRExpHeapFPvUl(void);
-    void dump__10JKRExpHeapFv(void);
-    void dump_sort__10JKRExpHeapFv(void);
-    void free__Q210JKRExpHeap9CMemBlockFP10JKRExpHeap(void);
-    void getHeapBlock__Q210JKRExpHeap9CMemBlockFPv(void);
-    void getHeapType__10JKRExpHeapFv(void);
-    void getTotalUsedSize__10JKRExpHeapCFv(void);
-    void getUsedSize__10JKRExpHeapCFUc(void);
-    void initiate__Q210JKRExpHeap9CMemBlockFPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlockUlUcUc(void);
-    void joinTwoBlocks__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void);
-    void recycleFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void);
-    void removeFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void);
-    void removeUsedBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void);
-    void setFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlock(void);
-    void state_compare__10JKRExpHeapCFRCQ27JKRHeap6TStateRCQ27JKRHeap6TState(void);
-    void state_register__10JKRExpHeapCFPQ27JKRHeap6TStateUl(void);
+void __ct__10JKRExpHeapFPvUlP7JKRHeapb(void);
+void __dt__10JKRExpHeapFv(void);
+void allocBack__Q210JKRExpHeap9CMemBlockFUlUcUcUcUc(void);
+void allocFore__Q210JKRExpHeap9CMemBlockFUlUcUcUcUc(void);
+void allocFromHead__10JKRExpHeapFUl(void);
+void allocFromHead__10JKRExpHeapFUli(void);
+void allocFromTail__10JKRExpHeapFUl(void);
+void allocFromTail__10JKRExpHeapFUli(void);
+void appendUsedList__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void);
+void check__10JKRExpHeapFv(void);
+void createRoot__10JKRExpHeapFib(void);
+void create__10JKRExpHeapFPvUlP7JKRHeapb(void);
+void create__10JKRExpHeapFUlP7JKRHeapb(void);
+void do_alloc__10JKRExpHeapFUli(void);
+void do_changeGroupID__10JKRExpHeapFUc(void);
+void do_destroy__10JKRExpHeapFv(void);
+void do_fillFreeArea__10JKRExpHeapFv(void);
+void do_freeAll__10JKRExpHeapFv(void);
+void do_freeTail__10JKRExpHeapFv(void);
+void do_free__10JKRExpHeapFPv(void);
+void do_getCurrentGroupId__10JKRExpHeapFv(void);
+void do_getFreeSize__10JKRExpHeapFv(void);
+void do_getMaxFreeBlock__10JKRExpHeapFv(void);
+void do_getSize__10JKRExpHeapFPv(void);
+void do_getTotalFreeSize__10JKRExpHeapFv(void);
+void do_resize__10JKRExpHeapFPvUl(void);
+void dump__10JKRExpHeapFv(void);
+void dump_sort__10JKRExpHeapFv(void);
+void free__Q210JKRExpHeap9CMemBlockFP10JKRExpHeap(void);
+void getHeapBlock__Q210JKRExpHeap9CMemBlockFPv(void);
+void getHeapType__10JKRExpHeapFv(void);
+void getTotalUsedSize__10JKRExpHeapCFv(void);
+void getUsedSize__10JKRExpHeapCFUc(void);
+void initiate__Q210JKRExpHeap9CMemBlockFPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlockUlUcUc(
+    void);
+void joinTwoBlocks__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void);
+void recycleFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void);
+void removeFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void);
+void removeUsedBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void);
+void setFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlock(
+    void);
+void state_compare__10JKRExpHeapCFRCQ27JKRHeap6TStateRCQ27JKRHeap6TState(void);
+void state_register__10JKRExpHeapCFPQ27JKRHeap6TStateUl(void);
 };
 
 // JSystem/JKernel/JKRSolidHeap
 extern "C" {
-    void __ct__12JKRSolidHeapFPvUlP7JKRHeapb(void);
-    void __dt__12JKRSolidHeapFv(void);
-    void adjustSize__12JKRSolidHeapFv(void);
-    void allocFromHead__12JKRSolidHeapFUli(void);
-    void allocFromTail__12JKRSolidHeapFUli(void);
-    void check__12JKRSolidHeapFv(void);
-    void create__12JKRSolidHeapFUlP7JKRHeapb(void);
-    void do_alloc__12JKRSolidHeapFUli(void);
-    void do_destroy__12JKRSolidHeapFv(void);
-    void do_fillFreeArea__12JKRSolidHeapFv(void);
-    void do_freeAll__12JKRSolidHeapFv(void);
-    void do_freeTail__12JKRSolidHeapFv(void);
-    void do_free__12JKRSolidHeapFPv(void);
-    void do_getFreeSize__12JKRSolidHeapFv(void);
-    void do_getMaxFreeBlock__12JKRSolidHeapFv(void);
-    void do_getSize__12JKRSolidHeapFPv(void);
-    void do_getTotalFreeSize__12JKRSolidHeapFv(void);
-    void do_resize__12JKRSolidHeapFPvUl(void);
-    void dump__12JKRSolidHeapFv(void);
-    void getHeapType__12JKRSolidHeapFv(void);
-    void state_compare__12JKRSolidHeapCFRCQ27JKRHeap6TStateRCQ27JKRHeap6TState(void);
-    void state_register__12JKRSolidHeapCFPQ27JKRHeap6TStateUl(void);
+void __ct__12JKRSolidHeapFPvUlP7JKRHeapb(void);
+void __dt__12JKRSolidHeapFv(void);
+void adjustSize__12JKRSolidHeapFv(void);
+void allocFromHead__12JKRSolidHeapFUli(void);
+void allocFromTail__12JKRSolidHeapFUli(void);
+void check__12JKRSolidHeapFv(void);
+void create__12JKRSolidHeapFUlP7JKRHeapb(void);
+void do_alloc__12JKRSolidHeapFUli(void);
+void do_destroy__12JKRSolidHeapFv(void);
+void do_fillFreeArea__12JKRSolidHeapFv(void);
+void do_freeAll__12JKRSolidHeapFv(void);
+void do_freeTail__12JKRSolidHeapFv(void);
+void do_free__12JKRSolidHeapFPv(void);
+void do_getFreeSize__12JKRSolidHeapFv(void);
+void do_getMaxFreeBlock__12JKRSolidHeapFv(void);
+void do_getSize__12JKRSolidHeapFPv(void);
+void do_getTotalFreeSize__12JKRSolidHeapFv(void);
+void do_resize__12JKRSolidHeapFPvUl(void);
+void dump__12JKRSolidHeapFv(void);
+void getHeapType__12JKRSolidHeapFv(void);
+void state_compare__12JKRSolidHeapCFRCQ27JKRHeap6TStateRCQ27JKRHeap6TState(void);
+void state_register__12JKRSolidHeapCFPQ27JKRHeap6TStateUl(void);
 };
 
 // JSystem/JKernel/JKRArchivePub
 extern "C" {
-    void becomeCurrent__10JKRArchiveFPCc(void);
-    void check_mount_already__10JKRArchiveFlP7JKRHeap(void);
-    void countFile__10JKRArchiveCFPCc(void);
-    void countResource__10JKRArchiveCFv(void);
-    void detachResource__10JKRArchiveFPv(void);
-    void getDirEntry__10JKRArchiveCFPQ210JKRArchive9SDirEntryUl(void);
-    void getFileAttribute__10JKRArchiveCFUl(void);
-    void getFirstFile__10JKRArchiveCFPCc(void);
-    void getGlbResource__10JKRArchiveFUlPCcP10JKRArchive(void);
-    void getIdxResource__10JKRArchiveFUl(void);
-    void getResSize__10JKRArchiveCFPCv(void);
-    void getResource__10JKRArchiveFPCc(void);
-    void getResource__10JKRArchiveFUlPCc(void);
-    void getResource__10JKRArchiveFUs(void);
-    void mount__10JKRArchiveFPCcQ210JKRArchive10EMountModeP7JKRHeapQ210JKRArchive15EMountDirection(void);
-    void mount__10JKRArchiveFPvP7JKRHeapQ210JKRArchive15EMountDirection(void);
-    void mount__10JKRArchiveFlQ210JKRArchive10EMountModeP7JKRHeapQ210JKRArchive15EMountDirection(void);
-    void readIdxResource__10JKRArchiveFPvUlUl(void);
-    void readResource__10JKRArchiveFPvUlPCc(void);
-    void readResource__10JKRArchiveFPvUlUlPCc(void);
-    void readResource__10JKRArchiveFPvUlUs(void);
-    void removeResourceAll__10JKRArchiveFv(void);
-    void removeResource__10JKRArchiveFPv(void);
+void becomeCurrent__10JKRArchiveFPCc(void);
+void check_mount_already__10JKRArchiveFlP7JKRHeap(void);
+void countFile__10JKRArchiveCFPCc(void);
+void countResource__10JKRArchiveCFv(void);
+void detachResource__10JKRArchiveFPv(void);
+void getDirEntry__10JKRArchiveCFPQ210JKRArchive9SDirEntryUl(void);
+void getFileAttribute__10JKRArchiveCFUl(void);
+void getFirstFile__10JKRArchiveCFPCc(void);
+void getGlbResource__10JKRArchiveFUlPCcP10JKRArchive(void);
+void getIdxResource__10JKRArchiveFUl(void);
+void getResSize__10JKRArchiveCFPCv(void);
+void getResource__10JKRArchiveFPCc(void);
+void getResource__10JKRArchiveFUlPCc(void);
+void getResource__10JKRArchiveFUs(void);
+void mount__10JKRArchiveFPCcQ210JKRArchive10EMountModeP7JKRHeapQ210JKRArchive15EMountDirection(
+    void);
+void mount__10JKRArchiveFPvP7JKRHeapQ210JKRArchive15EMountDirection(void);
+void mount__10JKRArchiveFlQ210JKRArchive10EMountModeP7JKRHeapQ210JKRArchive15EMountDirection(void);
+void readIdxResource__10JKRArchiveFPvUlUl(void);
+void readResource__10JKRArchiveFPvUlPCc(void);
+void readResource__10JKRArchiveFPvUlUlPCc(void);
+void readResource__10JKRArchiveFPvUlUs(void);
+void removeResourceAll__10JKRArchiveFv(void);
+void removeResource__10JKRArchiveFPv(void);
 };
 
 // JSystem/JKernel/JKRArchivePri
 extern "C" {
-    void __ct__10JKRArchiveFlQ210JKRArchive10EMountMode(void);
-    void __dt__10JKRArchiveFv(void);
-    void findDirectory__10JKRArchiveCFPCcUl(void);
-    void findFsResource__10JKRArchiveCFPCcUl(void);
-    void findIdResource__10JKRArchiveCFUs(void);
-    void findIdxResource__10JKRArchiveCFUl(void);
-    void findNameResource__10JKRArchiveCFPCc(void);
-    void findPtrResource__10JKRArchiveCFPCv(void);
-    void findResType__10JKRArchiveCFUl(void);
-    void findTypeResource__10JKRArchiveCFUlPCc(void);
-    void getExpandSize__10JKRArchiveCFPQ210JKRArchive12SDIFileEntry(void);
-    void isSameName__10JKRArchiveCFRQ210JKRArchive8CArcNameUlUs(void);
-    void setExpandSize__10JKRArchiveFPQ210JKRArchive12SDIFileEntryUl(void);
-    void store__Q210JKRArchive8CArcNameFPCc(void);
-    void store__Q210JKRArchive8CArcNameFPCcc(void);
+void __ct__10JKRArchiveFlQ210JKRArchive10EMountMode(void);
+void __dt__10JKRArchiveFv(void);
+void findDirectory__10JKRArchiveCFPCcUl(void);
+void findFsResource__10JKRArchiveCFPCcUl(void);
+void findIdResource__10JKRArchiveCFUs(void);
+void findIdxResource__10JKRArchiveCFUl(void);
+void findNameResource__10JKRArchiveCFPCc(void);
+void findPtrResource__10JKRArchiveCFPCv(void);
+void findResType__10JKRArchiveCFUl(void);
+void findTypeResource__10JKRArchiveCFUlPCc(void);
+void getExpandSize__10JKRArchiveCFPQ210JKRArchive12SDIFileEntry(void);
+void isSameName__10JKRArchiveCFRQ210JKRArchive8CArcNameUlUs(void);
+void setExpandSize__10JKRArchiveFPQ210JKRArchive12SDIFileEntryUl(void);
+void store__Q210JKRArchive8CArcNameFPCc(void);
+void store__Q210JKRArchive8CArcNameFPCcc(void);
 };
 
 // JSystem/JKernel/JKRDvdArchive
 extern "C" {
-    void __ct__13JKRDvdArchiveFlQ210JKRArchive15EMountDirection(void);
-    void __dt__13JKRDvdArchiveFv(void);
-    void fetchResource__13JKRDvdArchiveFPQ210JKRArchive12SDIFileEntryPUl(void);
-    void fetchResource__13JKRDvdArchiveFPvUlPQ210JKRArchive12SDIFileEntryPUl(void);
-    void fetchResource_subroutine__13JKRDvdArchiveFlUlUlP7JKRHeapiiPPUc(void);
-    void fetchResource_subroutine__13JKRDvdArchiveFlUlUlPUcUlii(void);
-    void getExpandedResSize__13JKRDvdArchiveCFPCv(void);
-    void open__13JKRDvdArchiveFl(void);
+void __ct__13JKRDvdArchiveFlQ210JKRArchive15EMountDirection(void);
+void __dt__13JKRDvdArchiveFv(void);
+void fetchResource__13JKRDvdArchiveFPQ210JKRArchive12SDIFileEntryPUl(void);
+void fetchResource__13JKRDvdArchiveFPvUlPQ210JKRArchive12SDIFileEntryPUl(void);
+void fetchResource_subroutine__13JKRDvdArchiveFlUlUlP7JKRHeapiiPPUc(void);
+void fetchResource_subroutine__13JKRDvdArchiveFlUlUlPUcUlii(void);
+void getExpandedResSize__13JKRDvdArchiveCFPCv(void);
+void open__13JKRDvdArchiveFl(void);
 };
 
 // JSystem/JKernel/JKRMemArchive
 extern "C" {
-    void __ct__13JKRMemArchiveFPvUl15JKRMemBreakFlag(void);
-    void __ct__13JKRMemArchiveFlQ210JKRArchive15EMountDirection(void);
-    void __dt__13JKRMemArchiveFv(void);
-    void fetchResource__13JKRMemArchiveFPQ210JKRArchive12SDIFileEntryPUl(void);
-    void fetchResource__13JKRMemArchiveFPvUlPQ210JKRArchive12SDIFileEntryPUl(void);
-    void fetchResource_subroutine__13JKRMemArchiveFPUcUlPUcUli(void);
-    void getExpandedResSize__13JKRMemArchiveCFPCv(void);
-    void open__13JKRMemArchiveFPvUl15JKRMemBreakFlag(void);
-    void open__13JKRMemArchiveFlQ210JKRArchive15EMountDirection(void);
-    void removeResourceAll__13JKRMemArchiveFv(void);
-    void removeResource__13JKRMemArchiveFPv(void);
+void __ct__13JKRMemArchiveFPvUl15JKRMemBreakFlag(void);
+void __ct__13JKRMemArchiveFlQ210JKRArchive15EMountDirection(void);
+void __dt__13JKRMemArchiveFv(void);
+void fetchResource__13JKRMemArchiveFPQ210JKRArchive12SDIFileEntryPUl(void);
+void fetchResource__13JKRMemArchiveFPvUlPQ210JKRArchive12SDIFileEntryPUl(void);
+void fetchResource_subroutine__13JKRMemArchiveFPUcUlPUcUli(void);
+void getExpandedResSize__13JKRMemArchiveCFPCv(void);
+void open__13JKRMemArchiveFPvUl15JKRMemBreakFlag(void);
+void open__13JKRMemArchiveFlQ210JKRArchive15EMountDirection(void);
+void removeResourceAll__13JKRMemArchiveFv(void);
+void removeResource__13JKRMemArchiveFPv(void);
 };
 
 // JSystem/JKernel/JKRAramArchive
 extern "C" {
-    void __ct__14JKRAramArchiveFlQ210JKRArchive15EMountDirection(void);
-    void __dt__14JKRAramArchiveFv(void);
-    void __dt__7JKRFileFv(void);
-    void fetchResource__14JKRAramArchiveFPQ210JKRArchive12SDIFileEntryPUl(void);
-    void fetchResource__14JKRAramArchiveFPvUlPQ210JKRArchive12SDIFileEntryPUl(void);
-    void fetchResource_subroutine__14JKRAramArchiveFUlUlP7JKRHeapiPPUc(void);
-    void fetchResource_subroutine__14JKRAramArchiveFUlUlPUcUli(void);
-    void getAramAddress_Entry__14JKRAramArchiveFPQ210JKRArchive12SDIFileEntry(void);
-    void getAramAddress__14JKRAramArchiveFPCc(void);
-    void getExpandedResSize__14JKRAramArchiveCFPCv(void);
-    void open__14JKRAramArchiveFl(void);
+void __ct__14JKRAramArchiveFlQ210JKRArchive15EMountDirection(void);
+void __dt__14JKRAramArchiveFv(void);
+void __dt__7JKRFileFv(void);
+void fetchResource__14JKRAramArchiveFPQ210JKRArchive12SDIFileEntryPUl(void);
+void fetchResource__14JKRAramArchiveFPvUlPQ210JKRArchive12SDIFileEntryPUl(void);
+void fetchResource_subroutine__14JKRAramArchiveFUlUlP7JKRHeapiPPUc(void);
+void fetchResource_subroutine__14JKRAramArchiveFUlUlPUcUli(void);
+void getAramAddress_Entry__14JKRAramArchiveFPQ210JKRArchive12SDIFileEntry(void);
+void getAramAddress__14JKRAramArchiveFPCc(void);
+void getExpandedResSize__14JKRAramArchiveCFPCv(void);
+void open__14JKRAramArchiveFl(void);
 };
 
 // JSystem/JKernel/JKRCompArchive
 extern "C" {
-    void __ct__14JKRCompArchiveFlQ210JKRArchive15EMountDirection(void);
-    void __dt__14JKRCompArchiveFv(void);
-    void fetchResource__14JKRCompArchiveFPQ210JKRArchive12SDIFileEntryPUl(void);
-    void fetchResource__14JKRCompArchiveFPvUlPQ210JKRArchive12SDIFileEntryPUl(void);
-    void getExpandedResSize__14JKRCompArchiveCFPCv(void);
-    void open__14JKRCompArchiveFl(void);
-    void removeResourceAll__14JKRCompArchiveFv(void);
-    void removeResource__14JKRCompArchiveFPv(void);
+void __ct__14JKRCompArchiveFlQ210JKRArchive15EMountDirection(void);
+void __dt__14JKRCompArchiveFv(void);
+void fetchResource__14JKRCompArchiveFPQ210JKRArchive12SDIFileEntryPUl(void);
+void fetchResource__14JKRCompArchiveFPvUlPQ210JKRArchive12SDIFileEntryPUl(void);
+void getExpandedResSize__14JKRCompArchiveCFPCv(void);
+void open__14JKRCompArchiveFl(void);
+void removeResourceAll__14JKRCompArchiveFv(void);
+void removeResource__14JKRCompArchiveFPv(void);
 };
 
 // JSystem/JKernel/JKRDecomp
 extern "C" {
-    void __ct__16JKRDecompCommandFv(void);
-    void __ct__9JKRDecompFl(void);
-    void __dt__16JKRDecompCommandFv(void);
-    void __dt__9JKRDecompFv(void);
-    void checkCompressed__9JKRDecompFPUc(void);
-    void create__9JKRDecompFl(void);
-    void decodeSZP__9JKRDecompFPUcPUcUlUl(void);
-    void decodeSZS__9JKRDecompFPUcPUcUlUl(void);
-    void decode__9JKRDecompFPUcPUcUlUl(void);
-    void orderAsync__9JKRDecompFPUcPUcUlUlPFUl_v(void);
-    void orderSync__9JKRDecompFPUcPUcUlUl(void);
-    void prepareCommand__9JKRDecompFPUcPUcUlUlPFUl_v(void);
-    void run__9JKRDecompFv(void);
-    void sendCommand__9JKRDecompFP16JKRDecompCommand(void);
-    void sync__9JKRDecompFP16JKRDecompCommandi(void);
+void __ct__16JKRDecompCommandFv(void);
+void __ct__9JKRDecompFl(void);
+void __dt__16JKRDecompCommandFv(void);
+void __dt__9JKRDecompFv(void);
+void checkCompressed__9JKRDecompFPUc(void);
+void create__9JKRDecompFl(void);
+void decodeSZP__9JKRDecompFPUcPUcUlUl(void);
+void decodeSZS__9JKRDecompFPUcPUcUlUl(void);
+void decode__9JKRDecompFPUcPUcUlUl(void);
+void orderAsync__9JKRDecompFPUcPUcUlUlPFUl_v(void);
+void orderSync__9JKRDecompFPUcPUcUlUl(void);
+void prepareCommand__9JKRDecompFPUcPUcUlUlPFUl_v(void);
+void run__9JKRDecompFv(void);
+void sendCommand__9JKRDecompFP16JKRDecompCommand(void);
+void sync__9JKRDecompFP16JKRDecompCommandi(void);
 };
 
 // JSystem/JKernel/JKRDvdRipper
 extern "C" {
-    void JKRDecompressFromDVD__FP10JKRDvdFilePvUlUlUlUlPUl(void);
-    // void __dt__23JSUList<12JKRDMCommand>Fv(void);
-    void __sinit_JKRDvdRipper_cpp(void);
-    void decompSZS_subroutine__FPUcPUc(void);
-    void firstSrcData__Fv(void);
-    void isErrorRetry__12JKRDvdRipperFv(void);
-    void loadToMainRAM__12JKRDvdRipperFP10JKRDvdFilePUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(void);
-    void loadToMainRAM__12JKRDvdRipperFPCcPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(void);
-    void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(void);
-    void nextSrcData__FPUc(void);
+void JKRDecompressFromDVD__FP10JKRDvdFilePvUlUlUlUlPUl(void);
+// void __dt__23JSUList<12JKRDMCommand>Fv(void);
+void __sinit_JKRDvdRipper_cpp(void);
+void decompSZS_subroutine__FPUcPUc(void);
+void firstSrcData__Fv(void);
+void isErrorRetry__12JKRDvdRipperFv(void);
+void loadToMainRAM__12JKRDvdRipperFP10JKRDvdFilePUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(
+    void);
+void loadToMainRAM__12JKRDvdRipperFPCcPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(
+    void);
+void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(
+    void);
+void nextSrcData__FPUc(void);
 };
 
 // JSystem/JKernel/JKRAramBlock
 extern "C" {
-    void __ct__12JKRAramBlockFUlUlUlUcb(void);
-    void __dt__12JKRAramBlockFv(void);
-    void allocHead__12JKRAramBlockFUlUcP11JKRAramHeap(void);
-    void allocTail__12JKRAramBlockFUlUcP11JKRAramHeap(void);
+void __ct__12JKRAramBlockFUlUlUlUcb(void);
+void __dt__12JKRAramBlockFv(void);
+void allocHead__12JKRAramBlockFUlUcP11JKRAramHeap(void);
+void allocTail__12JKRAramBlockFUlUcP11JKRAramHeap(void);
 };
 
 // JSystem/JKernel/JKRAramHeap
 extern "C" {
-    void __ct__11JKRAramHeapFUlUl(void);
-    void __dt__11JKRAramHeapFv(void);
-    // void __dt__23JSUList<12JKRAramBlock>Fv(void);
-    void __sinit_JKRAramHeap_cpp(void);
-    void allocFromHead__11JKRAramHeapFUl(void);
-    void allocFromTail__11JKRAramHeapFUl(void);
-    void alloc__11JKRAramHeapFUlQ211JKRAramHeap10EAllocMode(void);
-    void dump__11JKRAramHeapFv(void);
-    void getFreeSize__11JKRAramHeapFv(void);
-    void getTotalFreeSize__11JKRAramHeapFv(void);
+void __ct__11JKRAramHeapFUlUl(void);
+void __dt__11JKRAramHeapFv(void);
+// void __dt__23JSUList<12JKRAramBlock>Fv(void);
+void __sinit_JKRAramHeap_cpp(void);
+void allocFromHead__11JKRAramHeapFUl(void);
+void allocFromTail__11JKRAramHeapFUl(void);
+void alloc__11JKRAramHeapFUlQ211JKRAramHeap10EAllocMode(void);
+void dump__11JKRAramHeapFv(void);
+void getFreeSize__11JKRAramHeapFv(void);
+void getTotalFreeSize__11JKRAramHeapFv(void);
 };
 
 // JSystem/JKernel/JKRAramPiece
 extern "C" {
-    void __ct__12JKRAMCommandFv(void);
-    void __dt__12JKRAMCommandFv(void);
-    void __sinit_JKRAramPiece_cpp(void);
-    void doneDMA__12JKRAramPieceFUl(void);
-    void orderAsync__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v(void);
-    void orderSync__12JKRAramPieceFiUlUlUlP12JKRAramBlock(void);
-    void prepareCommand__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v(void);
-    void sendCommand__12JKRAramPieceFP12JKRAMCommand(void);
-    void startDMA__12JKRAramPieceFP12JKRAMCommand(void);
-    void sync__12JKRAramPieceFP12JKRAMCommandi(void);
+void __ct__12JKRAMCommandFv(void);
+void __dt__12JKRAMCommandFv(void);
+void __sinit_JKRAramPiece_cpp(void);
+void doneDMA__12JKRAramPieceFUl(void);
+void orderAsync__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v(void);
+void orderSync__12JKRAramPieceFiUlUlUlP12JKRAramBlock(void);
+void prepareCommand__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v(void);
+void sendCommand__12JKRAramPieceFP12JKRAMCommand(void);
+void startDMA__12JKRAramPieceFP12JKRAMCommand(void);
+void sync__12JKRAramPieceFP12JKRAMCommandi(void);
 };
 
 // JSystem/JKernel/JKRAramStream
 extern "C" {
-    void __ct__13JKRAramStreamFl(void);
-    void __ct__20JKRAramStreamCommandFv(void);
-    void __dt__13JKRAramStreamFv(void);
-    void create__13JKRAramStreamFl(void);
-    void getAvailable__20JSURandomInputStreamCFv(void);
-    void readFromAram__13JKRAramStreamFv(void);
-    void run__13JKRAramStreamFv(void);
-    void setTransBuffer__13JKRAramStreamFPUcUlP7JKRHeap(void);
-    void sync__13JKRAramStreamFP20JKRAramStreamCommandi(void);
-    void writeToAram__13JKRAramStreamFP20JKRAramStreamCommand(void);
-    void write_StreamToAram_Async__13JKRAramStreamFP18JSUFileInputStreamUlUlUlPUl(void);
+void __ct__13JKRAramStreamFl(void);
+void __ct__20JKRAramStreamCommandFv(void);
+void __dt__13JKRAramStreamFv(void);
+void create__13JKRAramStreamFl(void);
+void getAvailable__20JSURandomInputStreamCFv(void);
+void readFromAram__13JKRAramStreamFv(void);
+void run__13JKRAramStreamFv(void);
+void setTransBuffer__13JKRAramStreamFPUcUlP7JKRHeap(void);
+void sync__13JKRAramStreamFP20JKRAramStreamCommandi(void);
+void writeToAram__13JKRAramStreamFP20JKRAramStreamCommand(void);
+void write_StreamToAram_Async__13JKRAramStreamFP18JSUFileInputStreamUlUlUlPUl(void);
 };
 
 // JSystem/JKernel/JKRDvdAramRipper
 extern "C" {
-    void JKRDecompressFromDVDToAram__FP10JKRDvdFileUlUlUlUlUlPUl(void);
-    void __ct__12JKRADCommandFv(void);
-    void __dt__12JKRADCommandFv(void);
-    void __dt__18JSUFileInputStreamFv(void);
-    // void __dt__23JSUList<12JKRADCommand>Fv(void);
-    void __sinit_JKRDvdAramRipper_cpp(void);
-    void callCommand_Async__16JKRDvdAramRipperFP12JKRADCommand(void);
-    void decompSZS_subroutine__FPUcUl(void);
-    void dmaBufferFlush__FUl(void);
-    void firstSrcData__Fv(void);
-    void loadToAram_Async__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchPFUl_vUlUlPUl(void);
-    void loadToAram__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchUlUlPUl(void);
-    void loadToAram__16JKRDvdAramRipperFlUl15JKRExpandSwitchUlUlPUl(void);
-    void nextSrcData__FPUc(void);
-    void syncAram__16JKRDvdAramRipperFP12JKRADCommandi(void);
+void JKRDecompressFromDVDToAram__FP10JKRDvdFileUlUlUlUlUlPUl(void);
+void __ct__12JKRADCommandFv(void);
+void __dt__12JKRADCommandFv(void);
+void __dt__18JSUFileInputStreamFv(void);
+// void __dt__23JSUList<12JKRADCommand>Fv(void);
+void __sinit_JKRDvdAramRipper_cpp(void);
+void callCommand_Async__16JKRDvdAramRipperFP12JKRADCommand(void);
+void decompSZS_subroutine__FPUcUl(void);
+void dmaBufferFlush__FUl(void);
+void firstSrcData__Fv(void);
+void loadToAram_Async__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchPFUl_vUlUlPUl(void);
+void loadToAram__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchUlUlPUl(void);
+void loadToAram__16JKRDvdAramRipperFlUl15JKRExpandSwitchUlUlPUl(void);
+void nextSrcData__FPUc(void);
+void syncAram__16JKRDvdAramRipperFP12JKRADCommandi(void);
 };
 
 // JSystem/JKernel/JKRAram
 extern "C" {
-    void JKRDecompressFromAramToMainRam__FUlPvUlUlUlPUl(void);
-    void __ct__7JKRAramFUlUll(void);
-    // void __dt__23JSUList<12JKRAMCommand>Fv(void);
-    void __dt__7JKRAramFv(void);
-    void __sinit_JKRAram_cpp(void);
-    void aramToMainRam__7JKRAramFUlPUcUl15JKRExpandSwitchUlP7JKRHeapiPUl(void);
-    void changeGroupIdIfNeed__7JKRAramFPUci(void);
-    void checkOkAddress__7JKRAramFPUcUlP12JKRAramBlockUl(void);
-    void create__7JKRAramFUlUllll(void);
-    void decompSZS_subroutine__FPUcPUc(void);
-    void firstSrcData__Fv(void);
-    void mainRamToAram__7JKRAramFPUcUlUl15JKRExpandSwitchUlP7JKRHeapiPUl(void);
-    void nextSrcData__FPUc(void);
-    void run__7JKRAramFv(void);
+void JKRDecompressFromAramToMainRam__FUlPvUlUlUlPUl(void);
+void __ct__7JKRAramFUlUll(void);
+// void __dt__23JSUList<12JKRAMCommand>Fv(void);
+void __dt__7JKRAramFv(void);
+void __sinit_JKRAram_cpp(void);
+void aramToMainRam__7JKRAramFUlPUcUl15JKRExpandSwitchUlP7JKRHeapiPUl(void);
+void changeGroupIdIfNeed__7JKRAramFPUci(void);
+void checkOkAddress__7JKRAramFPUcUlP12JKRAramBlockUl(void);
+void create__7JKRAramFUlUllll(void);
+void decompSZS_subroutine__FPUcPUc(void);
+void firstSrcData__Fv(void);
+void mainRamToAram__7JKRAramFPUcUlUl15JKRExpandSwitchUlP7JKRHeapiPUl(void);
+void nextSrcData__FPUc(void);
+void run__7JKRAramFv(void);
 };
 
 // JSystem/JUtility/JUTVideo
 class JUTVideo;
 extern "C" {
-    void JUTVideo_NS_destroyManager(void);
+void JUTVideo_NS_destroyManager(void);
 }
 
 // JSystem/JAudio2/JASTaskThread
@@ -913,16 +917,16 @@ struct JASTaskThread {
     OSThread* thread;
 };
 extern "C" {
-    s32 JASTaskThread_NS_pause(JASTaskThread*, bool);
+s32 JASTaskThread_NS_pause(JASTaskThread*, bool);
 }
 
 // JSystem/JAudio2/JASDvdThread
 extern "C" {
-    JASTaskThread* JASDvd_NS_getThreadPointer(void);
+JASTaskThread* JASDvd_NS_getThreadPointer(void);
 }
 
 // m_Do_Rst
 extern "C" {
-    void getResetData__6mDoRstFv(void);
-    void resetCallBack__6mDoRstFiPv(void);
+void getResetData__6mDoRstFv(void);
+void resetCallBack__6mDoRstFiPv(void);
 }
\ No newline at end of file
diff --git a/include/global.h b/include/global.h
index a5e36ab6cf..1b1eb70fee 100644
--- a/include/global.h
+++ b/include/global.h
@@ -3,14 +3,14 @@
 
 #define ARRAY_SIZE(o) (sizeof((o)) / sizeof(*(o)))
 
-struct Vec{
-    float x,y,z;
+struct Vec {
+    float x, y, z;
 };
 
 #include "dolphin/types.h"
 
-#include "os/OS.h"
 #include "functions.h"
+#include "os/OS.h"
 #include "variables.h"
 
 #endif
\ No newline at end of file
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 258d99f909..b0b9db1f60 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
@@ -3,9 +3,6 @@
 
 #include "dolphin/types.h"
 
-class mDoDVDThd_command_c {
-
-};
-
+class mDoDVDThd_command_c {};
 
 #endif
\ No newline at end of file
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 41428b85c2..302c5c188f 100644
--- a/include/m_Do/m_Do_main/m_Do_main.h
+++ b/include/m_Do/m_Do_main/m_Do_main.h
@@ -1,22 +1,20 @@
-#include "dolphin/types.h"
-#include "JSystem/JKernel/JKRHeap/JKRHeap.h"
 #include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
+#include "JSystem/JKernel/JKRHeap/JKRHeap.h"
+#include "dolphin/types.h"
 
 class HeapCheck {
-    public:
-     void CheckHeap1(void);
-     s32 getUsedCount(void) const;
-     void heapDisplay(void) const;
-     
+public:
+    void CheckHeap1(void);
+    s32 getUsedCount(void) const;
+    void heapDisplay(void) const;
 
-    private:
-     char* names[2];
-     JKRExpHeap* heap;
-     s32 max_total_used_size;
-     s32 max_total_free_size;
-     u8 unk20[8]; // 8 bytes
-     u32 heap_size;
-     u32 used_count;
-     u32 total_used_size;
-     
+private:
+    char* names[2];
+    JKRExpHeap* heap;
+    s32 max_total_used_size;
+    s32 max_total_free_size;
+    u8 unk20[8];  // 8 bytes
+    u32 heap_size;
+    u32 used_count;
+    u32 total_used_size;
 };
\ No newline at end of file
diff --git a/include/os/OS.h b/include/os/OS.h
index b9e7db00a9..de2a2191e3 100644
--- a/include/os/OS.h
+++ b/include/os/OS.h
@@ -1,9 +1,9 @@
-// at some point: we should split this up into various OS/... headers. but not yet, since barely any files include this atm.
+// at some point: we should split this up into various OS/... headers. but not yet, since barely any
+// files include this atm.
 
 #ifndef __OS_H__
 #define __OS_H__
 
-
 /* TODO: more structs, and get rid of the ones that are faked! */
 
 struct OSMutex {
@@ -11,29 +11,29 @@ struct OSMutex {
 };
 
 struct OSMutexLink {
-    struct OSMutex *prev;
-    struct OSMutex *next;
+    struct OSMutex* prev;
+    struct OSMutex* next;
 };
 
 struct OSMutexQueue {
-    struct OSMutex *prev;
-    struct OSMutex *next;
+    struct OSMutex* prev;
+    struct OSMutex* next;
 };
 
 struct OSThread {
     u8 unk[792];
 };
 
-typedef void (*OSSwitchThreadCallback)(OSThread *from, OSThread *to);
+typedef void (*OSSwitchThreadCallback)(OSThread* from, OSThread* to);
 
 struct OSThreadLink {
-    struct OSThread * prev;
-    struct OSThread * next;
+    struct OSThread* prev;
+    struct OSThread* next;
 };
 
 struct OSThreadQueue {
-    struct OSThread * head;
-    struct OSThread * tail;
+    struct OSThread* head;
+    struct OSThread* tail;
 };
 
 struct OSCond {
@@ -45,7 +45,7 @@ typedef void* OSMessage;
 struct OSMessageQueue {
     struct OSThreadQueue sending_queue;
     struct OSThreadQueue receiving_queue;
-    void **message_array;
+    void** message_array;
     s32 num_messages;
     s32 first_index;
     s32 num_used;
@@ -71,84 +71,84 @@ struct OSCalendarTime {
 typedef s32 OSHeapHandle;
 
 typedef enum OSSoundMode {
-    SOUND_MODE_MONO=0,
-    SOUND_MODE_STEREO=1,
+    SOUND_MODE_MONO = 0,
+    SOUND_MODE_STEREO = 1,
 
-    __SOUND_MODE_FORCE_ENUM_U32=0xffffffff,
+    __SOUND_MODE_FORCE_ENUM_U32 = 0xffffffff,
 } OSSoundMode;
 
 extern "C" {
-    s32 OSEnableScheduler(void);
-    s32 OSDisableScheduler(void);
-    s32 OSCheckActiveThreads(void);
-    OSThread* OSGetCurrentThread(void);
+s32 OSEnableScheduler(void);
+s32 OSDisableScheduler(void);
+s32 OSCheckActiveThreads(void);
+OSThread* OSGetCurrentThread(void);
 
-    s32 OSSuspendThread(OSThread* thread);
-    s32 OSSetThreadPriority(OSThread* thread, u32 pri);
-    s32 OSGetThreadPriority(OSThread* thread);
-    s32 OSCreateThread(OSThread* thread, void* (*func)(void*), void* param,
-                    void* stack, u32 stackSize, int param_6, int param_7);
-    void OSCancelThread(OSThread* thread);
-    void OSDetachThread(OSThread* thread);
-    s32 OSResumeThread(OSThread *thread);
-    void OSExitThread(void *exit_val);
-    bool OSIsThreadSuspended(OSThread* thread);
-    bool OSIsThreadTerminated(OSThread* thread);
-    OSSwitchThreadCallback OSSetSwitchThreadCallback(OSSwitchThreadCallback *callback);
+s32 OSSuspendThread(OSThread* thread);
+s32 OSSetThreadPriority(OSThread* thread, u32 pri);
+s32 OSGetThreadPriority(OSThread* thread);
+s32 OSCreateThread(OSThread* thread, void* (*func)(void*), void* param, void* stack, u32 stackSize,
+                   int param_6, int param_7);
+void OSCancelThread(OSThread* thread);
+void OSDetachThread(OSThread* thread);
+s32 OSResumeThread(OSThread* thread);
+void OSExitThread(void* exit_val);
+bool OSIsThreadSuspended(OSThread* thread);
+bool OSIsThreadTerminated(OSThread* thread);
+OSSwitchThreadCallback OSSetSwitchThreadCallback(OSSwitchThreadCallback* callback);
 
-    void OSInitMessageQueue(OSMessageQueue *queue, OSMessage* messages, int message_count);
-    void OSReceiveMessage(OSMessageQueue *queue, OSMessage message, int flags);
-    void OSSendMessage(OSMessageQueue *queue, OSMessage message, int flags);
+void OSInitMessageQueue(OSMessageQueue* queue, OSMessage* messages, int message_count);
+void OSReceiveMessage(OSMessageQueue* queue, OSMessage message, int flags);
+void OSSendMessage(OSMessageQueue* queue, OSMessage message, int flags);
 
-    s32 OSGetConsoleType(void);
-    s32 OSGetResetCode(void);
+s32 OSGetConsoleType(void);
+s32 OSGetResetCode(void);
 
-    OSSoundMode OSGetSoundMode(void);
-    void OSSetSoundMode(OSSoundMode mode);
+OSSoundMode OSGetSoundMode(void);
+void OSSetSoundMode(OSSoundMode mode);
 
-    void OSReportInit(void);
-    void OSAttention(char *msg, ...);
-    void OSPanic(char *file, s32 line, char* fmt, ...);
-    void OSReport(char *fmt, ...);
-    void OSReport_Error(char* fmt, ...);
-    void OSReport_FatalError(char* fmt, ...);
-    void OSReport_System(char* fmt, ...);
-    void OSReport_Warning(char* fmt, ...);
-    void OSReportDisable(void);
-    void OSReportEnable(void);
-    void OSReportForceEnableOff(void);
-    void OSReportForceEnableOn(void);
-    void OSReportInit(void);
-    void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32);
-    void OSVAttention(char *, /*__gnuc_va_list*/ void*);
+void OSReportInit(void);
+void OSAttention(char* msg, ...);
+void OSPanic(char* file, s32 line, char* fmt, ...);
+void OSReport(char* fmt, ...);
+void OSReport_Error(char* fmt, ...);
+void OSReport_FatalError(char* fmt, ...);
+void OSReport_System(char* fmt, ...);
+void OSReport_Warning(char* fmt, ...);
+void OSReportDisable(void);
+void OSReportEnable(void);
+void OSReportForceEnableOff(void);
+void OSReportForceEnableOn(void);
+void OSReportInit(void);
+void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32);
+void OSVAttention(char*, /*__gnuc_va_list*/ void*);
 
-    void OSTicksToCalendarTime(OSTime ticks, OSCalendarTime *out_time);
-    OSTime OSGetTime(void);
-    OSTick OSGetTick(void);
+void OSTicksToCalendarTime(OSTime ticks, OSCalendarTime* out_time);
+OSTime OSGetTime(void);
+OSTick OSGetTick(void);
 
-    u32 OSGetArenaLo();
-    u32 OSGetArenaHi();
-    u32 OSInitAlloc(u32 low, u32 high, int param_3);
-    void OSSetArenaLo(u32 param_1);
-    void OSSetArenaHi(u32 param_1);
-    void OSAllocFromArenaLo(u32 size, int alignment);
+u32 OSGetArenaLo();
+u32 OSGetArenaHi();
+u32 OSInitAlloc(u32 low, u32 high, int param_3);
+void OSSetArenaLo(u32 param_1);
+void OSSetArenaHi(u32 param_1);
+void OSAllocFromArenaLo(u32 size, int alignment);
 
-    // void OSCancelAlarm(OSAlarm *alarm);
+// void OSCancelAlarm(OSAlarm *alarm);
 
-    void OSInitMutex(OSMutex *mutex);
-    void OSLockMutex(OSMutex *mutex);
-    void OSTryLockMutex(OSMutex *mutex);
-    void OSUnlockMutex(OSMutex *mutex);
+void OSInitMutex(OSMutex* mutex);
+void OSLockMutex(OSMutex* mutex);
+void OSTryLockMutex(OSMutex* mutex);
+void OSUnlockMutex(OSMutex* mutex);
 
-    s32 OSDisableInterrupts();
-    s32 OSEnableInterrupts();
-    s32 OSRestoreInterrupts(s32 level);
+s32 OSDisableInterrupts();
+s32 OSEnableInterrupts();
+s32 OSRestoreInterrupts(s32 level);
 
-    void OSResetSystem(s32 param_1, u32 param_2, s32 param_3);
+void OSResetSystem(s32 param_1, u32 param_2, s32 param_3);
 
-    void OSSetSaveRegion(void* start, void* end);
+void OSSetSaveRegion(void* start, void* end);
 
-    void LCDisable(void);
+void LCDisable(void);
 };
 
 #endif
\ No newline at end of file
diff --git a/include/variables.h b/include/variables.h
index d111695026..937c896f9e 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -81,23 +81,23 @@ extern u8 lbl_80450C90;
 #define _SDA2_BASE_(dummy) 0
 
 // func_802CE138
-extern void* lbl_803CBF70; // JKRHeap::__vt
+extern void* lbl_803CBF70;  // JKRHeap::__vt
 
 class JKRHeap;
-extern JKRHeap* lbl_80451370; // JKRHeap::sSystemHeap
-extern JKRHeap* lbl_80451378; // JKRHeap::sRootHeap
-extern JKRHeap* lbl_80451374; // JKRHeap::sCurrentHeap
-extern void* lbl_8045137C;    // JKRHeap::mErrorHandler
+extern JKRHeap* lbl_80451370;  // JKRHeap::sSystemHeap
+extern JKRHeap* lbl_80451378;  // JKRHeap::sRootHeap
+extern JKRHeap* lbl_80451374;  // JKRHeap::sCurrentHeap
+extern void* lbl_8045137C;     // JKRHeap::mErrorHandler
 
-extern bool lbl_804508B0; // ::*fill*
-extern bool lbl_80451380; // DAT_80451380
+extern bool lbl_804508B0;  // ::*fill*
+extern bool lbl_80451380;  // DAT_80451380
 
 // func_802CE378
-extern void* lbl_80451384; // JKRHeap::mCodeStart
-extern void* lbl_80451388; // JKRHeap::mCodeEnd
-extern void* lbl_8045138C; // JKRHeap::mUserRamStart
-extern void* lbl_80451390; // JKRHeap::mUserRamEnd
-extern u32 lbl_80451394;   // JKRHeap::mMemorySize
+extern void* lbl_80451384;  // JKRHeap::mCodeStart
+extern void* lbl_80451388;  // JKRHeap::mCodeEnd
+extern void* lbl_8045138C;  // JKRHeap::mUserRamStart
+extern void* lbl_80451390;  // JKRHeap::mUserRamEnd
+extern u32 lbl_80451394;    // JKRHeap::mMemorySize
 
 extern u8 lbl_80000000;
 extern u32 lbl_80000028;
@@ -106,10 +106,10 @@ extern u32 lbl_80000028;
 #define OS_GLOBAL_ADDR(T, ADDR) ((T*)((void*)ADDR))
 
 // func_802CEB40
-extern char lbl_8039CAD8[12]; // "JKRHeap.cpp"
+extern char lbl_8039CAD8[12];  // "JKRHeap.cpp"
 
 // func_802D147C
-extern void* lbl_803CC0F0; // JKRDisposer::__vt
+extern void* lbl_803CC0F0;  // JKRDisposer::__vt
 
 // func_802C333C
 extern u8 lbl_803CB980[0x48];
@@ -180,74 +180,74 @@ extern u32 lbl_80451334;
 
 // Z2SoundLib SInstance
 struct Z2SceneMgr;
-extern Z2SceneMgr* lbl_80450B80; // Z2SceneMgr sInstance
+extern Z2SceneMgr* lbl_80450B80;  // Z2SceneMgr sInstance
 struct Z2SoundMgr;
-extern Z2SoundMgr* lbl_80450B60; // Z2SoundMgr sInstance
+extern Z2SoundMgr* lbl_80450B60;  // Z2SoundMgr sInstance
 struct Z2SoundObjMgr;
-extern Z2SoundObjMgr* lbl_80450B48; // Z2SoundObjMgr sInstance
+extern Z2SoundObjMgr* lbl_80450B48;  // Z2SoundObjMgr sInstance
 struct Z2SpeechMgr2;
-extern Z2SpeechMgr2* lbl_80450B70; // Z2SpeechMgr2 sInstance
+extern Z2SpeechMgr2* lbl_80450B70;  // Z2SpeechMgr2 sInstance
 extern void* lbl_803CC114;          // JKRThread::__vt
 
 class JKRThreadSwitch;
-extern void* lbl_803CC100[5];         // JKRThreadSwitch::__vt
-extern u32 lbl_804513B4;              // JKRThreadSwitch::sTotalCount
-extern u32 lbl_804513BC;              // DAT_804513bc
-extern u32 lbl_804513B8;              // JKRThreadSwitch::sTotalStart
-extern JKRThreadSwitch* lbl_804513B0; // JKRThreadSwitch::sManager
-extern void* lbl_804513C0;            // JKRThreadSwitch::mUserPreCallback
-extern void* lbl_804513C4;            //  JKRThreadSwitch::mUserPostCallback
+extern void* lbl_803CC100[5];          // JKRThreadSwitch::__vt
+extern u32 lbl_804513B4;               // JKRThreadSwitch::sTotalCount
+extern u32 lbl_804513BC;               // DAT_804513bc
+extern u32 lbl_804513B8;               // JKRThreadSwitch::sTotalStart
+extern JKRThreadSwitch* lbl_804513B0;  // JKRThreadSwitch::sManager
+extern void* lbl_804513C0;             // JKRThreadSwitch::mUserPreCallback
+extern void* lbl_804513C4;             //  JKRThreadSwitch::mUserPostCallback
 
-extern char lbl_8039CFA8[1]; // 8039cfdc-0x34 "JKRThreadSwitch: currentHeap destroyed.\n"
+extern char lbl_8039CFA8[1];  // 8039cfdc-0x34 "JKRThreadSwitch: currentHeap destroyed.\n"
 
-extern float lbl_80455FC0;  // JKernel::@934 = 100.0
-extern float lbl_80455FC4;  // JKernel::@935 = 1000.0
-extern double lbl_80455FC8; // JKernel::@937 = 4.503599627370496E15
+extern float lbl_80455FC0;   // JKernel::@934 = 100.0
+extern float lbl_80455FC4;   // JKernel::@935 = 1000.0
+extern double lbl_80455FC8;  // JKernel::@937 = 4.503599627370496E15
 
 class JKRDvdFile;
-extern JSUList<JKRDvdFile> lbl_8043436C; // JKRDvdFile::sDvdList
-extern u8 lbl_803CC438;                  // JKRDvdFile::__vt
-extern u8 lbl_80434360;                  // JKernel::@657 (global destructor chain)
-extern char lbl_8039D260[12];                  // "JKRDvdFile.cpp"
-extern u8 lbl_803CC328;                  // JKRFile::__vt
+extern JSUList<JKRDvdFile> lbl_8043436C;  // JKRDvdFile::sDvdList
+extern u8 lbl_803CC438;                   // JKRDvdFile::__vt
+extern u8 lbl_80434360;                   // JKernel::@657 (global destructor chain)
+extern char lbl_8039D260[12];             // "JKRDvdFile.cpp"
+extern u8 lbl_803CC328;                   // JKRFile::__vt
 
 class JKRFileLoader;
-extern JKRFileLoader* lbl_80451418;         // JKRFileLoader::sCurrentVolume
-extern u8 lbl_8039D158;                     // "/"
-extern u8 lbl_803CC238;                     // JKRFileCache::__vt
-extern JSUList<JKRFileLoader> lbl_80434354; // JKRFileLoader::sVolumeList
-extern u8 lbl_803CC218;                     // JKRArcFinder::__vt
-extern u8 lbl_803CC228;                     // JKRFileFinder::__vt
-extern u8 lbl_803CC208;                     // JKRDvdFinder::__vt
-extern u8 lbl_8039D150;                     // "/"
-extern u8 lbl_803CC1C8;                     // JKRFileLoader::__vt
-extern u8 lbl_804508C0;                     // "/" JKernel::rootPath$2498
-extern u8 lbl_80434348;                     // JKernel::@2182 (global destructor chain)
-extern u8 lbl_803D2D18[256];                // MSL_C.PPCEABI.bare.H::__lower_map
-extern u8 lbl_803CC090;                     // JKRAssertHeap::__vt
-extern u8 lbl_80451398;                     // JKernel::DBfoundSize
-extern u8 lbl_8045139C;                     // JKernel::DBfoundOffset
-extern u8 lbl_804513A0;                     // JKernel::DBfoundBlock
-extern u8 lbl_804513A4;                     // JKernel::DBnewFreeBlock
-extern u8 lbl_804513A8;                     // JKernel::DBnewUsedBlock
-extern float lbl_80455F98;                  // JKernel::@1121 = 100.0
-extern u8 lbl_803CBFD0;                     // JKRExpHeap::__vt
-extern u8 lbl_8039CAF0;                     // ":::cannot alloc memory (0x%x byte).\n"
-extern double lbl_80455FA0;                 // JKernel::@1123 = 4.503599627370496E15
-extern u8 lbl_803CC030;                     // JKRSolidHeap::__vt
-extern double lbl_80455FB8;                 // JKernel::@697 = 4.503599627370496E15
-extern u8 lbl_8039CE50;                     // "allocFromHead: cannot alloc memory (0x%x byte).\n"
-extern double lbl_80455FB0;                 // JKernel::@695 = 4.503601774854144E15
-extern float lbl_80455FA8;                  // JKernel::@693 = 100.0
-extern u8 lbl_80451420;                     // JKRArchive::sCurrentDirID
-extern u8 lbl_803CC288;                     // JKRArchive::__vt
+extern JKRFileLoader* lbl_80451418;          // JKRFileLoader::sCurrentVolume
+extern u8 lbl_8039D158;                      // "/"
+extern u8 lbl_803CC238;                      // JKRFileCache::__vt
+extern JSUList<JKRFileLoader> lbl_80434354;  // JKRFileLoader::sVolumeList
+extern u8 lbl_803CC218;                      // JKRArcFinder::__vt
+extern u8 lbl_803CC228;                      // JKRFileFinder::__vt
+extern u8 lbl_803CC208;                      // JKRDvdFinder::__vt
+extern u8 lbl_8039D150;                      // "/"
+extern u8 lbl_803CC1C8;                      // JKRFileLoader::__vt
+extern u8 lbl_804508C0;                      // "/" JKernel::rootPath$2498
+extern u8 lbl_80434348;                      // JKernel::@2182 (global destructor chain)
+extern u8 lbl_803D2D18[256];                 // MSL_C.PPCEABI.bare.H::__lower_map
+extern u8 lbl_803CC090;                      // JKRAssertHeap::__vt
+extern u8 lbl_80451398;                      // JKernel::DBfoundSize
+extern u8 lbl_8045139C;                      // JKernel::DBfoundOffset
+extern u8 lbl_804513A0;                      // JKernel::DBfoundBlock
+extern u8 lbl_804513A4;                      // JKernel::DBnewFreeBlock
+extern u8 lbl_804513A8;                      // JKernel::DBnewUsedBlock
+extern float lbl_80455F98;                   // JKernel::@1121 = 100.0
+extern u8 lbl_803CBFD0;                      // JKRExpHeap::__vt
+extern u8 lbl_8039CAF0;                      // ":::cannot alloc memory (0x%x byte).\n"
+extern double lbl_80455FA0;                  // JKernel::@1123 = 4.503599627370496E15
+extern u8 lbl_803CC030;                      // JKRSolidHeap::__vt
+extern double lbl_80455FB8;                  // JKernel::@697 = 4.503599627370496E15
+extern u8 lbl_8039CE50;                      // "allocFromHead: cannot alloc memory (0x%x byte).\n"
+extern double lbl_80455FB0;                  // JKernel::@695 = 4.503601774854144E15
+extern float lbl_80455FA8;                   // JKernel::@693 = 100.0
+extern u8 lbl_80451420;                      // JKRArchive::sCurrentDirID
+extern u8 lbl_803CC288;                      // JKRArchive::__vt
 
-//d_item
+// d_item
 extern float lbl_80452BD8;
 extern float lbl_80452BDC;
 extern double lbl_80452BE0;
 extern u8 lbl_80450D64;
-struct unkEvent{  //figure out what this is later
+struct unkEvent {  // figure out what this is later
     u8 unk0[0x235];
     u16 unk566;
     u8 unk567[0x439];
@@ -256,123 +256,123 @@ extern unkEvent lbl_803A7288;
 extern u8 lbl_8037B0D0[0x8];
 
 class JKRThread;
-extern JSUList<JKRThread> lbl_8043428C;   // JSUList<JKRThread> JKRThread::sThreadList
+extern JSUList<JKRThread> lbl_8043428C;  // JSUList<JKRThread> JKRThread::sThreadList
 
-extern u8 lbl_803CC398; // JKRDvdArchive::__vt
-extern u8 lbl_8039D1B0; // "JKRDvdArchive.cpp"
+extern u8 lbl_803CC398;  // JKRDvdArchive::__vt
+extern u8 lbl_8039D1B0;  // "JKRDvdArchive.cpp"
 
-extern u8 lbl_803CC2D8; // JKRMemArchive::__vt
-extern u8 lbl_8039D160; // "JKRMemArchive.cpp"
+extern u8 lbl_803CC2D8;  // JKRMemArchive::__vt
+extern u8 lbl_8039D160;  // "JKRMemArchive.cpp"
 
-extern u8 lbl_803CC348; // JKRAramArchive::__vt
-extern u8 lbl_8039D188; // "JKRAramArchive.cpp"
+extern u8 lbl_803CC348;  // JKRAramArchive::__vt
+extern u8 lbl_8039D188;  // "JKRAramArchive.cpp"
 
-extern u8 lbl_803CC3E8; // JKRCompArchive::__vt
-extern u8 lbl_8039D220; // "JKRCompArchive.cpp"
+extern u8 lbl_803CC3E8;  // JKRCompArchive::__vt
+extern u8 lbl_8039D220;  // "JKRCompArchive.cpp"
 
-extern u8 lbl_803CC460[32];         // JKRDecomp::sMessageBuffer
-extern OSMessageQueue lbl_803CC480; // JKRDecomp::sMessageQueue
-extern u8 lbl_804514B0;             // JKRDecomp::sDecompObject
-extern u8 lbl_803CC4A0;             // JKRDecomp::__vt
+extern u8 lbl_803CC460[32];          // JKRDecomp::sMessageBuffer
+extern OSMessageQueue lbl_803CC480;  // JKRDecomp::sMessageQueue
+extern u8 lbl_804514B0;              // JKRDecomp::sDecompObject
+extern u8 lbl_803CC4A0;              // JKRDecomp::__vt
 
-extern u8 lbl_80434378; // JKernel::@491 (global destructor chain)
-extern u8 lbl_80451428; // JKernel::szpBuf
-extern u8 lbl_8045142C; // JKernel::szpEnd
-extern u8 lbl_80451430; // JKernel::refBuf
-extern u8 lbl_80451434; // JKernel::refEnd
-extern u8 lbl_80451438; // JKernel::refCurrent
-extern u8 lbl_8045143C; // JKernel::srcOffset
-extern u8 lbl_80451440; // JKernel::transLeft
-extern u8 lbl_80451444; // JKernel::srcLimit
-extern u8 lbl_80451448; // JKernel::srcFile
-extern u8 lbl_8045144C; // JKernel::fileOffset
-extern u8 lbl_80451450; // JKernel::readCount
-extern u8 lbl_80451454; // JKernel::maxDest
-extern u8 lbl_8045145C; // JKernel::tsPtr
-extern u8 lbl_80451458; // DAT_80451458 (init global mutex)
-extern u8 lbl_80451460; // JKernel::tsArea
+extern u8 lbl_80434378;  // JKernel::@491 (global destructor chain)
+extern u8 lbl_80451428;  // JKernel::szpBuf
+extern u8 lbl_8045142C;  // JKernel::szpEnd
+extern u8 lbl_80451430;  // JKernel::refBuf
+extern u8 lbl_80451434;  // JKernel::refEnd
+extern u8 lbl_80451438;  // JKernel::refCurrent
+extern u8 lbl_8045143C;  // JKernel::srcOffset
+extern u8 lbl_80451440;  // JKernel::transLeft
+extern u8 lbl_80451444;  // JKernel::srcLimit
+extern u8 lbl_80451448;  // JKernel::srcFile
+extern u8 lbl_8045144C;  // JKernel::fileOffset
+extern u8 lbl_80451450;  // JKernel::readCount
+extern u8 lbl_80451454;  // JKernel::maxDest
+extern u8 lbl_8045145C;  // JKernel::tsPtr
+extern u8 lbl_80451458;  // DAT_80451458 (init global mutex)
+extern u8 lbl_80451460;  // JKernel::tsArea
 class JKRDMCommand;
-extern JSUList<JKRDMCommand> lbl_80434384; // JKRDvdRipper::sDvdAsyncList
-extern u8 lbl_80434390;                    // JKernel::decompMutex
+extern JSUList<JKRDMCommand> lbl_80434384;  // JKRDvdRipper::sDvdAsyncList
+extern u8 lbl_80434390;                     // JKernel::decompMutex
 extern u8 lbl_804508C8;
-extern u8 lbl_804508CC; // JKRDvdRipper::sSZSBufferSize
-extern u8 lbl_8039D290; // "JKRDvdRipper.cpp"
+extern u8 lbl_804508CC;  // JKRDvdRipper::sSZSBufferSize
+extern u8 lbl_8039D290;  // "JKRDvdRipper.cpp"
 
-extern u8 lbl_803CC178; // JKRAramBlock::__vt
+extern u8 lbl_803CC178;  // JKRAramBlock::__vt
 
-extern u8 lbl_803CC168; // JKRAramHeap::__vt
-extern u8 lbl_80434300; // JKernel::@297 (global destructor chain)
+extern u8 lbl_803CC168;  // JKRAramHeap::__vt
+extern u8 lbl_80434300;  // JKernel::@297 (global destructor chain)
 class JKRAramBlock;
-extern JSUList<JKRAramBlock> lbl_8043430C; // JKRAramHeap::sAramList
+extern JSUList<JKRAramBlock> lbl_8043430C;  // JKRAramHeap::sAramList
 
-extern u8 lbl_80434324; // JKRAramPiece::sAramPieceCommandList
-extern u8 lbl_80434330; // JKRAramPiece::mMutex
-extern u8 lbl_8039D0B8; // "direction = %x\n"
-extern u8 lbl_80434318; // JKernel::@492 (global destructor chain)
-extern u8 lbl_803CC138; // JKRAram::sMessageQueue
+extern u8 lbl_80434324;  // JKRAramPiece::sAramPieceCommandList
+extern u8 lbl_80434330;  // JKRAramPiece::mMutex
+extern u8 lbl_8039D0B8;  // "direction = %x\n"
+extern u8 lbl_80434318;  // JKernel::@492 (global destructor chain)
+extern u8 lbl_803CC138;  // JKRAram::sMessageQueue
 
-extern u8 lbl_80451408; // JKRAramStream::sAramStreamObject
-extern u8 lbl_80451414; // JKRAramStream::transHeap
-extern u8 lbl_8039D120; // "JKRAramStream.cpp"
-extern u8 lbl_8045140C; // JKRAramStream::transBuffer
-extern u8 lbl_80451410; // JKRAramStream::transSize
-extern u8 lbl_803CC1B8; // JKRAramStream::__vt
-extern u8 lbl_803CC198; // JKRAramStream::sMessageQueue
-extern u8 lbl_803CC188; // JKRAramStream::sMessageBuffer
+extern u8 lbl_80451408;  // JKRAramStream::sAramStreamObject
+extern u8 lbl_80451414;  // JKRAramStream::transHeap
+extern u8 lbl_8039D120;  // "JKRAramStream.cpp"
+extern u8 lbl_8045140C;  // JKRAramStream::transBuffer
+extern u8 lbl_80451410;  // JKRAramStream::transSize
+extern u8 lbl_803CC1B8;  // JKRAramStream::__vt
+extern u8 lbl_803CC198;  // JKRAramStream::sMessageQueue
+extern u8 lbl_803CC188;  // JKRAramStream::sMessageBuffer
 
-extern u8 lbl_804508D0; // DAT_804508d0
-extern u8 lbl_80451468; // JKernel::szpBuf (static?)
-extern u8 lbl_8045146C; // JKernel::szpEnd (static?)
-extern u8 lbl_80451470; // JKernel::refBuf (static?)
-extern u8 lbl_80451474; // JKernel::refEnd (static?)
-extern u8 lbl_80451478; // JKernel::refCurrent (static?)
-extern u8 lbl_8045147C; // JKernel::dmaBuf (static?)
-extern u8 lbl_80451480; // JKernel::dmaEnd (static?)
-extern u8 lbl_80451484; // JKernel::dmaCurrent (static?)
-extern u8 lbl_80451488; // JKernel::srcOffset (static?)
-extern u8 lbl_8045148C; // JKernel::transLeft (static?)
-extern u8 lbl_80451490; // JKernel::srcLimit (static?)
-extern u8 lbl_80451494; // JKernel::srcFile (static?)
-extern u8 lbl_80451498; // JKernel::fileOffset (static?)
-extern u8 lbl_8045149C; // JKernel::readCount (static?)
-extern u8 lbl_804514A0; // JKernel::maxDest (static?)
-extern u8 lbl_804514A4; // DAT_804514a4 (init global mutex)
-extern u8 lbl_804514A8; // JKernel::tsPtr (static?)
-extern u8 lbl_804514AC; // JKernel::tsArea (static?)
+extern u8 lbl_804508D0;  // DAT_804508d0
+extern u8 lbl_80451468;  // JKernel::szpBuf (static?)
+extern u8 lbl_8045146C;  // JKernel::szpEnd (static?)
+extern u8 lbl_80451470;  // JKernel::refBuf (static?)
+extern u8 lbl_80451474;  // JKernel::refEnd (static?)
+extern u8 lbl_80451478;  // JKernel::refCurrent (static?)
+extern u8 lbl_8045147C;  // JKernel::dmaBuf (static?)
+extern u8 lbl_80451480;  // JKernel::dmaEnd (static?)
+extern u8 lbl_80451484;  // JKernel::dmaCurrent (static?)
+extern u8 lbl_80451488;  // JKernel::srcOffset (static?)
+extern u8 lbl_8045148C;  // JKernel::transLeft (static?)
+extern u8 lbl_80451490;  // JKernel::srcLimit (static?)
+extern u8 lbl_80451494;  // JKernel::srcFile (static?)
+extern u8 lbl_80451498;  // JKernel::fileOffset (static?)
+extern u8 lbl_8045149C;  // JKernel::readCount (static?)
+extern u8 lbl_804514A0;  // JKernel::maxDest (static?)
+extern u8 lbl_804514A4;  // DAT_804514a4 (init global mutex)
+extern u8 lbl_804514A8;  // JKernel::tsPtr (static?)
+extern u8 lbl_804514AC;  // JKernel::tsArea (static?)
 
-extern u8 lbl_804508D4; // JKRDvdAramRipper::sSZSBufferSize
-extern u8 lbl_803CC4B0; // JSURandomInputStream::__vt
-extern u8 lbl_804343A8; // JKernel::@301 (global destructor chain)
-extern u8 lbl_804343B4; // JKRDvdAramRipper::sDvdAramAsyncList
-extern u8 lbl_804343C0; // JKernel::decompMutex
-extern u8 lbl_803CC518; // JSUFileInputStream::__vt
+extern u8 lbl_804508D4;  // JKRDvdAramRipper::sSZSBufferSize
+extern u8 lbl_803CC4B0;  // JSURandomInputStream::__vt
+extern u8 lbl_804343A8;  // JKernel::@301 (global destructor chain)
+extern u8 lbl_804343B4;  // JKRDvdAramRipper::sDvdAramAsyncList
+extern u8 lbl_804343C0;  // JKernel::decompMutex
+extern u8 lbl_803CC518;  // JSUFileInputStream::__vt
 
 class JKRAram;
-extern JKRAram* lbl_804513C8; // JKRAram::sAramObject
-extern u8 lbl_804513CC; // JKernel::szpBuf (static?)
-extern u8 lbl_804513D0; // JKernel::szpEnd (static?)
-extern u8 lbl_804513D4; // JKernel::refBuf (static?)
-extern u8 lbl_804513D8; // JKernel::refEnd (static?)
-extern u8 lbl_804513DC; // JKernel::refCurrent (static?)
-extern u8 lbl_804513E0; // JKernel::srcOffset (static?)
-extern u8 lbl_804513E4; // JKernel::transLeft (static?)
-extern u8 lbl_804513E8; // JKernel::srcLimit (static?)
-extern u8 lbl_804513EC; // JKernel::srcAddress (static?)
-extern u8 lbl_804513F0; // JKernel::fileOffset (static?)
-extern u8 lbl_804513F4; // JKernel::readCount (static?)
-extern u8 lbl_804513F8; // JKernel::maxDest (static?)
-extern u8 lbl_804513FC; // DAT_804513fc (init global mutex)
-extern u8 lbl_80451400; // JKernel::tsPtr (static?)
-extern u8 lbl_80451404; // JKernel::tsArea (static?)
+extern JKRAram* lbl_804513C8;  // JKRAram::sAramObject
+extern u8 lbl_804513CC;        // JKernel::szpBuf (static?)
+extern u8 lbl_804513D0;        // JKernel::szpEnd (static?)
+extern u8 lbl_804513D4;        // JKernel::refBuf (static?)
+extern u8 lbl_804513D8;        // JKernel::refEnd (static?)
+extern u8 lbl_804513DC;        // JKernel::refCurrent (static?)
+extern u8 lbl_804513E0;        // JKernel::srcOffset (static?)
+extern u8 lbl_804513E4;        // JKernel::transLeft (static?)
+extern u8 lbl_804513E8;        // JKernel::srcLimit (static?)
+extern u8 lbl_804513EC;        // JKernel::srcAddress (static?)
+extern u8 lbl_804513F0;        // JKernel::fileOffset (static?)
+extern u8 lbl_804513F4;        // JKernel::readCount (static?)
+extern u8 lbl_804513F8;        // JKernel::maxDest (static?)
+extern u8 lbl_804513FC;        // DAT_804513fc (init global mutex)
+extern u8 lbl_80451400;        // JKernel::tsPtr (static?)
+extern u8 lbl_80451404;        // JKernel::tsArea (static?)
 
-extern u8 lbl_803CC158; // JKRAram::__vt
-extern u8 lbl_8039D078; // "JKRAram.cpp"
-extern u8 lbl_804342D0; // JKernel::@492 (global destructor chain)
-extern u8 lbl_803CC138; // JKRAram::sMessageQueue
-extern u8 lbl_804342DC; // JKRAram::sAramCommandList
-extern u8 lbl_804342E8; // JKernel::decompMutex (static?)
-extern u8 lbl_804508B8; // JKRAram::sSZSBufferSize
-extern u8 lbl_803CC128; // JKRAram::sMessageBuffer
+extern u8 lbl_803CC158;  // JKRAram::__vt
+extern u8 lbl_8039D078;  // "JKRAram.cpp"
+extern u8 lbl_804342D0;  // JKernel::@492 (global destructor chain)
+extern u8 lbl_803CC138;  // JKRAram::sMessageQueue
+extern u8 lbl_804342DC;  // JKRAram::sAramCommandList
+extern u8 lbl_804342E8;  // JKernel::decompMutex (static?)
+extern u8 lbl_804508B8;  // JKRAram::sSZSBufferSize
+extern u8 lbl_803CC128;  // JKRAram::sMessageBuffer
 
 // m_Do_Reset
 // func_80015614
@@ -382,6 +382,6 @@ extern u8 lbl_80450BB8;
 extern char lbl_80374198[16];
 // func_8001574C
 extern bool lbl_80451501;
-extern void* lbl_804514EC; // JUTGamePad::C3ButtonReset::sCallback
-extern u32 lbl_804514F0; // JUTGamePad::C3ButtonReset::sCallbackArg
+extern void* lbl_804514EC;  // JUTGamePad::C3ButtonReset::sCallback
+extern u32 lbl_804514F0;    // JUTGamePad::C3ButtonReset::sCallbackArg
 extern u32 lbl_803ECF00;
\ No newline at end of file
diff --git a/libs/JSystem/JKernel/JKRAram.cpp b/libs/JSystem/JKernel/JKRAram.cpp
index e04efa172c..25f272d16c 100644
--- a/libs/JSystem/JKernel/JKRAram.cpp
+++ b/libs/JSystem/JKernel/JKRAram.cpp
@@ -3,72 +3,72 @@
 
 asm void JKRAram::create(u32, u32, long, long, long) {
     nofralloc
-    #include "JSystem/JKernel/JKRAram/asm/func_802D1FA4.s"
+#include "JSystem/JKernel/JKRAram/asm/func_802D1FA4.s"
 }
 
 asm JKRAram::JKRAram(u32, u32, long) {
     nofralloc
-    #include "JSystem/JKernel/JKRAram/asm/func_802D2040.s"
+#include "JSystem/JKernel/JKRAram/asm/func_802D2040.s"
 }
 
 asm JKRAram::~JKRAram() {
     nofralloc
-    #include "JSystem/JKernel/JKRAram/asm/func_802D214C.s"
+#include "JSystem/JKernel/JKRAram/asm/func_802D214C.s"
 }
 
 asm void* JKRAram::run(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRAram/asm/func_802D21DC.s"
+#include "JSystem/JKernel/JKRAram/asm/func_802D21DC.s"
 }
 
-asm void JKRAram::checkOkAddress(u8 *, u32, JKRAramBlock *, u32) {
+asm void JKRAram::checkOkAddress(u8*, u32, JKRAramBlock*, u32) {
     nofralloc
-    #include "JSystem/JKernel/JKRAram/asm/func_802D2248.s"
+#include "JSystem/JKernel/JKRAram/asm/func_802D2248.s"
 }
 
-asm void JKRAram::changeGroupIdIfNeed(u8 *, int) {
+asm void JKRAram::changeGroupIdIfNeed(u8*, int) {
     nofralloc
-    #include "JSystem/JKernel/JKRAram/asm/func_802D22DC.s"
+#include "JSystem/JKernel/JKRAram/asm/func_802D22DC.s"
 }
 
-asm void JKRAram::mainRamToAram(u8 *, u32, u32, JKRExpandSwitch, u32, JKRHeap *, int, u32 *) {
+asm void JKRAram::mainRamToAram(u8*, u32, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRAram/asm/func_802D233C.s"
+#include "JSystem/JKernel/JKRAram/asm/func_802D233C.s"
 }
 
-asm void JKRAram::aramToMainRam(u32, u8 *, u32, JKRExpandSwitch, u32, JKRHeap *, int, u32 *) {
+asm void JKRAram::aramToMainRam(u32, u8*, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRAram/asm/func_802D25B4.s"
+#include "JSystem/JKernel/JKRAram/asm/func_802D25B4.s"
 }
 
-asm void JKRDecompressFromAramToMainRam(u32, void *, u32, u32, u32, u32 *) {
+asm void JKRDecompressFromAramToMainRam(u32, void*, u32, u32, u32, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRAram/asm/func_802D2830.s"
+#include "JSystem/JKernel/JKRAram/asm/func_802D2830.s"
 }
 
-asm void decompSZS_subroutine(u8 *, u8 *) {
+asm void decompSZS_subroutine(u8*, u8*) {
     nofralloc
-    #include "JSystem/JKernel/JKRAram/asm/func_802D29A0.s"
+#include "JSystem/JKernel/JKRAram/asm/func_802D29A0.s"
 }
 
 asm void firstSrcData(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRAram/asm/func_802D2C40.s"
+#include "JSystem/JKernel/JKRAram/asm/func_802D2C40.s"
 }
 
-asm void nextSrcData(u8 *) {
+asm void nextSrcData(u8*) {
     nofralloc
-    #include "JSystem/JKernel/JKRAram/asm/func_802D2CE4.s"
+#include "JSystem/JKernel/JKRAram/asm/func_802D2CE4.s"
 }
 
 #if 0
 asm void __sinit_JKRAram_cpp {
     nofralloc
-    #include "JSystem/JKernel/JKRAram/asm/func_802D2DAC.s"
+#include "JSystem/JKernel/JKRAram/asm/func_802D2DAC.s"
 }
 
 asm JSUList<12JKRAMCommand>::~JSUList<12JKRAMCommand>(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRAram/asm/func_802D2DF0.s"
+#include "JSystem/JKernel/JKRAram/asm/func_802D2DF0.s"
 }
 #endif
diff --git a/libs/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/JKernel/JKRAramArchive.cpp
index 9c9c47ca4d..b4a1b7b55d 100644
--- a/libs/JSystem/JKernel/JKRAramArchive.cpp
+++ b/libs/JSystem/JKernel/JKRAramArchive.cpp
@@ -5,57 +5,57 @@
 
 asm JKRAramArchive::JKRAramArchive(long, JKRArchive::EMountDirection) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D70C0.s"
+#include "JSystem/JKernel/JKRAramArchive/asm/func_802D70C0.s"
 }
 
 asm JKRAramArchive::~JKRAramArchive() {
     nofralloc
-    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D7168.s"
+#include "JSystem/JKernel/JKRAramArchive/asm/func_802D7168.s"
 }
 
 asm void JKRAramArchive::open(long) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D72A8.s"
+#include "JSystem/JKernel/JKRAramArchive/asm/func_802D72A8.s"
 }
 
-asm void JKRAramArchive::fetchResource(JKRArchive::SDIFileEntry *, u32 *) {
+asm void JKRAramArchive::fetchResource(JKRArchive::SDIFileEntry*, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D75E0.s"
+#include "JSystem/JKernel/JKRAramArchive/asm/func_802D75E0.s"
 }
 
-asm void JKRAramArchive::fetchResource(void *, u32, JKRArchive::SDIFileEntry *, u32 *) {
+asm void JKRAramArchive::fetchResource(void*, u32, JKRArchive::SDIFileEntry*, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D76F4.s"
+#include "JSystem/JKernel/JKRAramArchive/asm/func_802D76F4.s"
 }
 
-asm void JKRAramArchive::getAramAddress_Entry(JKRArchive::SDIFileEntry *) {
+asm void JKRAramArchive::getAramAddress_Entry(JKRArchive::SDIFileEntry*) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D77F8.s"
+#include "JSystem/JKernel/JKRAramArchive/asm/func_802D77F8.s"
 }
 
-asm void JKRAramArchive::getAramAddress(char const *) {
+asm void JKRAramArchive::getAramAddress(char const*) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D781C.s"
+#include "JSystem/JKernel/JKRAramArchive/asm/func_802D781C.s"
 }
 
-asm void JKRAramArchive::fetchResource_subroutine(u32, u32, u8 *, u32, int) {
+asm void JKRAramArchive::fetchResource_subroutine(u32, u32, u8*, u32, int) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D7858.s"
+#include "JSystem/JKernel/JKRAramArchive/asm/func_802D7858.s"
 }
 
-asm void JKRAramArchive::fetchResource_subroutine(u32, u32, JKRHeap *, int, u8 **) {
+asm void JKRAramArchive::fetchResource_subroutine(u32, u32, JKRHeap*, int, u8**) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D7914.s"
+#include "JSystem/JKernel/JKRAramArchive/asm/func_802D7914.s"
 }
 
-asm void JKRAramArchive::getExpandedResSize(void const *) const {
+asm void JKRAramArchive::getExpandedResSize(void const*) const {
     nofralloc
-    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D7A64.s"
+#include "JSystem/JKernel/JKRAramArchive/asm/func_802D7A64.s"
 }
 
 #if 0
 asm JKRFile::~JKRFile() {
     nofralloc
-    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D7B90.s"
+#include "JSystem/JKernel/JKRAramArchive/asm/func_802D7B90.s"
 }
 #endif
diff --git a/libs/JSystem/JKernel/JKRAramBlock.cpp b/libs/JSystem/JKernel/JKRAramBlock.cpp
index 39aa6a2786..d8b654d678 100644
--- a/libs/JSystem/JKernel/JKRAramBlock.cpp
+++ b/libs/JSystem/JKernel/JKRAramBlock.cpp
@@ -3,21 +3,20 @@
 
 asm JKRAramBlock::JKRAramBlock(u32, u32, u32, u8, bool) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramBlock/asm/func_802D3304.s"
+#include "JSystem/JKernel/JKRAramBlock/asm/func_802D3304.s"
 }
 
 asm JKRAramBlock::~JKRAramBlock(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramBlock/asm/func_802D3378.s"
+#include "JSystem/JKernel/JKRAramBlock/asm/func_802D3378.s"
 }
 
-asm void JKRAramBlock::allocHead(u32, u8, JKRAramHeap *) {
+asm void JKRAramBlock::allocHead(u32, u8, JKRAramHeap*) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramBlock/asm/func_802D3434.s"
+#include "JSystem/JKernel/JKRAramBlock/asm/func_802D3434.s"
 }
 
-asm void JKRAramBlock::allocTail(u32, u8, JKRAramHeap *) {
+asm void JKRAramBlock::allocTail(u32, u8, JKRAramHeap*) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramBlock/asm/func_802D34D0.s"
+#include "JSystem/JKernel/JKRAramBlock/asm/func_802D34D0.s"
 }
-
diff --git a/libs/JSystem/JKernel/JKRAramHeap.cpp b/libs/JSystem/JKernel/JKRAramHeap.cpp
index 8549a2ec75..c02d3a5b5d 100644
--- a/libs/JSystem/JKernel/JKRAramHeap.cpp
+++ b/libs/JSystem/JKernel/JKRAramHeap.cpp
@@ -3,52 +3,52 @@
 
 asm JKRAramHeap::JKRAramHeap(u32, u32) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D2E44.s"
+#include "JSystem/JKernel/JKRAramHeap/asm/func_802D2E44.s"
 }
 
 asm JKRAramHeap::~JKRAramHeap(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D2F14.s"
+#include "JSystem/JKernel/JKRAramHeap/asm/func_802D2F14.s"
 }
 
 asm void JKRAramHeap::alloc(u32, JKRAramHeap::EAllocMode) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D2FBC.s"
+#include "JSystem/JKernel/JKRAramHeap/asm/func_802D2FBC.s"
 }
 
 asm void JKRAramHeap::allocFromHead(u32) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D3034.s"
+#include "JSystem/JKernel/JKRAramHeap/asm/func_802D3034.s"
 }
 
 asm void JKRAramHeap::allocFromTail(u32) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D30BC.s"
+#include "JSystem/JKernel/JKRAramHeap/asm/func_802D30BC.s"
 }
 
 asm void JKRAramHeap::getFreeSize(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D3134.s"
+#include "JSystem/JKernel/JKRAramHeap/asm/func_802D3134.s"
 }
 
 asm void JKRAramHeap::getTotalFreeSize(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D31AC.s"
+#include "JSystem/JKernel/JKRAramHeap/asm/func_802D31AC.s"
 }
 
 asm void JKRAramHeap::dump(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D3218.s"
+#include "JSystem/JKernel/JKRAramHeap/asm/func_802D3218.s"
 }
 
 #if 0
 asm void __sinit_JKRAramHeap_cpp {
     nofralloc
-    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D326C.s"
+#include "JSystem/JKernel/JKRAramHeap/asm/func_802D326C.s"
 }
 
 asm JSUList<12JKRAramBlock>::~JSUList<12JKRAramBlock>(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D32B0.s"
+#include "JSystem/JKernel/JKRAramHeap/asm/func_802D32B0.s"
 }
 #endif
diff --git a/libs/JSystem/JKernel/JKRAramPiece.cpp b/libs/JSystem/JKernel/JKRAramPiece.cpp
index 6596502b09..32b2e9c71d 100644
--- a/libs/JSystem/JKernel/JKRAramPiece.cpp
+++ b/libs/JSystem/JKernel/JKRAramPiece.cpp
@@ -1,54 +1,54 @@
 #include "JSystem/JKernel/JKRAramPiece/JKRAramPiece.h"
 #include "global.h"
 
-asm void JKRAramPiece::prepareCommand(int, u32, u32, u32, JKRAramBlock *, void (*)(u32)) {
+asm void JKRAramPiece::prepareCommand(int, u32, u32, u32, JKRAramBlock*, void (*)(u32)) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D3574.s"
+#include "JSystem/JKernel/JKRAramPiece/asm/func_802D3574.s"
 }
 
-asm void JKRAramPiece::sendCommand(JKRAMCommand *) {
+asm void JKRAramPiece::sendCommand(JKRAMCommand*) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D35F4.s"
+#include "JSystem/JKernel/JKRAramPiece/asm/func_802D35F4.s"
 }
 
-asm void JKRAramPiece::orderAsync(int, u32, u32, u32, JKRAramBlock *, void (*)(u32)) {
+asm void JKRAramPiece::orderAsync(int, u32, u32, u32, JKRAramBlock*, void (*)(u32)) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s"
+#include "JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s"
 }
 
-asm void JKRAramPiece::sync(JKRAMCommand *, int) {
+asm void JKRAramPiece::sync(JKRAMCommand*, int) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D3770.s"
+#include "JSystem/JKernel/JKRAramPiece/asm/func_802D3770.s"
 }
 
-asm void JKRAramPiece::orderSync(int, u32, u32, u32, JKRAramBlock *) {
+asm void JKRAramPiece::orderSync(int, u32, u32, u32, JKRAramBlock*) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D3838.s"
+#include "JSystem/JKernel/JKRAramPiece/asm/func_802D3838.s"
 }
 
-asm void JKRAramPiece::startDMA(JKRAMCommand *) {
+asm void JKRAramPiece::startDMA(JKRAMCommand*) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D38CC.s"
+#include "JSystem/JKernel/JKRAramPiece/asm/func_802D38CC.s"
 }
 
 asm void JKRAramPiece::doneDMA(u32) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D3944.s"
+#include "JSystem/JKernel/JKRAramPiece/asm/func_802D3944.s"
 }
 
 asm JKRAMCommand::JKRAMCommand(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D39EC.s"
+#include "JSystem/JKernel/JKRAramPiece/asm/func_802D39EC.s"
 }
 
 asm JKRAMCommand::~JKRAMCommand() {
     nofralloc
-    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D3A5C.s"
+#include "JSystem/JKernel/JKRAramPiece/asm/func_802D3A5C.s"
 }
 
 #if 0
 asm void __sinit_JKRAramPiece_cpp {
     nofralloc
-    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D3B04.s"
+#include "JSystem/JKernel/JKRAramPiece/asm/func_802D3B04.s"
 }
 #endif
diff --git a/libs/JSystem/JKernel/JKRArchivePub.cpp b/libs/JSystem/JKernel/JKRArchivePub.cpp
index 3d839dbe85..3399eaeaf7 100644
--- a/libs/JSystem/JKernel/JKRArchivePub.cpp
+++ b/libs/JSystem/JKernel/JKRArchivePub.cpp
@@ -7,7 +7,8 @@ asm void JKRArchive::check_mount_already(long, JKRHeap*) {
 #include "JSystem/JKernel/JKRArchive/asm/func_802D5778.s"
 }
 
-asm void JKRArchive::mount(char const*, JKRArchive::EMountMode, JKRHeap*, JKRArchive::EMountDirection) {
+asm void JKRArchive::mount(char const*, JKRArchive::EMountMode, JKRHeap*,
+                           JKRArchive::EMountDirection) {
     nofralloc
 #include "JSystem/JKernel/JKRArchive/asm/func_802D57E4.s"
 }
diff --git a/libs/JSystem/JKernel/JKRCompArchive.cpp b/libs/JSystem/JKernel/JKRCompArchive.cpp
index 72d61f057e..2ffae9dd70 100644
--- a/libs/JSystem/JKernel/JKRCompArchive.cpp
+++ b/libs/JSystem/JKernel/JKRCompArchive.cpp
@@ -3,41 +3,40 @@
 
 asm JKRCompArchive::JKRCompArchive(long, JKRArchive::EMountDirection) {
     nofralloc
-    #include "JSystem/JKernel/JKRCompArchive/asm/func_802D87D4.s"
+#include "JSystem/JKernel/JKRCompArchive/asm/func_802D87D4.s"
 }
 
 asm JKRCompArchive::~JKRCompArchive(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRCompArchive/asm/func_802D887C.s"
+#include "JSystem/JKernel/JKRCompArchive/asm/func_802D887C.s"
 }
 
 asm void JKRCompArchive::open(long) {
     nofralloc
-    #include "JSystem/JKernel/JKRCompArchive/asm/func_802D89BC.s"
+#include "JSystem/JKernel/JKRCompArchive/asm/func_802D89BC.s"
 }
 
-asm void JKRCompArchive::fetchResource(JKRArchive::SDIFileEntry *, u32 *) {
+asm void JKRCompArchive::fetchResource(JKRArchive::SDIFileEntry*, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRCompArchive/asm/func_802D8F40.s"
+#include "JSystem/JKernel/JKRCompArchive/asm/func_802D8F40.s"
 }
 
-asm void JKRCompArchive::fetchResource(void *, u32, JKRArchive::SDIFileEntry *, u32 *) {
+asm void JKRCompArchive::fetchResource(void*, u32, JKRArchive::SDIFileEntry*, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRCompArchive/asm/func_802D90C0.s"
+#include "JSystem/JKernel/JKRCompArchive/asm/func_802D90C0.s"
 }
 
 asm void JKRCompArchive::removeResourceAll(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRCompArchive/asm/func_802D9260.s"
+#include "JSystem/JKernel/JKRCompArchive/asm/func_802D9260.s"
 }
 
-asm void JKRCompArchive::removeResource(void *) {
+asm void JKRCompArchive::removeResource(void*) {
     nofralloc
-    #include "JSystem/JKernel/JKRCompArchive/asm/func_802D92F4.s"
+#include "JSystem/JKernel/JKRCompArchive/asm/func_802D92F4.s"
 }
 
-asm void JKRCompArchive::getExpandedResSize(void const *) const {
+asm void JKRCompArchive::getExpandedResSize(void const*) const {
     nofralloc
-    #include "JSystem/JKernel/JKRCompArchive/asm/func_802D9360.s"
+#include "JSystem/JKernel/JKRCompArchive/asm/func_802D9360.s"
 }
-
diff --git a/libs/JSystem/JKernel/JKRDecomp.cpp b/libs/JSystem/JKernel/JKRDecomp.cpp
index 91dd3014fa..b4c6cde325 100644
--- a/libs/JSystem/JKernel/JKRDecomp.cpp
+++ b/libs/JSystem/JKernel/JKRDecomp.cpp
@@ -3,76 +3,75 @@
 
 asm void JKRDecomp::create(long) {
     nofralloc
-    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB680.s"
+#include "JSystem/JKernel/JKRDecomp/asm/func_802DB680.s"
 }
 
 asm JKRDecomp::JKRDecomp(long) {
     nofralloc
-    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB6E0.s"
+#include "JSystem/JKernel/JKRDecomp/asm/func_802DB6E0.s"
 }
 
 asm JKRDecomp::~JKRDecomp(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB730.s"
+#include "JSystem/JKernel/JKRDecomp/asm/func_802DB730.s"
 }
 
 asm void* JKRDecomp::run(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB790.s"
+#include "JSystem/JKernel/JKRDecomp/asm/func_802DB790.s"
 }
 
-asm void JKRDecomp::prepareCommand(u8 *, u8 *, u32, u32, void (*)(u32)) {
+asm void JKRDecomp::prepareCommand(u8*, u8*, u32, u32, void (*)(u32)) {
     nofralloc
-    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB858.s"
+#include "JSystem/JKernel/JKRDecomp/asm/func_802DB858.s"
 }
 
-asm void JKRDecomp::sendCommand(JKRDecompCommand *) {
+asm void JKRDecomp::sendCommand(JKRDecompCommand*) {
     nofralloc
-    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB8D0.s"
+#include "JSystem/JKernel/JKRDecomp/asm/func_802DB8D0.s"
 }
 
-asm void JKRDecomp::orderAsync(u8 *, u8 *, u32, u32, void (*)(u32)) {
+asm void JKRDecomp::orderAsync(u8*, u8*, u32, u32, void (*)(u32)) {
     nofralloc
-    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB900.s"
+#include "JSystem/JKernel/JKRDecomp/asm/func_802DB900.s"
 }
 
-asm void JKRDecomp::sync(JKRDecompCommand *, int) {
+asm void JKRDecomp::sync(JKRDecompCommand*, int) {
     nofralloc
-    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB934.s"
+#include "JSystem/JKernel/JKRDecomp/asm/func_802DB934.s"
 }
 
-asm void JKRDecomp::orderSync(u8 *, u8 *, u32, u32) {
+asm void JKRDecomp::orderSync(u8*, u8*, u32, u32) {
     nofralloc
-    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB988.s"
+#include "JSystem/JKernel/JKRDecomp/asm/func_802DB988.s"
 }
 
-asm void JKRDecomp::decode(u8 *, u8 *, u32, u32) {
+asm void JKRDecomp::decode(u8*, u8*, u32, u32) {
     nofralloc
-    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB9DC.s"
+#include "JSystem/JKernel/JKRDecomp/asm/func_802DB9DC.s"
 }
 
-asm void JKRDecomp::decodeSZP(u8 *, u8 *, u32, u32) {
+asm void JKRDecomp::decodeSZP(u8*, u8*, u32, u32) {
     nofralloc
-    #include "JSystem/JKernel/JKRDecomp/asm/func_802DBA58.s"
+#include "JSystem/JKernel/JKRDecomp/asm/func_802DBA58.s"
 }
 
-asm void JKRDecomp::decodeSZS(u8 *, u8 *, u32, u32) {
+asm void JKRDecomp::decodeSZS(u8*, u8*, u32, u32) {
     nofralloc
-    #include "JSystem/JKernel/JKRDecomp/asm/func_802DBC14.s"
+#include "JSystem/JKernel/JKRDecomp/asm/func_802DBC14.s"
 }
 
-asm void JKRDecomp::checkCompressed(u8 *) {
+asm void JKRDecomp::checkCompressed(u8*) {
     nofralloc
-    #include "JSystem/JKernel/JKRDecomp/asm/func_802DBCF8.s"
+#include "JSystem/JKernel/JKRDecomp/asm/func_802DBCF8.s"
 }
 
 asm JKRDecompCommand::JKRDecompCommand(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRDecomp/asm/func_802DBD70.s"
+#include "JSystem/JKernel/JKRDecomp/asm/func_802DBD70.s"
 }
 
 asm JKRDecompCommand::~JKRDecompCommand(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRDecomp/asm/func_802DBDC0.s"
+#include "JSystem/JKernel/JKRDecomp/asm/func_802DBDC0.s"
 }
-
diff --git a/libs/JSystem/JKernel/JKRDisposer.cpp b/libs/JSystem/JKernel/JKRDisposer.cpp
index e26f0253e0..b0cbe8c690 100644
--- a/libs/JSystem/JKernel/JKRDisposer.cpp
+++ b/libs/JSystem/JKernel/JKRDisposer.cpp
@@ -1,6 +1,6 @@
 #include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
-#include "global.h"
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
+#include "global.h"
 
 // #include "JSystem/JKernel/asm/func_802D147C.s"
 JKRDisposer::JKRDisposer() : mLink(this) {
diff --git a/libs/JSystem/JKernel/JKRDvdAramRipper.cpp b/libs/JSystem/JKernel/JKRDvdAramRipper.cpp
index 0e4ab3d0f2..fc047657a2 100644
--- a/libs/JSystem/JKernel/JKRDvdAramRipper.cpp
+++ b/libs/JSystem/JKernel/JKRDvdAramRipper.cpp
@@ -2,80 +2,80 @@
 #include "dvd/dvd.h"
 #include "global.h"
 
-asm void JKRDvdAramRipper::loadToAram(long, u32, JKRExpandSwitch, u32, u32, u32 *) {
+asm void JKRDvdAramRipper::loadToAram(long, u32, JKRExpandSwitch, u32, u32, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DA874.s"
+#include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DA874.s"
 }
 
-asm void JKRDvdAramRipper::loadToAram(JKRDvdFile *, u32, JKRExpandSwitch, u32, u32, u32 *) {
+asm void JKRDvdAramRipper::loadToAram(JKRDvdFile*, u32, JKRExpandSwitch, u32, u32, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DA918.s"
+#include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DA918.s"
 }
 
-asm void JKRDvdAramRipper::loadToAram_Async(JKRDvdFile *, u32, JKRExpandSwitch, void (*)(u32), u32, u32, u32 *) {
+asm void JKRDvdAramRipper::loadToAram_Async(JKRDvdFile*, u32, JKRExpandSwitch, void (*)(u32), u32,
+                                            u32, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DA9C0.s"
+#include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DA9C0.s"
 }
 
-asm void JKRDvdAramRipper::callCommand_Async(JKRADCommand *) {
+asm void JKRDvdAramRipper::callCommand_Async(JKRADCommand*) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s"
+#include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s"
 }
 
 asm JSUFileInputStream::~JSUFileInputStream(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DADD8.s"
+#include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DADD8.s"
 }
 
-asm void JKRDvdAramRipper::syncAram(JKRADCommand *, int) {
+asm void JKRDvdAramRipper::syncAram(JKRADCommand*, int) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAE48.s"
+#include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAE48.s"
 }
 
 asm JKRADCommand::JKRADCommand(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAF1C.s"
+#include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAF1C.s"
 }
 
 asm JKRADCommand::~JKRADCommand() {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAF5C.s"
+#include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAF5C.s"
 }
 
-asm void JKRDecompressFromDVDToAram(JKRDvdFile *, u32, u32, u32, u32, u32, u32 *) {
+asm void JKRDecompressFromDVDToAram(JKRDvdFile*, u32, u32, u32, u32, u32, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAFE8.s"
+#include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAFE8.s"
 }
 
-asm void decompSZS_subroutine(u8 *, u32) {
+asm void decompSZS_subroutine(u8*, u32) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB160.s"
+#include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB160.s"
 }
 
 asm void firstSrcData(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB3E8.s"
+#include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB3E8.s"
 }
 
-asm void nextSrcData(u8 *) {
+asm void nextSrcData(u8*) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB49C.s"
+#include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB49C.s"
 }
 
 asm void dmaBufferFlush(u32) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB580.s"
+#include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB580.s"
 }
 
 #if 0
 asm void __sinit_JKRDvdAramRipper_cpp {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB5E8.s"
+#include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB5E8.s"
 }
 
 asm JSUList<12JKRADCommand>::~JSUList<12JKRADCommand>(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB62C.s"
+#include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB62C.s"
 }
 #endif
-
diff --git a/libs/JSystem/JKernel/JKRDvdArchive.cpp b/libs/JSystem/JKernel/JKRDvdArchive.cpp
index 869b60fc98..ff15dc3939 100644
--- a/libs/JSystem/JKernel/JKRDvdArchive.cpp
+++ b/libs/JSystem/JKernel/JKRDvdArchive.cpp
@@ -3,41 +3,40 @@
 
 asm JKRDvdArchive::JKRDvdArchive(long, JKRArchive::EMountDirection) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdArchive/asm/func_802D7BF0.s"
+#include "JSystem/JKernel/JKRDvdArchive/asm/func_802D7BF0.s"
 }
 
 asm JKRDvdArchive::~JKRDvdArchive() {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdArchive/asm/func_802D7C98.s"
+#include "JSystem/JKernel/JKRDvdArchive/asm/func_802D7C98.s"
 }
 
 asm void JKRDvdArchive::open(long) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdArchive/asm/func_802D7DB4.s"
+#include "JSystem/JKernel/JKRDvdArchive/asm/func_802D7DB4.s"
 }
 
-asm void JKRDvdArchive::fetchResource(JKRArchive::SDIFileEntry *, u32 *) {
+asm void JKRDvdArchive::fetchResource(JKRArchive::SDIFileEntry*, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdArchive/asm/func_802D8050.s"
+#include "JSystem/JKernel/JKRDvdArchive/asm/func_802D8050.s"
 }
 
-asm void JKRDvdArchive::fetchResource(void *, u32, JKRArchive::SDIFileEntry *, u32 *) {
+asm void JKRDvdArchive::fetchResource(void*, u32, JKRArchive::SDIFileEntry*, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdArchive/asm/func_802D8168.s"
+#include "JSystem/JKernel/JKRDvdArchive/asm/func_802D8168.s"
 }
 
-asm void JKRDvdArchive::fetchResource_subroutine(long, u32, u32, u8 *, u32, int, int) {
+asm void JKRDvdArchive::fetchResource_subroutine(long, u32, u32, u8*, u32, int, int) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdArchive/asm/func_802D826C.s"
+#include "JSystem/JKernel/JKRDvdArchive/asm/func_802D826C.s"
 }
 
-asm void JKRDvdArchive::fetchResource_subroutine(long, u32, u32, JKRHeap *, int, int, u8 **) {
+asm void JKRDvdArchive::fetchResource_subroutine(long, u32, u32, JKRHeap*, int, int, u8**) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s"
+#include "JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s"
 }
 
-asm void JKRDvdArchive::getExpandedResSize(void const *) const {
+asm void JKRDvdArchive::getExpandedResSize(void const*) const {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdArchive/asm/func_802D8698.s"
+#include "JSystem/JKernel/JKRDvdArchive/asm/func_802D8698.s"
 }
-
diff --git a/libs/JSystem/JKernel/JKRDvdFile.cpp b/libs/JSystem/JKernel/JKRDvdFile.cpp
index daf6d246f6..a17dddd9e1 100644
--- a/libs/JSystem/JKernel/JKRDvdFile.cpp
+++ b/libs/JSystem/JKernel/JKRDvdFile.cpp
@@ -8,7 +8,7 @@ JKRDvdFile::JKRDvdFile() : JKRFile(), mDvdLink(this) {
 #ifdef NONMATCHING
 JKRDvdFile::JKRDvdFile(char const* param_1) : JKRFile(), mDvdLink(this) {
     this->initiate();
-    bool result   = this->open(param_1);
+    bool result = this->open(param_1);
     this->mIsAvailable = result;
 }
 #else
@@ -21,7 +21,7 @@ asm JKRDvdFile::JKRDvdFile(char const*) {
 #ifdef NONMATHCING
 JKRDvdFile::JKRDvdFile(long param_1) : JKRFile(), mDvdLink(this) {
     this->initiate();
-    bool result   = this->open(param_1);
+    bool result = this->open(param_1);
     this->mIsAvailable = result;
 }
 #else
@@ -38,7 +38,7 @@ JKRDvdFile::~JKRDvdFile() {
 #else
 asm JKRDvdFile::~JKRDvdFile() {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9748.s"
+#include "JSystem/JKernel/JKRDvdFile/asm/func_802D9748.s"
 }
 #endif
 
@@ -49,7 +49,7 @@ void JKRDvdFile::initiate(void) {
     OSInitMutex(&this->mMutex2);
     OSInitMessageQueue(&this->mQueue2, this->mMessages2, 1);
     OSInitMessageQueue(&this->mQueue1, this->mMessages1, 1);
-    this->mOSThread  = NULL;
+    this->mOSThread = NULL;
     this->field_0x50 = 0;
     this->field_0x58 = 0;
 }
@@ -86,9 +86,9 @@ void JKRDvdFile::close() {
             this->mIsAvailable = false;
             lbl_8043436C.remove(&this->mDvdLink);
         } else {
-            const char* filename = lbl_8039D260;        // "JKRDvdFile.cpp"
-            const char* format   = lbl_8039D260 + 0x0F; // "%s"
-            const char* arg1     = lbl_8039D260 + 0x12; // "cannot close DVD file\n"
+            const char* filename = lbl_8039D260;       // "JKRDvdFile.cpp"
+            const char* format = lbl_8039D260 + 0x0F;  // "%s"
+            const char* arg1 = lbl_8039D260 + 0x12;    // "cannot close DVD file\n"
             JUTException_NS_panic_f(filename, 0xd5, format, arg1);
         }
     }
@@ -109,8 +109,8 @@ s32 JKRDvdFile::readData(void* param_1, long length, long param_3) {
     this->mOSThread = OSGetCurrentThread();
 
     s32 result = -1;
-    s32 readAsyncResult =
-        DVDReadAsyncPrio(this->mDvdCommandBlock, param_1, length, param_3, JKRDvdFile::doneProcess, 2);
+    s32 readAsyncResult = DVDReadAsyncPrio(this->mDvdCommandBlock, param_1, length, param_3,
+                                           JKRDvdFile::doneProcess, 2);
     if (readAsyncResult) {
         result = this->sync();
     }
@@ -147,4 +147,3 @@ void JKRDvdFile::doneProcess(long id, DVDFileInfo* fileInfo) {
 s32 JKRDvdFile::getFileSize(void) const {
     return this->mFileSize;
 }
-
diff --git a/libs/JSystem/JKernel/JKRDvdRipper.cpp b/libs/JSystem/JKernel/JKRDvdRipper.cpp
index 88b5934864..855d5ee568 100644
--- a/libs/JSystem/JKernel/JKRDvdRipper.cpp
+++ b/libs/JSystem/JKernel/JKRDvdRipper.cpp
@@ -2,54 +2,57 @@
 #include "dvd/dvd.h"
 #include "global.h"
 
-asm void JKRDvdRipper::loadToMainRAM(char const *, u8 *, JKRExpandSwitch, u32, JKRHeap *, JKRDvdRipper::EAllocDirection, u32, int *, u32 *) {
+asm void JKRDvdRipper::loadToMainRAM(char const*, u8*, JKRExpandSwitch, u32, JKRHeap*,
+                                     JKRDvdRipper::EAllocDirection, u32, int*, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802D9B98.s"
+#include "JSystem/JKernel/JKRDvdRipper/asm/func_802D9B98.s"
 }
 
-asm void JKRDvdRipper::loadToMainRAM(long, u8 *, JKRExpandSwitch, u32, JKRHeap *, JKRDvdRipper::EAllocDirection, u32, int *, u32 *) {
+asm void JKRDvdRipper::loadToMainRAM(long, u8*, JKRExpandSwitch, u32, JKRHeap*,
+                                     JKRDvdRipper::EAllocDirection, u32, int*, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802D9C54.s"
+#include "JSystem/JKernel/JKRDvdRipper/asm/func_802D9C54.s"
 }
 
-asm void JKRDvdRipper::loadToMainRAM(JKRDvdFile *, u8 *, JKRExpandSwitch, u32, JKRHeap *, JKRDvdRipper::EAllocDirection, u32, int *, u32 *) {
+asm void JKRDvdRipper::loadToMainRAM(JKRDvdFile*, u8*, JKRExpandSwitch, u32, JKRHeap*,
+                                     JKRDvdRipper::EAllocDirection, u32, int*, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802D9D10.s"
+#include "JSystem/JKernel/JKRDvdRipper/asm/func_802D9D10.s"
 }
 
-asm void JKRDecompressFromDVD(JKRDvdFile *, void *, u32, u32, u32, u32, u32 *) {
+asm void JKRDecompressFromDVD(JKRDvdFile*, void*, u32, u32, u32, u32, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA1E4.s"
+#include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA1E4.s"
 }
 
-asm void decompSZS_subroutine(u8 *, u8 *) {
+asm void decompSZS_subroutine(u8*, u8*) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA35C.s"
+#include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA35C.s"
 }
 
 asm void firstSrcData(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA60C.s"
+#include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA60C.s"
 }
 
-asm void nextSrcData(u8 *) {
+asm void nextSrcData(u8*) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA6D8.s"
+#include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA6D8.s"
 }
 
 asm void JKRDvdRipper::isErrorRetry(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA7D4.s"
+#include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA7D4.s"
 }
 
 #if 0
 asm void __sinit_JKRDvdRipper_cpp {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA7DC.s"
+#include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA7DC.s"
 }
 
 asm JSUList<12JKRDMCommand>::~JSUList<12JKRDMCommand>(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA820.s"
+#include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA820.s"
 }
 #endif
diff --git a/libs/JSystem/JKernel/JKRExpHeap.cpp b/libs/JSystem/JKernel/JKRExpHeap.cpp
index 35ebaf6407..2e0c3d0f01 100644
--- a/libs/JSystem/JKernel/JKRExpHeap.cpp
+++ b/libs/JSystem/JKernel/JKRExpHeap.cpp
@@ -3,206 +3,209 @@
 
 asm void JKRExpHeap::createRoot(int, bool) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CEDB4.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CEDB4.s"
 }
 
-asm void JKRExpHeap::create(u32, JKRHeap *, bool) {
+asm void JKRExpHeap::create(u32, JKRHeap*, bool) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CEE2C.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CEE2C.s"
 }
 
-asm void JKRExpHeap::create(void *, u32, JKRHeap *, bool) {
+asm void JKRExpHeap::create(void*, u32, JKRHeap*, bool) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CEF00.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CEF00.s"
 }
 
 asm void JKRExpHeap::do_destroy(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CEFAC.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CEFAC.s"
 }
 
-asm  JKRExpHeap::JKRExpHeap(void *, u32, JKRHeap *, bool) {
+asm JKRExpHeap::JKRExpHeap(void*, u32, JKRHeap*, bool) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CF030.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CF030.s"
 }
 
-asm  JKRExpHeap::~JKRExpHeap() {
+asm JKRExpHeap::~JKRExpHeap() {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CF0C0.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CF0C0.s"
 }
 
 asm void* JKRExpHeap::do_alloc(u32, int) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CF128.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CF128.s"
 }
 
 asm void JKRExpHeap::allocFromHead(u32, int) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CF234.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CF234.s"
 }
 
 asm void JKRExpHeap::allocFromHead(u32) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CF490.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CF490.s"
 }
 
 asm void JKRExpHeap::allocFromTail(u32, int) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CF574.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CF574.s"
 }
 
 asm void JKRExpHeap::allocFromTail(u32) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CF6D4.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CF6D4.s"
 }
 
-asm void JKRExpHeap::do_free(void *) {
+asm void JKRExpHeap::do_free(void*) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CF7AC.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CF7AC.s"
 }
 
 asm void JKRExpHeap::do_freeAll(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CF820.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CF820.s"
 }
 
 asm void JKRExpHeap::do_freeTail(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CF89C.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CF89C.s"
 }
 
 asm void JKRExpHeap::do_fillFreeArea(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CF924.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CF924.s"
 }
 
 asm u8 JKRExpHeap::do_changeGroupID(u8) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CF928.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CF928.s"
 }
 
-asm s32 JKRExpHeap::do_resize(void *, u32) {
+asm s32 JKRExpHeap::do_resize(void*, u32) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CF978.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CF978.s"
 }
 
-asm s32 JKRExpHeap::do_getSize(void *) {
+asm s32 JKRExpHeap::do_getSize(void*) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CFB24.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CFB24.s"
 }
 
 asm s32 JKRExpHeap::do_getFreeSize(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CFBA4.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CFBA4.s"
 }
 
 asm void* JKRExpHeap::do_getMaxFreeBlock(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CFC10.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CFC10.s"
 }
 
 asm s32 JKRExpHeap::do_getTotalFreeSize(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CFC84.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CFC84.s"
 }
 
-asm s32 JKRExpHeap::getUsedSize( unsigned char) const {
+asm s32 JKRExpHeap::getUsedSize(unsigned char) const {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CFCE8.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CFCE8.s"
 }
 
-asm s32 JKRExpHeap::getTotalUsedSize( void) const {
+asm s32 JKRExpHeap::getTotalUsedSize(void) const {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CFD64.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CFD64.s"
 }
 
-asm void JKRExpHeap::appendUsedList(JKRExpHeap::CMemBlock *) {
+asm void JKRExpHeap::appendUsedList(JKRExpHeap::CMemBlock*) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CFDCC.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CFDCC.s"
 }
 
-asm void JKRExpHeap::setFreeBlock(JKRExpHeap::CMemBlock *, JKRExpHeap::CMemBlock *, JKRExpHeap::CMemBlock *) {
+asm void JKRExpHeap::setFreeBlock(JKRExpHeap::CMemBlock*, JKRExpHeap::CMemBlock*,
+                                  JKRExpHeap::CMemBlock*) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CFE68.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CFE68.s"
 }
 
-asm void JKRExpHeap::removeFreeBlock(JKRExpHeap::CMemBlock *) {
+asm void JKRExpHeap::removeFreeBlock(JKRExpHeap::CMemBlock*) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CFEB4.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CFEB4.s"
 }
 
-asm void JKRExpHeap::removeUsedBlock(JKRExpHeap::CMemBlock *) {
+asm void JKRExpHeap::removeUsedBlock(JKRExpHeap::CMemBlock*) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CFEE8.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CFEE8.s"
 }
 
-asm void JKRExpHeap::recycleFreeBlock(JKRExpHeap::CMemBlock *) {
+asm void JKRExpHeap::recycleFreeBlock(JKRExpHeap::CMemBlock*) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802CFF1C.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802CFF1C.s"
 }
 
-asm void JKRExpHeap::joinTwoBlocks(JKRExpHeap::CMemBlock *) {
+asm void JKRExpHeap::joinTwoBlocks(JKRExpHeap::CMemBlock*) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802D00B4.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802D00B4.s"
 }
 
 asm bool JKRExpHeap::check(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802D0190.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802D0190.s"
 }
 
 asm bool JKRExpHeap::dump(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802D03B8.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802D03B8.s"
 }
 
 asm void JKRExpHeap::dump_sort(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802D05CC.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802D05CC.s"
 }
 
-asm void JKRExpHeap::CMemBlock::initiate( JKRExpHeap::CMemBlock *, JKRExpHeap::CMemBlock *, u32, unsigned char, unsigned char) {
+asm void JKRExpHeap::CMemBlock::initiate(JKRExpHeap::CMemBlock*, JKRExpHeap::CMemBlock*, u32,
+                                         unsigned char, unsigned char) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802D0810.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802D0810.s"
 }
 
-asm void JKRExpHeap::CMemBlock::allocFore( u32, unsigned char, unsigned char, unsigned char, unsigned char) {
+asm void JKRExpHeap::CMemBlock::allocFore(u32, unsigned char, unsigned char, unsigned char,
+                                          unsigned char) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802D0830.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802D0830.s"
 }
 
-asm void JKRExpHeap::CMemBlock::allocBack( u32, unsigned char, unsigned char, unsigned char, unsigned char) {
+asm void JKRExpHeap::CMemBlock::allocBack(u32, unsigned char, unsigned char, unsigned char,
+                                          unsigned char) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802D0874.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802D0874.s"
 }
 
-asm void JKRExpHeap::CMemBlock::free( JKRExpHeap *) {
+asm void JKRExpHeap::CMemBlock::free(JKRExpHeap*) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802D08CC.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802D08CC.s"
 }
 
-asm void JKRExpHeap::CMemBlock::getHeapBlock( void *) {
+asm void JKRExpHeap::CMemBlock::getHeapBlock(void*) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802D091C.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802D091C.s"
 }
 
-asm void JKRExpHeap::state_register(JKRHeap::TState *, u32) const {
+asm void JKRExpHeap::state_register(JKRHeap::TState*, u32) const {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802D0938.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802D0938.s"
 }
 
-asm bool JKRExpHeap::state_compare( JKRHeap::TState const &, JKRHeap::TState const &) const {
+asm bool JKRExpHeap::state_compare(JKRHeap::TState const&, JKRHeap::TState const&) const {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802D09E0.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802D09E0.s"
 }
 
 asm u32 JKRExpHeap::getHeapType(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802D0A10.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802D0A10.s"
 }
 
 asm u8 JKRExpHeap::do_getCurrentGroupId(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRExpHeap/asm/func_802D0A1C.s"
+#include "JSystem/JKernel/JKRExpHeap/asm/func_802D0A1C.s"
 }
-
diff --git a/libs/JSystem/JKernel/JKRFile.cpp b/libs/JSystem/JKernel/JKRFile.cpp
index 9565d7d587..74a27ae567 100644
--- a/libs/JSystem/JKernel/JKRFile.cpp
+++ b/libs/JSystem/JKernel/JKRFile.cpp
@@ -11,4 +11,3 @@ s32 JKRFile::read(void* data, s32 size, long param_3) {
             return result;
     }
 }
-
diff --git a/libs/JSystem/JKernel/JKRFileFinder.cpp b/libs/JSystem/JKernel/JKRFileFinder.cpp
index c239ba197c..e860e08327 100644
--- a/libs/JSystem/JKernel/JKRFileFinder.cpp
+++ b/libs/JSystem/JKernel/JKRFileFinder.cpp
@@ -2,38 +2,37 @@
 #include "dvd/dvd.h"
 #include "global.h"
 
-asm  JKRArcFinder::JKRArcFinder(JKRArchive *, long, long) {
+asm JKRArcFinder::JKRArcFinder(JKRArchive*, long, long) {
     nofralloc
-    #include "JSystem/JKernel/JKRFileFinder/asm/func_802D4638.s"
+#include "JSystem/JKernel/JKRFileFinder/asm/func_802D4638.s"
 }
 
 asm bool JKRArcFinder::findNextFile(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRFileFinder/asm/func_802D46C4.s"
+#include "JSystem/JKernel/JKRFileFinder/asm/func_802D46C4.s"
 }
 
-asm  JKRDvdFinder::JKRDvdFinder(char const *) {
+asm JKRDvdFinder::JKRDvdFinder(char const*) {
     nofralloc
-    #include "JSystem/JKernel/JKRFileFinder/asm/func_802D4770.s"
+#include "JSystem/JKernel/JKRFileFinder/asm/func_802D4770.s"
 }
 
-asm  JKRDvdFinder:: ~JKRDvdFinder() {
+asm JKRDvdFinder::~JKRDvdFinder() {
     nofralloc
-    #include "JSystem/JKernel/JKRFileFinder/asm/func_802D47F4.s"
+#include "JSystem/JKernel/JKRFileFinder/asm/func_802D47F4.s"
 }
 
 asm bool JKRDvdFinder::findNextFile(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRFileFinder/asm/func_802D4874.s"
+#include "JSystem/JKernel/JKRFileFinder/asm/func_802D4874.s"
 }
 
-asm  JKRFileFinder::~JKRFileFinder() {
+asm JKRFileFinder::~JKRFileFinder() {
     nofralloc
-    #include "JSystem/JKernel/JKRFileFinder/asm/func_802D4910.s"
+#include "JSystem/JKernel/JKRFileFinder/asm/func_802D4910.s"
 }
 
-asm  JKRArcFinder::~JKRArcFinder() {
+asm JKRArcFinder::~JKRArcFinder() {
     nofralloc
-    #include "JSystem/JKernel/JKRFileFinder/asm/func_802D4958.s"
+#include "JSystem/JKernel/JKRFileFinder/asm/func_802D4958.s"
 }
-
diff --git a/libs/JSystem/JKernel/JKRFileLoader.cpp b/libs/JSystem/JKernel/JKRFileLoader.cpp
index 671e2b69b3..448770a75f 100644
--- a/libs/JSystem/JKernel/JKRFileLoader.cpp
+++ b/libs/JSystem/JKernel/JKRFileLoader.cpp
@@ -1,47 +1,47 @@
 #include "JSystem/JKernel/JKRFileLoader/JKRFileLoader.h"
 #include "global.h"
 
-asm  JKRFileLoader::JKRFileLoader(void) {
+asm JKRFileLoader::JKRFileLoader(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRFileLoader/asm/func_802D40F0.s"
+#include "JSystem/JKernel/JKRFileLoader/asm/func_802D40F0.s"
 }
 
-asm  JKRFileLoader::~JKRFileLoader() {
+asm JKRFileLoader::~JKRFileLoader() {
     nofralloc
-    #include "JSystem/JKernel/JKRFileLoader/asm/func_802D4148.s"
+#include "JSystem/JKernel/JKRFileLoader/asm/func_802D4148.s"
 }
 
 asm void JKRFileLoader::unmount(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRFileLoader/asm/func_802D41D4.s"
+#include "JSystem/JKernel/JKRFileLoader/asm/func_802D41D4.s"
 }
 
-asm void* JKRFileLoader::getGlbResource(char const *) {
+asm void* JKRFileLoader::getGlbResource(char const*) {
     nofralloc
-    #include "JSystem/JKernel/JKRFileLoader/asm/func_802D4224.s"
+#include "JSystem/JKernel/JKRFileLoader/asm/func_802D4224.s"
 }
 
-asm void* JKRFileLoader::getGlbResource(char const *, JKRFileLoader *) {
+asm void* JKRFileLoader::getGlbResource(char const*, JKRFileLoader*) {
     nofralloc
-    #include "JSystem/JKernel/JKRFileLoader/asm/func_802D4270.s"
+#include "JSystem/JKernel/JKRFileLoader/asm/func_802D4270.s"
 }
 
-asm bool JKRFileLoader::removeResource(void *, JKRFileLoader *) {
+asm bool JKRFileLoader::removeResource(void*, JKRFileLoader*) {
     nofralloc
-    #include "JSystem/JKernel/JKRFileLoader/asm/func_802D4308.s"
+#include "JSystem/JKernel/JKRFileLoader/asm/func_802D4308.s"
 }
 
-asm bool JKRFileLoader::detachResource(void *, JKRFileLoader *) {
+asm bool JKRFileLoader::detachResource(void*, JKRFileLoader*) {
     nofralloc
-    #include "JSystem/JKernel/JKRFileLoader/asm/func_802D43A0.s"
+#include "JSystem/JKernel/JKRFileLoader/asm/func_802D43A0.s"
 }
 
-asm JKRFileLoader* JKRFileLoader::findVolume(char const **) {
+asm JKRFileLoader* JKRFileLoader::findVolume(char const**) {
     nofralloc
-    #include "JSystem/JKernel/JKRFileLoader/asm/func_802D4438.s"
+#include "JSystem/JKernel/JKRFileLoader/asm/func_802D4438.s"
 }
 
-asm char* JKRFileLoader::fetchVolumeName(char *, long, char const *) {
+asm char* JKRFileLoader::fetchVolumeName(char*, long, char const*) {
     nofralloc
-    #include "JSystem/JKernel/JKRFileLoader/asm/func_802D44C4.s"
+#include "JSystem/JKernel/JKRFileLoader/asm/func_802D44C4.s"
 }
\ No newline at end of file
diff --git a/libs/JSystem/JKernel/JKRHeap.cpp b/libs/JSystem/JKernel/JKRHeap.cpp
index 1b1d3d3c16..342c7048c8 100644
--- a/libs/JSystem/JKernel/JKRHeap.cpp
+++ b/libs/JSystem/JKernel/JKRHeap.cpp
@@ -5,9 +5,9 @@
 JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool error_flag)
     : JKRDisposer(), mChildTree(this), mDisposerList() {
     OSInitMutex(&this->mMutex);
-    this->mSize  = size;
+    this->mSize = size;
     this->mStart = (u32)data;
-    this->mEnd   = (u32)data + size;
+    this->mEnd = (u32)data + size;
 
     if (parent == NULL) {
         this->becomeSystemHeap();
@@ -28,9 +28,9 @@ JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool error_flag)
         lbl_8045137C = JKRHeap::JKRDefaultMemoryErrorRoutine;
     }
 
-    this->mDebugFill         = lbl_804508B0;
+    this->mDebugFill = lbl_804508B0;
     this->mCheckMemoryFilled = lbl_80451380;
-    this->mInitFlag          = false;
+    this->mInitFlag = false;
 }
 
 // using the wrong register for storing the results
@@ -42,7 +42,7 @@ JKRHeap::~JKRHeap() {
 
     JSUTree<JKRHeap>* nextRootHeap = lbl_80451378->mChildTree.getFirstChild();
 
-    JKRHeap* rootHeap    = lbl_80451378;
+    JKRHeap* rootHeap = lbl_80451378;
     JKRHeap* currentHeap = lbl_80451374;
     if (currentHeap == this) {
         if (!nextRootHeap) {
@@ -76,13 +76,14 @@ bool JKRHeap::initArena(char** memory, u32* size, int param_3) {
     u32 ram_end;
     u32 ram;
 
-    u32 low  = OSGetArenaLo();
+    u32 low = OSGetArenaLo();
     u32 high = OSGetArenaHi();
-    if (low == high) return false;
+    if (low == high)
+        return false;
 
-    ram          = OSInitAlloc(low, high, param_3);
-    ram_start    = (ram + 0x1fU & 0xffffffe0);
-    ram_end      = (high & 0xffffffe0);
+    ram = OSInitAlloc(low, high, param_3);
+    ram_start = (ram + 0x1fU & 0xffffffe0);
+    ram_end = (high & 0xffffffe0);
     lbl_80451384 = OS_GLOBAL_ADDR(void, 0x80000000);
     lbl_80451388 = (void*)ram_start;
     lbl_8045138C = (void*)ram_start;
@@ -91,21 +92,21 @@ bool JKRHeap::initArena(char** memory, u32* size, int param_3) {
     OSSetArenaLo(ram_end);
     OSSetArenaHi(ram_end);
     *memory = (char*)ram_start;
-    *size   = ram_end - ram_start;
+    *size = ram_end - ram_start;
     return true;
 }
 
 // #include "JSystem/JKernel/JKRHeap/asm/func_802CE428.s"
 JKRHeap* JKRHeap::becomeSystemHeap() {
     JKRHeap* prev = lbl_80451370;
-    lbl_80451370  = this;
+    lbl_80451370 = this;
     return prev;
 }
 
 // #include "JSystem/JKernel/JKRHeap/asm/func_802CE438.s"
 JKRHeap* JKRHeap::becomeCurrentHeap() {
     JKRHeap* prev = lbl_80451374;
-    lbl_80451374  = this;
+    lbl_80451374 = this;
     return prev;
 }
 
@@ -136,7 +137,8 @@ void* JKRHeap::alloc(u32 size, int alignment) {
 void JKRHeap::free(void* ptr, JKRHeap* heap) {
     if (!heap) {
         heap = findFromRoot(ptr);
-        if (!heap) return;
+        if (!heap)
+            return;
     }
 
     heap->free(ptr);
@@ -166,7 +168,8 @@ void JKRHeap::freeTail() {
 s32 JKRHeap::resize(void* ptr, u32 size, JKRHeap* heap) {
     if (!heap) {
         heap = findFromRoot(ptr);
-        if (!heap) return -1;
+        if (!heap)
+            return -1;
     }
 
     return heap->resize(ptr, size);
@@ -181,7 +184,8 @@ s32 JKRHeap::resize(void* ptr, u32 size) {
 s32 JKRHeap::getSize(void* ptr, JKRHeap* heap) {
     if (!heap) {
         heap = findFromRoot(ptr);
-        if (!heap) return -1;
+        if (!heap)
+            return -1;
     }
 
     return heap->getSize(ptr);
@@ -216,10 +220,10 @@ u8 JKRHeap::changeGroupID(u8 param_1) {
 #ifdef NONMATCHING
 s32 JKRHeap::getMaxAllocatableSize(int alignment) {
     u32 maxFreeBlock = (u32)this->getMaxFreeBlock();
-    s32 freeSize     = this->getFreeSize();
+    s32 freeSize = this->getFreeSize();
 
-    u32 mask        = alignment - 1U;
-    s32 ptrOffset   = mask & (alignment - (maxFreeBlock & 0xf));
+    u32 mask = alignment - 1U;
+    s32 ptrOffset = mask & (alignment - (maxFreeBlock & 0xf));
     s32 alignedSize = (freeSize - ptrOffset) & ~(alignment - 1U);
     return alignedSize;
 }
@@ -250,7 +254,7 @@ JKRHeap* JKRHeap::find(void* ptr) const {
         if (tree.getNumChildren() != 0) {
             JSUTreeIterator<JKRHeap> iterator;
             for (iterator = tree.getFirstChild(); iterator != tree.getEndChild(); iterator++) {
-                JKRHeap* child  = iterator.getObject();
+                JKRHeap* child = iterator.getObject();
                 JKRHeap* result = child->find(ptr);
                 if (result) {
                     return result;
@@ -268,10 +272,9 @@ JKRHeap* JKRHeap::find(void* ptr) const {
 JKRHeap* JKRHeap::findAllHeap(void* ptr) const {
     const JSUTree<JKRHeap>& tree = this->mChildTree;
     if (tree.getNumChildren() != 0) {
-
         JSUTreeIterator<JKRHeap> iterator;
         for (iterator = tree.getFirstChild(); iterator != tree.getEndChild(); iterator++) {
-            JKRHeap* child  = iterator.getObject();
+            JKRHeap* child = iterator.getObject();
             JKRHeap* result = child->findAllHeap(ptr);
             if (result) {
                 return result;
@@ -315,7 +318,7 @@ void JKRHeap::dispose_subroutine(u32 begin, u32 end) {
 // #include "JSystem/JKernel/JKRHeap/asm/func_802CEA78.s"
 bool JKRHeap::dispose(void* ptr, u32 size) {
     u32 begin = (u32)ptr;
-    u32 end   = (u32)ptr + size;
+    u32 end = (u32)ptr + size;
     this->dispose_subroutine(begin, end);
     return false;
 }
@@ -360,15 +363,15 @@ void JKRHeap::copyMemory(void* dst, void* src, u32 size) {
 
 // #include "JSystem/JKernel/JKRHeap/asm/func_802CEB40.s"
 void JKRHeap::JKRDefaultMemoryErrorRoutine(JKRHeap* heap, u32 size, int alignment) {
-    const char* filename = lbl_8039CAD8;      // "JKRHeap.cpp"
-    const char* format   = lbl_8039CAD8 + 12; // "%s"
-    const char* arg1     = lbl_8039CAD8 + 15; // "abort\n"
+    const char* filename = lbl_8039CAD8;     // "JKRHeap.cpp"
+    const char* format = lbl_8039CAD8 + 12;  // "%s"
+    const char* arg1 = lbl_8039CAD8 + 15;    // "abort\n"
     JUTException_NS_panic_f(filename, 0x33f, format, arg1);
 }
 
 // #include "JSystem/JKernel/JKRHeap/asm/func_802CEB78.s"
 bool JKRHeap::setErrorFlag(bool error_flag) {
-    bool prev        = this->mErrorFlag;
+    bool prev = this->mErrorFlag;
     this->mErrorFlag = error_flag;
     return prev;
 }
@@ -387,7 +390,8 @@ JKRErrorHandler JKRHeap::setErrorHandler(JKRErrorHandler error_handler) {
 
 // #include "JSystem/JKernel/JKRHeap/asm/func_802CEBA8.s"
 bool JKRHeap::isSubHeap(JKRHeap* heap) const {
-    if (!heap) return false;
+    if (!heap)
+        return false;
 
     const JSUTree<JKRHeap>& tree = this->mChildTree;
     if (tree.getNumChildren() != 0) {
diff --git a/libs/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/JKernel/JKRMemArchive.cpp
index 562457956e..51b125974b 100644
--- a/libs/JSystem/JKernel/JKRMemArchive.cpp
+++ b/libs/JSystem/JKernel/JKRMemArchive.cpp
@@ -3,56 +3,55 @@
 
 asm JKRMemArchive::JKRMemArchive(long, JKRArchive::EMountDirection) {
     nofralloc
-    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D69B8.s"
+#include "JSystem/JKernel/JKRMemArchive/asm/func_802D69B8.s"
 }
 
-asm JKRMemArchive::JKRMemArchive(void *, u32, JKRMemBreakFlag) {
+asm JKRMemArchive::JKRMemArchive(void*, u32, JKRMemBreakFlag) {
     nofralloc
-    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6A6C.s"
+#include "JSystem/JKernel/JKRMemArchive/asm/func_802D6A6C.s"
 }
 
 asm JKRMemArchive::~JKRMemArchive() {
     nofralloc
-    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6B24.s"
+#include "JSystem/JKernel/JKRMemArchive/asm/func_802D6B24.s"
 }
 
 asm void JKRMemArchive::open(long, JKRArchive::EMountDirection) {
     nofralloc
-    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6BCC.s"
+#include "JSystem/JKernel/JKRMemArchive/asm/func_802D6BCC.s"
 }
 
-asm void JKRMemArchive::open(void *, u32, JKRMemBreakFlag) {
+asm void JKRMemArchive::open(void*, u32, JKRMemBreakFlag) {
     nofralloc
-    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6D30.s"
+#include "JSystem/JKernel/JKRMemArchive/asm/func_802D6D30.s"
 }
 
-asm void JKRMemArchive::fetchResource(JKRArchive::SDIFileEntry *, u32 *) {
+asm void JKRMemArchive::fetchResource(JKRArchive::SDIFileEntry*, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6DDC.s"
+#include "JSystem/JKernel/JKRMemArchive/asm/func_802D6DDC.s"
 }
 
-asm void JKRMemArchive::fetchResource(void *, u32, JKRArchive::SDIFileEntry *, u32 *) {
+asm void JKRMemArchive::fetchResource(void*, u32, JKRArchive::SDIFileEntry*, u32*) {
     nofralloc
-    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6E10.s"
+#include "JSystem/JKernel/JKRMemArchive/asm/func_802D6E10.s"
 }
 
 asm void JKRMemArchive::removeResourceAll(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6ED0.s"
+#include "JSystem/JKernel/JKRMemArchive/asm/func_802D6ED0.s"
 }
 
-asm void JKRMemArchive::removeResource(void *) {
+asm void JKRMemArchive::removeResource(void*) {
     nofralloc
-    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6F20.s"
+#include "JSystem/JKernel/JKRMemArchive/asm/func_802D6F20.s"
 }
 
-asm void JKRMemArchive::fetchResource_subroutine(u8 *, u32, u8 *, u32, int) {
+asm void JKRMemArchive::fetchResource_subroutine(u8*, u32, u8*, u32, int) {
     nofralloc
-    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6F5C.s"
+#include "JSystem/JKernel/JKRMemArchive/asm/func_802D6F5C.s"
 }
 
-asm void JKRMemArchive::getExpandedResSize(void const *) const {
+asm void JKRMemArchive::getExpandedResSize(void const*) const {
     nofralloc
-    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D7030.s"
+#include "JSystem/JKernel/JKRMemArchive/asm/func_802D7030.s"
 }
-
diff --git a/libs/JSystem/JKernel/JKRSolidHeap.cpp b/libs/JSystem/JKernel/JKRSolidHeap.cpp
index ab0d02ef20..9890f4d461 100644
--- a/libs/JSystem/JKernel/JKRSolidHeap.cpp
+++ b/libs/JSystem/JKernel/JKRSolidHeap.cpp
@@ -1,113 +1,112 @@
 #include "JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h"
 #include "global.h"
 
-asm void JKRSolidHeap::create(unsigned long, JKRHeap *, bool) {
+asm void JKRSolidHeap::create(unsigned long, JKRHeap*, bool) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0A24.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0A24.s"
 }
 
 asm void JKRSolidHeap::do_destroy(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0AD0.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0AD0.s"
 }
 
-asm  JKRSolidHeap::JKRSolidHeap(void *, unsigned long, JKRHeap *, bool) {
+asm JKRSolidHeap::JKRSolidHeap(void*, unsigned long, JKRHeap*, bool) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0B30.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0B30.s"
 }
 
-asm  JKRSolidHeap::~JKRSolidHeap(void) {
+asm JKRSolidHeap::~JKRSolidHeap(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0B8C.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0B8C.s"
 }
 
 asm void JKRSolidHeap::adjustSize(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0BF4.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0BF4.s"
 }
 
 asm void* JKRSolidHeap::do_alloc(unsigned long, int) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0CB0.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0CB0.s"
 }
 
 asm void JKRSolidHeap::allocFromHead(unsigned long, int) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0D58.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0D58.s"
 }
 
 asm void JKRSolidHeap::allocFromTail(unsigned long, int) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0E20.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0E20.s"
 }
 
-asm void JKRSolidHeap::do_free(void *) {
+asm void JKRSolidHeap::do_free(void*) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0EE4.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0EE4.s"
 }
 
 asm void JKRSolidHeap::do_freeAll(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0F14.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0F14.s"
 }
 
 asm void JKRSolidHeap::do_freeTail(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0F74.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0F74.s"
 }
 
 asm void JKRSolidHeap::do_fillFreeArea(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D1000.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D1000.s"
 }
 
-asm s32 JKRSolidHeap::do_resize(void *, unsigned long) {
+asm s32 JKRSolidHeap::do_resize(void*, unsigned long) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D1004.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D1004.s"
 }
 
-asm s32 JKRSolidHeap::do_getSize(void *) {
+asm s32 JKRSolidHeap::do_getSize(void*) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D1038.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D1038.s"
 }
 
 asm bool JKRSolidHeap::check(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D106C.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D106C.s"
 }
 
 asm bool JKRSolidHeap::dump(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D10FC.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D10FC.s"
 }
 
-asm void JKRSolidHeap::state_register(JKRHeap::TState *, unsigned long) const {
+asm void JKRSolidHeap::state_register(JKRHeap::TState*, unsigned long) const {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D11FC.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D11FC.s"
 }
 
-asm bool JKRSolidHeap::state_compare(JKRHeap::TState const &, JKRHeap::TState const &) const {
+asm bool JKRSolidHeap::state_compare(JKRHeap::TState const&, JKRHeap::TState const&) const {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D1258.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D1258.s"
 }
 
 asm u32 JKRSolidHeap::getHeapType(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D1288.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D1288.s"
 }
 
 asm s32 JKRSolidHeap::do_getFreeSize(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D1294.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D1294.s"
 }
 
 asm void* JKRSolidHeap::do_getMaxFreeBlock(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D129C.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D129C.s"
 }
 
 asm s32 JKRSolidHeap::do_getTotalFreeSize(void) {
     nofralloc
-    #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D12A4.s"
+#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D12A4.s"
 }
-
diff --git a/libs/JSystem/JKernel/JKRThread.cpp b/libs/JSystem/JKernel/JKRThread.cpp
index b7ce3ce794..59b29907fd 100644
--- a/libs/JSystem/JKernel/JKRThread.cpp
+++ b/libs/JSystem/JKernel/JKRThread.cpp
@@ -5,10 +5,10 @@
 // #include "JSystem/JKernel/JKRThread/asm/func_802D1568.s"
 JKRThread::JKRThread(u32 stack_size, int message_count, int param_3) : mThreadListLink(this) {
     this->mSwitchCount = 0;
-    this->mCost        = 0;
-    this->field_0x6c   = 0;
-    this->field_0x60   = 0;
-    this->field_0x70   = 0;
+    this->mCost = 0;
+    this->field_0x6c = 0;
+    this->field_0x60 = 0;
+    this->field_0x70 = 0;
 
     JKRHeap* heap = JKRHeap::findFromRoot(this);
     if (heap == NULL) {
@@ -20,12 +20,13 @@ JKRThread::JKRThread(u32 stack_size, int message_count, int param_3) : mThreadLi
 }
 
 // #include "JSystem/JKernel/JKRThread/asm/func_802D1610.s"
-JKRThread::JKRThread(JKRHeap* heap, u32 stack_size, int message_count, int param_4) : mThreadListLink(this) {
+JKRThread::JKRThread(JKRHeap* heap, u32 stack_size, int message_count, int param_4)
+    : mThreadListLink(this) {
     this->mSwitchCount = 0;
-    this->mCost        = 0;
-    this->field_0x6c   = 0;
-    this->field_0x60   = 0;
-    this->field_0x70   = 0;
+    this->mCost = 0;
+    this->field_0x6c = 0;
+    this->field_0x60 = 0;
+    this->field_0x70 = 0;
 
     if (heap == NULL) {
         heap = lbl_80451374;
@@ -48,7 +49,7 @@ asm JKRThread::~JKRThread() {
 // #include "JSystem/JKernel/JKRThread/asm/func_802D1830.s"
 void JKRThread::setCommon_mesgQueue(JKRHeap* heap, int message_count) {
     this->mMessageCount = message_count;
-    this->mMessages     = (OSMessage*)JKRHeap::alloc(this->mMessageCount * sizeof(OSMessage), 0, heap);
+    this->mMessages = (OSMessage*)JKRHeap::alloc(this->mMessageCount * sizeof(OSMessage), 0, heap);
 
     OSInitMessageQueue(&this->mQueue, this->mMessages, this->mMessageCount);
     lbl_8043428C.append(&this->mThreadListLink);
@@ -59,10 +60,10 @@ void JKRThread::setCommon_mesgQueue(JKRHeap* heap, int message_count) {
 
 // #include "JSystem/JKernel/JKRThread/asm/func_802D18A4.s"
 void JKRThread::setCommon_heapSpecified(JKRHeap* heap, u32 stack_size, int param_3) {
-    this->mHeap      = heap;
+    this->mHeap = heap;
     this->mStackSize = stack_size & 0xffffffe0;
-    this->mStackPtr  = JKRHeap::alloc(this->mStackSize, 0x20, this->mHeap);           
-    this->mOSThread  = (OSThread*)JKRHeap::alloc(sizeof(OSThread), 0x20, this->mHeap); 
+    this->mStackPtr = JKRHeap::alloc(this->mStackSize, 0x20, this->mHeap);
+    this->mOSThread = (OSThread*)JKRHeap::alloc(sizeof(OSThread), 0x20, this->mHeap);
 
     void* stackBase = (void*)((int)this->mStackPtr + this->mStackSize);
     OSCreateThread(this->mOSThread, start, this, stackBase, this->mStackSize, param_3, 1);
@@ -119,7 +120,8 @@ asm void JKRThreadSwitch::callback(OSThread* param_1, OSThread* param_2) {
 #include "JSystem/JKernel/JKRThread/asm/func_802D1AE4.s"
 }
 
-asm void JKRThreadSwitch::draw(JKRThreadName_* param_1, JUTConsole* param_2){nofralloc
+asm void JKRThreadSwitch::draw(JKRThreadName_* param_1, JUTConsole* param_2) {
+    nofralloc
 #include "JSystem/JKernel/JKRThread/asm/func_802D1C74.s"
 }
 
diff --git a/libs/JSystem/JSupport/JSUList.cpp b/libs/JSystem/JSupport/JSUList.cpp
index 5aacdb34b7..54f7936615 100644
--- a/libs/JSystem/JSupport/JSUList.cpp
+++ b/libs/JSystem/JSupport/JSUList.cpp
@@ -3,10 +3,10 @@
 
 // #include "JSupport/asm/func_802DBDFC.s"
 JSUPtrLink::JSUPtrLink(void* object) {
-    this->mList   = NULL;
+    this->mList = NULL;
     this->mObject = object;
-    this->mPrev   = NULL;
-    this->mNext   = NULL;
+    this->mPrev = NULL;
+    this->mNext = NULL;
 }
 
 // #include "JSupport/asm/func_802DBE14.s"
@@ -30,35 +30,35 @@ JSUPtrList::JSUPtrList(bool init) {
 // #include "JSupport/asm/func_802DBEAC.s"
 JSUPtrList::~JSUPtrList() {
     JSUPtrLink* node = this->mHead;
-    s32 removed      = 0;
+    s32 removed = 0;
     while (this->mLength > removed) {
         node->mList = NULL;
-        node        = node->getNext();
+        node = node->getNext();
         removed += 1;
     }
 }
 
 // #include "JSupport/asm/func_802DBF14.s"
 void JSUPtrList::initiate() {
-    this->mHead   = NULL;
-    this->mTail   = NULL;
+    this->mHead = NULL;
+    this->mTail = NULL;
     this->mLength = 0;
 }
 
 // #include "JSupport/asm/func_802DBF28.s"
 void JSUPtrList::setFirst(JSUPtrLink* first) {
-    first->mList  = this;
-    first->mPrev  = NULL;
-    first->mNext  = NULL;
-    this->mTail   = first;
-    this->mHead   = first;
+    first->mList = this;
+    first->mPrev = NULL;
+    first->mNext = NULL;
+    this->mTail = first;
+    this->mHead = first;
     this->mLength = 1;
 }
 
 // #include "JSupport/asm/func_802DBF4C.s"
 bool JSUPtrList::append(JSUPtrLink* ptr) {
     JSUPtrList* list = ptr->mList;
-    bool result      = (NULL == list);
+    bool result = (NULL == list);
     if (!result) {
         result = list->remove(ptr);
     }
@@ -67,11 +67,11 @@ bool JSUPtrList::append(JSUPtrLink* ptr) {
         if (this->mLength == 0) {
             this->setFirst(ptr);
         } else {
-            ptr->mList         = this;
-            ptr->mPrev         = this->mTail;
-            ptr->mNext         = NULL;
+            ptr->mList = this;
+            ptr->mPrev = this->mTail;
+            ptr->mNext = NULL;
             this->mTail->mNext = ptr;
-            this->mTail        = ptr;
+            this->mTail = ptr;
             this->mLength++;
         }
     }
@@ -82,7 +82,7 @@ bool JSUPtrList::append(JSUPtrLink* ptr) {
 // #include "JSupport/asm/func_802DBFF0.s"
 bool JSUPtrList::prepend(JSUPtrLink* ptr) {
     JSUPtrList* list = ptr->mList;
-    bool result      = (NULL == list);
+    bool result = (NULL == list);
     if (!result) {
         result = list->remove(ptr);
     }
@@ -91,11 +91,11 @@ bool JSUPtrList::prepend(JSUPtrLink* ptr) {
         if (this->mLength == 0) {
             this->setFirst(ptr);
         } else {
-            ptr->mList         = this;
-            ptr->mPrev         = NULL;
-            ptr->mNext         = this->mHead;
+            ptr->mList = this;
+            ptr->mPrev = NULL;
+            ptr->mNext = this->mHead;
             this->mHead->mPrev = ptr;
-            this->mHead        = ptr;
+            this->mHead = ptr;
             this->mLength++;
         }
     }
@@ -122,11 +122,11 @@ bool JSUPtrList::insert(JSUPtrLink* before, JSUPtrLink* ptr) {
 
     if (result) {
         JSUPtrLink* prev = before->mPrev;
-        ptr->mList       = this;
-        ptr->mPrev       = prev;
-        ptr->mNext       = before;
-        prev->mNext      = ptr;
-        before->mPrev    = ptr;
+        ptr->mList = this;
+        ptr->mPrev = prev;
+        ptr->mNext = before;
+        prev->mNext = ptr;
+        before->mPrev = ptr;
         this->mLength++;
     }
 
@@ -142,10 +142,10 @@ bool JSUPtrList::remove(JSUPtrLink* ptr) {
             this->mTail = NULL;
         } else if (ptr == this->mHead) {
             ptr->mNext->mPrev = NULL;
-            this->mHead       = ptr->mNext;
+            this->mHead = ptr->mNext;
         } else if (ptr == this->mTail) {
             ptr->mPrev->mNext = NULL;
-            this->mTail       = ptr->mPrev;
+            this->mTail = ptr->mPrev;
         } else {
             ptr->mPrev->mNext = ptr->mNext;
             ptr->mNext->mPrev = ptr->mPrev;
diff --git a/libs/JSystem/JUtility/JUTFont.cpp b/libs/JSystem/JUtility/JUTFont.cpp
index 1e755532a4..8a44e31b8f 100644
--- a/libs/JSystem/JUtility/JUTFont.cpp
+++ b/libs/JSystem/JUtility/JUTFont.cpp
@@ -1,8 +1,7 @@
 #include "JSystem/JUtility/JUTFont/JUTFont.h"
 
 #ifdef NONMATCHING
-JUTFont::JUTFont()
-{
+JUTFont::JUTFont() {
     mColor1 = TColor();
     mColor2 = TColor();
     mColor3 = TColor();
@@ -11,8 +10,7 @@ JUTFont::JUTFont()
 }
 #endif
 
-void JUTFont::initialize_state()
-{
+void JUTFont::initialize_state() {
     setCharColor(TColor());
     unk5 = false;
     unk8 = 0;
@@ -33,7 +31,8 @@ void JUTFont::setGradColor(TColor col1, TColor col2) {
     mColor4 = col2;
 }
 
-asm float JUTFont::drawString_size_scale(float a1, float a2, float a3, float a4, char* a5, unsigned long usz, bool a7) {
+asm float JUTFont::drawString_size_scale(float a1, float a2, float a3, float a4, char* a5,
+                                         unsigned long usz, bool a7) {
     nofralloc
 
 #include "JSystem/JUtility/JUTFont/asm/drawString_size_scale.s"
diff --git a/libs/JSystem/JUtility/JUTResFont.cpp b/libs/JSystem/JUtility/JUTResFont.cpp
index 5d32654f37..2bfc841600 100644
--- a/libs/JSystem/JUtility/JUTResFont.cpp
+++ b/libs/JSystem/JUtility/JUTResFont.cpp
@@ -1,13 +1,18 @@
 #include "JSystem/JUtility/JUTResFont.h"
 
 extern "C" {
-extern void convertSjis__10JUTResFontFlPUs(); // remove when JUTResFont::getFontCode decompiled
-extern void getFontCode__10JUTResFontFl(); // remove when JUTResFont::getWidthEntry decompiled
-extern void loadFont__10JUTResFontFlUlPQ27JUTFont6TWidth(); // remove when JUTResFont::drawChar_scale decompiled
-extern void countBlock__10JUTResFontFv(); // remove when JUTResFont::protected_initiate decompiled
-extern void initialize_state__7JUTFontFv(); // remove when JUTResFont::protected_initiate decompiled
-extern void initialize_state__10JUTResFontFv(); // remove when JUTResFont::protected_initiate decompiled
-extern void deleteMemBlocks_ResFont__10JUTResFontFv(); // remove when JUTResFont::protected_initiate decompiled
+extern void convertSjis__10JUTResFontFlPUs();  // remove when JUTResFont::getFontCode decompiled
+extern void getFontCode__10JUTResFontFl();     // remove when JUTResFont::getWidthEntry decompiled
+extern void
+loadFont__10JUTResFontFlUlPQ27JUTFont6TWidth();  // remove when JUTResFont::drawChar_scale
+                                                 // decompiled
+extern void countBlock__10JUTResFontFv();  // remove when JUTResFont::protected_initiate decompiled
+extern void
+initialize_state__7JUTFontFv();  // remove when JUTResFont::protected_initiate decompiled
+extern void
+initialize_state__10JUTResFontFv();  // remove when JUTResFont::protected_initiate decompiled
+extern void
+deleteMemBlocks_ResFont__10JUTResFontFv();  // remove when JUTResFont::protected_initiate decompiled
 }
 
 extern float lbl_80455FF0;
@@ -44,49 +49,75 @@ JUTResFont::~JUTResFont() {
 #else
 asm JUTResFont::~JUTResFont() {
     nofralloc
-/* 802DF000 002DBF40  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802DF004 002DBF44  7C 08 02 A6 */	mflr r0
-/* 802DF008 002DBF48  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802DF00C 002DBF4C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802DF010 002DBF50  93 C1 00 08 */	stw r30, 8(r1)
-/* 802DF014 002DBF54  7C 7E 1B 79 */	or. r30, r3, r3
-/* 802DF018 002DBF58  7C 9F 23 78 */	mr r31, r4
-/* 802DF01C 002DBF5C  41 82 00 54 */	beq lbl_802DF070
-/* 802DF020 002DBF60  3C 80 80 3D */	lis r4, lbl_803CC5A0@ha
-/* 802DF024 002DBF64  38 04 C5 A0 */	addi r0, r4, lbl_803CC5A0@l
-/* 802DF028 002DBF68  90 1E 00 00 */	stw r0, 0(r30)
-/* 802DF02C 002DBF6C  88 1E 00 04 */	lbz r0, 4(r30)
-/* 802DF030 002DBF70  28 00 00 00 */	cmplwi r0, 0
-/* 802DF034 002DBF74  41 82 00 18 */	beq lbl_802DF04C
-/* 802DF038 002DBF78  48 00 00 55 */	bl deleteMemBlocks_ResFont__10JUTResFontFv
-/* 802DF03C 002DBF7C  7F C3 F3 78 */	mr r3, r30
-/* 802DF040 002DBF80  48 00 00 71 */	bl initialize_state__10JUTResFontFv
-/* 802DF044 002DBF84  7F C3 F3 78 */	mr r3, r30
-/* 802DF048 002DBF88  4B FF FC DD */	bl initialize_state__7JUTFontFv
-lbl_802DF04C:
-/* 802DF04C 002DBF8C  28 1E 00 00 */	cmplwi r30, 0
-/* 802DF050 002DBF90  41 82 00 10 */	beq lbl_802DF060
-/* 802DF054 002DBF94  3C 60 80 3A */	lis r3, lbl_803A31F0@ha
-/* 802DF058 002DBF98  38 03 31 F0 */	addi r0, r3, lbl_803A31F0@l
-/* 802DF05C 002DBF9C  90 1E 00 00 */	stw r0, 0(r30)
-lbl_802DF060:
-/* 802DF060 002DBFA0  7F E0 07 35 */	extsh. r0, r31
-/* 802DF064 002DBFA4  40 81 00 0C */	ble lbl_802DF070
-/* 802DF068 002DBFA8  7F C3 F3 78 */	mr r3, r30
-/* 802DF06C 002DBFAC  4B FE FC D1 */	bl __dl__FPv
-lbl_802DF070:
-/* 802DF070 002DBFB0  7F C3 F3 78 */	mr r3, r30
-/* 802DF074 002DBFB4  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802DF078 002DBFB8  83 C1 00 08 */	lwz r30, 8(r1)
-/* 802DF07C 002DBFBC  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802DF080 002DBFC0  7C 08 03 A6 */	mtlr r0
-/* 802DF084 002DBFC4  38 21 00 10 */	addi r1, r1, 0x10
-/* 802DF088 002DBFC8  4E 80 00 20 */	blr 
+        /* 802DF000 002DBF40  94 21 FF F0 */ stwu r1,
+        -0x10(r1)
+        /* 802DF004 002DBF44  7C 08 02 A6 */ mflr r0
+            /* 802DF008 002DBF48  90 01 00 14 */ stw r0,
+        0x14(r1)
+        /* 802DF00C 002DBF4C  93 E1 00 0C */ stw r31,
+        0xc(r1)
+        /* 802DF010 002DBF50  93 C1 00 08 */ stw r30,
+        8(r1)
+            /* 802DF014 002DBF54  7C 7E 1B 79 */
+            or.r30,
+        r3,
+        r3
+            /* 802DF018 002DBF58  7C 9F 23 78 */ mr r31,
+        r4
+            /* 802DF01C 002DBF5C  41 82 00 54 */ beq lbl_802DF070
+                /* 802DF020 002DBF60  3C 80 80 3D */ lis r4,
+        lbl_803CC5A0 @ha
+            /* 802DF024 002DBF64  38 04 C5 A0 */ addi r0,
+        r4,
+        lbl_803CC5A0 @l
+            /* 802DF028 002DBF68  90 1E 00 00 */ stw r0,
+        0(r30)
+        /* 802DF02C 002DBF6C  88 1E 00 04 */ lbz r0,
+        4(r30)
+        /* 802DF030 002DBF70  28 00 00 00 */ cmplwi r0,
+        0
+        /* 802DF034 002DBF74  41 82 00 18 */ beq lbl_802DF04C
+            /* 802DF038 002DBF78  48 00 00 55 */ bl deleteMemBlocks_ResFont__10JUTResFontFv
+                /* 802DF03C 002DBF7C  7F C3 F3 78 */ mr r3,
+        r30
+            /* 802DF040 002DBF80  48 00 00 71 */ bl initialize_state__10JUTResFontFv
+                /* 802DF044 002DBF84  7F C3 F3 78 */ mr r3,
+        r30
+            /* 802DF048 002DBF88  4B FF FC DD */ bl initialize_state__7JUTFontFv lbl_802DF04C :
+        /* 802DF04C 002DBF8C  28 1E 00 00 */ cmplwi r30,
+        0
+        /* 802DF050 002DBF90  41 82 00 10 */ beq lbl_802DF060
+            /* 802DF054 002DBF94  3C 60 80 3A */ lis r3,
+        lbl_803A31F0 @ha
+            /* 802DF058 002DBF98  38 03 31 F0 */ addi r0,
+        r3,
+        lbl_803A31F0 @l
+            /* 802DF05C 002DBF9C  90 1E 00 00 */ stw r0,
+        0(r30)lbl_802DF060 :
+        /* 802DF060 002DBFA0  7F E0 07 35 */ extsh.r0,
+        r31
+            /* 802DF064 002DBFA4  40 81 00 0C */ ble lbl_802DF070
+                /* 802DF068 002DBFA8  7F C3 F3 78 */ mr r3,
+        r30
+            /* 802DF06C 002DBFAC  4B FE FC D1 */ bl __dl__FPv lbl_802DF070 :
+        /* 802DF070 002DBFB0  7F C3 F3 78 */ mr r3,
+        r30
+            /* 802DF074 002DBFB4  83 E1 00 0C */ lwz r31,
+        0xc(r1)
+        /* 802DF078 002DBFB8  83 C1 00 08 */ lwz r30,
+        8(r1)
+        /* 802DF07C 002DBFBC  80 01 00 14 */ lwz r0,
+        0x14(r1)
+        /* 802DF080 002DBFC0  7C 08 03 A6 */ mtlr r0
+            /* 802DF084 002DBFC4  38 21 00 10 */ addi r1,
+        r1,
+        0x10
+        /* 802DF088 002DBFC8  4E 80 00 20 */ blr
 }
 #endif
 
 void JUTResFont::deleteMemBlocks_ResFont() {
-    delete[] (void*)unk50;
+    delete[](void*) unk50;
 }
 
 void JUTResFont::initialize_state() {
@@ -144,7 +175,7 @@ void JUTResFont::setGX() {
     GXSetVtxDesc(0xd, 0x1);
 }
 
-void JUTResFont::setGX(TColor col1, TColor col2) {    
+void JUTResFont::setGX(TColor col1, TColor col2) {
     if ((col1.Raw() == CLR_BLACK) && (col2.Raw() == CLR_WHITE)) {
         setGX();
         return;
@@ -189,8 +220,7 @@ void JUTResFont::loadFont(s32 a1, u32 a2, TWidth* a3) {
     loadImage(code, a2);
 }
 
-asm void JUTResFont::getWidthEntry(s32 i_no, TWidth* width) {
-    nofralloc
+asm void JUTResFont::getWidthEntry(s32 i_no, TWidth* width){nofralloc
 #include "JSystem/JUtility/asm/JUTResFont__getWidthEntry.s"
 }
 
diff --git a/libs/SSystem/SComponent/c_bg_w.cpp b/libs/SSystem/SComponent/c_bg_w.cpp
index ef273bb50f..991e2981d4 100644
--- a/libs/SSystem/SComponent/c_bg_w.cpp
+++ b/libs/SSystem/SComponent/c_bg_w.cpp
@@ -23,11 +23,10 @@ bool cBgW_CheckBRoof(float a1) {
     return a1 < lbl_804550EC;
 }
 
-bool cBgW_CheckBWall(float a1)
-{
+bool cBgW_CheckBWall(float a1) {
     if (!cBgW_CheckBGround(a1) && !cBgW_CheckBRoof(a1))
         return true;
-    
+
     return false;
 }
 
diff --git a/libs/SSystem/SComponent/c_counter.cpp b/libs/SSystem/SComponent/c_counter.cpp
index cad95bd1ce..d30369eb49 100644
--- a/libs/SSystem/SComponent/c_counter.cpp
+++ b/libs/SSystem/SComponent/c_counter.cpp
@@ -10,8 +10,7 @@ extern counter_class lbl_80430CD8;
 
 extern "C" {
 
-void cCt_Counter(int resetCounter1)
-{
+void cCt_Counter(int resetCounter1) {
     if (resetCounter1 == 1) {
         lbl_80430CD8.mCounter1 = 0;
     } else {
@@ -20,5 +19,4 @@ void cCt_Counter(int resetCounter1)
 
     lbl_80430CD8.mCounter0++;
 }
-
 };
diff --git a/libs/SSystem/SComponent/c_list.cpp b/libs/SSystem/SComponent/c_list.cpp
index 22e18ba1c7..f1133b8890 100644
--- a/libs/SSystem/SComponent/c_list.cpp
+++ b/libs/SSystem/SComponent/c_list.cpp
@@ -1,19 +1,17 @@
 
-#include "global.h"
 #include "SComponent/c_list.h"
+#include "global.h"
 
 extern "C" {
 
-void cLs_Init(node_list_class *pList)
-{
+void cLs_Init(node_list_class* pList) {
     pList->mpHead = NULL;
     pList->mpTail = NULL;
     pList->mSize = 0;
 }
 
-int cLs_SingleCut(node_class *pNode)
-{
-    node_list_class *pList = (node_list_class *) pNode->mpData;
+int cLs_SingleCut(node_class* pNode) {
+    node_list_class* pList = (node_list_class*)pNode->mpData;
     if (pNode == pList->mpHead)
         pList->mpHead = pNode->mpNextNode;
     if (pNode == pList->mpTail)
@@ -25,8 +23,7 @@ int cLs_SingleCut(node_class *pNode)
     return newSize > 0;
 }
 
-int cLs_Addition(node_list_class *pList, node_class *pNode)
-{
+int cLs_Addition(node_list_class* pList, node_class* pNode) {
     if (pList->mpTail == NULL) {
         pList->mpHead = pNode;
     } else {
@@ -39,9 +36,8 @@ int cLs_Addition(node_list_class *pList, node_class *pNode)
     return pList->mSize;
 }
 
-int cLs_Insert(node_list_class *pList, int idx, node_class *pNode)
-{
-    node_class *pExisting = cNd_Order(pList->mpHead, idx);
+int cLs_Insert(node_list_class* pList, int idx, node_class* pNode) {
+    node_class* pExisting = cNd_Order(pList->mpHead, idx);
     if (pExisting == NULL) {
         return cLs_Addition(pList, pNode);
     } else {
@@ -53,10 +49,9 @@ int cLs_Insert(node_list_class *pList, int idx, node_class *pNode)
     }
 }
 
-node_class * cLs_GetFirst(node_list_class *pList)
-{
+node_class* cLs_GetFirst(node_list_class* pList) {
     if (pList->mSize != 0) {
-        node_class *pHead = pList->mpHead;
+        node_class* pHead = pList->mpHead;
         cLs_SingleCut(pHead);
         return pHead;
     } else {
@@ -64,9 +59,7 @@ node_class * cLs_GetFirst(node_list_class *pList)
     }
 }
 
-void cLs_Create(node_list_class *pList)
-{
+void cLs_Create(node_list_class* pList) {
     cLs_Init(pList);
 }
-
 };
diff --git a/libs/SSystem/SComponent/c_list_iter.cpp b/libs/SSystem/SComponent/c_list_iter.cpp
index 1ee96ca935..322ab4d876 100644
--- a/libs/SSystem/SComponent/c_list_iter.cpp
+++ b/libs/SSystem/SComponent/c_list_iter.cpp
@@ -1,23 +1,20 @@
 
-#include "global.h"
 #include "SComponent/c_list_iter.h"
+#include "global.h"
 
 extern "C" {
 
-int cLsIt_Method(node_list_class *pList, cNdIt_MethodFunc pMethod, void *pUserData)
-{
+int cLsIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod, void* pUserData) {
     if (pList->mSize > 0)
         return cNdIt_Method(pList->mpHead, pMethod, pUserData);
     else
         return 1;
 }
 
-void * cLsIt_Judge(node_list_class *pList, cNdIt_JudgeFunc pJudge, void *pUserData)
-{
+void* cLsIt_Judge(node_list_class* pList, cNdIt_JudgeFunc pJudge, void* pUserData) {
     if (pList->mSize > 0)
         return cNdIt_Judge(pList->mpHead, pJudge, pUserData);
     else
         return NULL;
 }
-
 };
diff --git a/libs/SSystem/SComponent/c_node.cpp b/libs/SSystem/SComponent/c_node.cpp
index 4fd843d63e..1d7a6ad353 100644
--- a/libs/SSystem/SComponent/c_node.cpp
+++ b/libs/SSystem/SComponent/c_node.cpp
@@ -1,20 +1,18 @@
 
-#include "global.h"
 #include "SComponent/c_node.h"
+#include "global.h"
 
 extern "C" {
 
 #define NODE_GET_PREV(pNode) (pNode ? pNode->mpPrevNode : NULL)
 #define NODE_GET_NEXT(pNode) (pNode ? pNode->mpNextNode : NULL)
 
-void cNd_Join(node_class *pA, node_class *pB)
-{
+void cNd_Join(node_class* pA, node_class* pB) {
     pA->mpNextNode = pB;
     pB->mpPrevNode = pA;
 }
 
-int cNd_LengthOf(node_class *pNode)
-{
+int cNd_LengthOf(node_class* pNode) {
     int count = 0;
     while (pNode) {
         count++;
@@ -23,9 +21,8 @@ int cNd_LengthOf(node_class *pNode)
     return count;
 }
 
-node_class * cNd_First(node_class *pNode)
-{
-    node_class *pRet = NULL;
+node_class* cNd_First(node_class* pNode) {
+    node_class* pRet = NULL;
     while (pNode) {
         pRet = pNode;
         pNode = NODE_GET_PREV(pNode);
@@ -33,9 +30,8 @@ node_class * cNd_First(node_class *pNode)
     return pRet;
 }
 
-node_class * cNd_Last(node_class *pNode)
-{
-    node_class *pRet = NULL;
+node_class* cNd_Last(node_class* pNode) {
+    node_class* pRet = NULL;
     while (pNode) {
         pRet = pNode;
         pNode = NODE_GET_NEXT(pNode);
@@ -43,9 +39,8 @@ node_class * cNd_Last(node_class *pNode)
     return pRet;
 }
 
-node_class * cNd_Order(node_class *pNode, int idx)
-{
-    node_class *pRet = NULL;
+node_class* cNd_Order(node_class* pNode, int idx) {
+    node_class* pRet = NULL;
     int i = 0;
     while (i < idx && pNode) {
         pRet = pNode;
@@ -57,10 +52,9 @@ node_class * cNd_Order(node_class *pNode, int idx)
     return NULL;
 }
 
-void cNd_SingleCut(node_class *pNode)
-{
-    node_class *pPrev = pNode->mpPrevNode;
-    node_class *pNext = pNode->mpNextNode;
+void cNd_SingleCut(node_class* pNode) {
+    node_class* pPrev = pNode->mpPrevNode;
+    node_class* pNext = pNode->mpNextNode;
 
     if (pPrev)
         pPrev->mpNextNode = pNode->mpNextNode;
@@ -70,22 +64,19 @@ void cNd_SingleCut(node_class *pNode)
     pNode->mpNextNode = NULL;
 }
 
-void cNd_Cut(node_class *pNode)
-{
+void cNd_Cut(node_class* pNode) {
     if (pNode->mpPrevNode)
         pNode->mpPrevNode->mpNextNode = NULL;
     pNode->mpPrevNode = NULL;
 }
 
-void cNd_Addition(node_class *pA, node_class *pB)
-{
-    node_class *pLast = cNd_Last(pA);
+void cNd_Addition(node_class* pA, node_class* pB) {
+    node_class* pLast = cNd_Last(pA);
     cNd_Join(pLast, pB);
 }
 
-void cNd_Insert(node_class *pA, node_class *pB)
-{
-    node_class *pPrev = pA->mpPrevNode;
+void cNd_Insert(node_class* pA, node_class* pB) {
+    node_class* pPrev = pA->mpPrevNode;
     if (pPrev == NULL) {
         cNd_Addition(pB, pA);
     } else {
@@ -95,31 +86,26 @@ void cNd_Insert(node_class *pA, node_class *pB)
     }
 }
 
-void cNd_SetObject(node_class *pNode, void *pData)
-{
+void cNd_SetObject(node_class* pNode, void* pData) {
     while (pNode) {
         pNode->mpData = pData;
         pNode = NODE_GET_NEXT(pNode);
     }
 }
 
-void cNd_ClearObject(node_class *pNode)
-{
+void cNd_ClearObject(node_class* pNode) {
     cNd_SetObject(pNode, NULL);
 }
 
-void cNd_ForcedClear(node_class *pNode)
-{
+void cNd_ForcedClear(node_class* pNode) {
     pNode->mpPrevNode = NULL;
     pNode->mpNextNode = NULL;
     pNode->mpData = NULL;
 }
 
-void cNd_Create(node_class *pNode, void *pData)
-{
+void cNd_Create(node_class* pNode, void* pData) {
     pNode->mpPrevNode = NULL;
     pNode->mpNextNode = NULL;
     pNode->mpData = pData;
 }
-
 };
diff --git a/libs/SSystem/SComponent/c_node_iter.cpp b/libs/SSystem/SComponent/c_node_iter.cpp
index 0f0a9613fe..56bc0a3dc2 100644
--- a/libs/SSystem/SComponent/c_node_iter.cpp
+++ b/libs/SSystem/SComponent/c_node_iter.cpp
@@ -1,16 +1,15 @@
 
-#include "global.h"
 #include "SComponent/c_node_iter.h"
+#include "global.h"
 
 extern "C" {
 
 #define NODE_GET_PREV(pNode) (pNode ? pNode->mpPrevNode : NULL)
 #define NODE_GET_NEXT(pNode) (pNode ? pNode->mpNextNode : NULL)
 
-int cNdIt_Method(node_class *pNode, cNdIt_MethodFunc pMethod, void *pUserData)
-{
+int cNdIt_Method(node_class* pNode, cNdIt_MethodFunc pMethod, void* pUserData) {
     int ret = 1;
-    node_class *pNext = NODE_GET_NEXT(pNode);
+    node_class* pNext = NODE_GET_NEXT(pNode);
 
     while (pNode) {
         int methodRet = pMethod(pNode, pUserData);
@@ -23,12 +22,11 @@ int cNdIt_Method(node_class *pNode, cNdIt_MethodFunc pMethod, void *pUserData)
     return ret;
 }
 
-void * cNdIt_Judge(node_class *pNode, cNdIt_JudgeFunc pJudge, void *pUserData)
-{
-    node_class *pNext = NODE_GET_NEXT(pNode);
+void* cNdIt_Judge(node_class* pNode, cNdIt_JudgeFunc pJudge, void* pUserData) {
+    node_class* pNext = NODE_GET_NEXT(pNode);
 
     while (pNode) {
-        void *pJudgeRet = pJudge(pNode, pUserData);
+        void* pJudgeRet = pJudge(pNode, pUserData);
         if (pJudgeRet != NULL)
             return pJudgeRet;
         pNode = pNext;
@@ -37,5 +35,4 @@ void * cNdIt_Judge(node_class *pNode, cNdIt_JudgeFunc pJudge, void *pUserData)
 
     return NULL;
 }
-
 };
diff --git a/libs/SSystem/SComponent/c_phase.cpp b/libs/SSystem/SComponent/c_phase.cpp
index 28ffa56643..7b6a8439fc 100644
--- a/libs/SSystem/SComponent/c_phase.cpp
+++ b/libs/SSystem/SComponent/c_phase.cpp
@@ -1,33 +1,28 @@
 
-#include "global.h"
 #include "SComponent/c_phase.h"
+#include "global.h"
 
-void cPhs_Reset(request_of_phase_process_class *pPhase)
-{
+void cPhs_Reset(request_of_phase_process_class* pPhase) {
     pPhase->mPhaseStep = 0;
 }
 
-void cPhs_Set(request_of_phase_process_class *pPhase, cPhs__Handler *pHandlerTable)
-{
+void cPhs_Set(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable) {
     pPhase->mpHandlerTable = pHandlerTable;
     pPhase->mPhaseStep = 0;
 }
 
-void cPhs_UnCompleate(request_of_phase_process_class *pPhase)
-{
+void cPhs_UnCompleate(request_of_phase_process_class* pPhase) {
     pPhase->mpHandlerTable = NULL;
     cPhs_Reset(pPhase);
 }
 
-int cPhs_Compleate(request_of_phase_process_class *pPhase)
-{
+int cPhs_Compleate(request_of_phase_process_class* pPhase) {
     pPhase->mpHandlerTable = NULL;
     return cPhs_COMPLEATE_e;
 }
 
 #if NON_MATCHING
-int cPhs_Next(request_of_phase_process_class *pPhase)
-{
+int cPhs_Next(request_of_phase_process_class* pPhase) {
     // flow control
 
     if (pPhase->mpHandlerTable != NULL) {
@@ -42,44 +37,57 @@ int cPhs_Next(request_of_phase_process_class *pPhase)
     return cPhs_COMPLEATE_e;
 }
 #else
-asm int cPhs_Next(request_of_phase_process_class *pPhase)
-{
+asm int cPhs_Next(request_of_phase_process_class* pPhase) {
     nofralloc
-    /* 80266678 002635B8  94 21 FF F0 */	stwu r1, -0x10(r1)
-    /* 8026667C 002635BC  7C 08 02 A6 */	mflr r0
-    /* 80266680 002635C0  90 01 00 14 */	stw r0, 0x14(r1)
-    /* 80266684 002635C4  80 A3 00 00 */	lwz r5, 0(r3)
-    /* 80266688 002635C8  28 05 00 00 */	cmplwi r5, 0
-    /* 8026668C 002635CC  41 82 00 38 */	beq lbl_802666C4
-    /* 80266690 002635D0  80 83 00 04 */	lwz r4, 4(r3)
-    /* 80266694 002635D4  38 04 00 01 */	addi r0, r4, 1
-    /* 80266698 002635D8  90 03 00 04 */	stw r0, 4(r3)
-    /* 8026669C 002635DC  80 03 00 04 */	lwz r0, 4(r3)
-    /* 802666A0 002635E0  54 00 10 3A */	slwi r0, r0, 2
-    /* 802666A4 002635E4  7C 05 00 2E */	lwzx r0, r5, r0
-    /* 802666A8 002635E8  28 00 00 00 */	cmplwi r0, 0
-    /* 802666AC 002635EC  41 82 00 08 */	beq lbl_802666B4
-    /* 802666B0 002635F0  40 82 00 0C */	bne lbl_802666BC
-    lbl_802666B4:
-    /* 802666B4 002635F4  4B FF FF B5 */	bl cPhs_Compleate
-    /* 802666B8 002635F8  48 00 00 10 */	b lbl_802666C8
-    lbl_802666BC:
-    /* 802666BC 002635FC  38 60 00 01 */	li r3, 1
-    /* 802666C0 00263600  48 00 00 08 */	b lbl_802666C8
-    lbl_802666C4:
-    /* 802666C4 00263604  38 60 00 04 */	li r3, 4
-    lbl_802666C8:
-    /* 802666C8 00263608  80 01 00 14 */	lwz r0, 0x14(r1)
-    /* 802666CC 0026360C  7C 08 03 A6 */	mtlr r0
-    /* 802666D0 00263610  38 21 00 10 */	addi r1, r1, 0x10
-    /* 802666D4 00263614  4E 80 00 20 */	blr
+        /* 80266678 002635B8  94 21 FF F0 */ stwu r1,
+        -0x10(r1)
+        /* 8026667C 002635BC  7C 08 02 A6 */ mflr r0
+            /* 80266680 002635C0  90 01 00 14 */ stw r0,
+        0x14(r1)
+        /* 80266684 002635C4  80 A3 00 00 */ lwz r5,
+        0(r3)
+        /* 80266688 002635C8  28 05 00 00 */ cmplwi r5,
+        0
+        /* 8026668C 002635CC  41 82 00 38 */ beq lbl_802666C4
+            /* 80266690 002635D0  80 83 00 04 */ lwz r4,
+        4(r3)
+        /* 80266694 002635D4  38 04 00 01 */ addi r0,
+        r4,
+        1
+        /* 80266698 002635D8  90 03 00 04 */ stw r0,
+        4(r3)
+        /* 8026669C 002635DC  80 03 00 04 */ lwz r0,
+        4(r3)
+        /* 802666A0 002635E0  54 00 10 3A */ slwi r0,
+        r0,
+        2
+        /* 802666A4 002635E4  7C 05 00 2E */ lwzx r0,
+        r5,
+        r0
+            /* 802666A8 002635E8  28 00 00 00 */ cmplwi r0,
+        0
+        /* 802666AC 002635EC  41 82 00 08 */ beq lbl_802666B4
+            /* 802666B0 002635F0  40 82 00 0C */ bne lbl_802666BC lbl_802666B4 :
+        /* 802666B4 002635F4  4B FF FF B5 */ bl cPhs_Compleate
+            /* 802666B8 002635F8  48 00 00 10 */ b lbl_802666C8 lbl_802666BC :
+        /* 802666BC 002635FC  38 60 00 01 */ li r3,
+        1
+        /* 802666C0 00263600  48 00 00 08 */ b lbl_802666C8 lbl_802666C4 :
+        /* 802666C4 00263604  38 60 00 04 */ li r3,
+        4 lbl_802666C8 :
+        /* 802666C8 00263608  80 01 00 14 */ lwz r0,
+        0x14(r1)
+        /* 802666CC 0026360C  7C 08 03 A6 */ mtlr r0
+            /* 802666D0 00263610  38 21 00 10 */ addi r1,
+        r1,
+        0x10
+        /* 802666D4 00263614  4E 80 00 20 */ blr
 }
 #endif
 
 #if NON_MATCHING
-int cPhs_Do(request_of_phase_process_class *pPhase, void *pUserData)
-{
-    cPhs__Handler *pHandlerTable = pPhase->mpHandlerTable;
+int cPhs_Do(request_of_phase_process_class* pPhase, void* pUserData) {
+    cPhs__Handler* pHandlerTable = pPhase->mpHandlerTable;
     if (pHandlerTable != NULL) {
         // the load of pUserData seems to be slightly scrambled..
         int step = pPhase->mPhaseStep;
@@ -109,75 +117,95 @@ int cPhs_Do(request_of_phase_process_class *pPhase, void *pUserData)
     }
 }
 #else
-asm int cPhs_Do(request_of_phase_process_class *pPhase, void *pUserData)
-{
+asm int cPhs_Do(request_of_phase_process_class* pPhase, void* pUserData) {
     nofralloc
-    /* 802666D8 00263618  94 21 FF F0 */	stwu r1, -0x10(r1)
-    /* 802666DC 0026361C  7C 08 02 A6 */	mflr r0
-    /* 802666E0 00263620  90 01 00 14 */	stw r0, 0x14(r1)
-    /* 802666E4 00263624  93 E1 00 0C */	stw r31, 0xc(r1)
-    /* 802666E8 00263628  7C 7F 1B 78 */	mr r31, r3
-    /* 802666EC 0026362C  80 A3 00 00 */	lwz r5, 0(r3)
-    /* 802666F0 00263630  28 05 00 00 */	cmplwi r5, 0
-    /* 802666F4 00263634  41 82 00 A0 */	beq lbl_80266794
-    /* 802666F8 00263638  80 1F 00 04 */	lwz r0, 4(r31)
-    /* 802666FC 0026363C  54 00 10 3A */	slwi r0, r0, 2
-    /* 80266700 00263640  7C 83 23 78 */	mr r3, r4
-    /* 80266704 00263644  7D 85 00 2E */	lwzx r12, r5, r0
-    /* 80266708 00263648  7D 89 03 A6 */	mtctr r12
-    /* 8026670C 0026364C  4E 80 04 21 */	bctrl 
-    /* 80266710 00263650  2C 03 00 03 */	cmpwi r3, 3
-    /* 80266714 00263654  41 82 00 5C */	beq lbl_80266770
-    /* 80266718 00263658  40 80 00 14 */	bge lbl_8026672C
-    /* 8026671C 0026365C  2C 03 00 01 */	cmpwi r3, 1
-    /* 80266720 00263660  41 82 00 1C */	beq lbl_8026673C
-    /* 80266724 00263664  40 80 00 24 */	bge lbl_80266748
-    /* 80266728 00263668  48 00 00 70 */	b lbl_80266798
-    lbl_8026672C:
-    /* 8026672C 0026366C  2C 03 00 05 */	cmpwi r3, 5
-    /* 80266730 00263670  41 82 00 50 */	beq lbl_80266780
-    /* 80266734 00263674  40 80 00 64 */	bge lbl_80266798
-    /* 80266738 00263678  48 00 00 2C */	b lbl_80266764
-    lbl_8026673C:
-    /* 8026673C 0026367C  7F E3 FB 78 */	mr r3, r31
-    /* 80266740 00263680  4B FF FF 39 */	bl cPhs_Next
-    /* 80266744 00263684  48 00 00 54 */	b lbl_80266798
-    lbl_80266748:
-    /* 80266748 00263688  7F E3 FB 78 */	mr r3, r31
-    /* 8026674C 0026368C  4B FF FF 2D */	bl cPhs_Next
-    /* 80266750 00263690  2C 03 00 01 */	cmpwi r3, 1
-    /* 80266754 00263694  38 60 00 04 */	li r3, 4
-    /* 80266758 00263698  40 82 00 40 */	bne lbl_80266798
-    /* 8026675C 0026369C  38 60 00 02 */	li r3, 2
-    /* 80266760 002636A0  48 00 00 38 */	b lbl_80266798
-    lbl_80266764:
-    /* 80266764 002636A4  7F E3 FB 78 */	mr r3, r31
-    /* 80266768 002636A8  4B FF FF 01 */	bl cPhs_Compleate
-    /* 8026676C 002636AC  48 00 00 2C */	b lbl_80266798
-    lbl_80266770:
-    /* 80266770 002636B0  7F E3 FB 78 */	mr r3, r31
-    /* 80266774 002636B4  4B FF FE CD */	bl cPhs_UnCompleate
-    /* 80266778 002636B8  38 60 00 03 */	li r3, 3
-    /* 8026677C 002636BC  48 00 00 1C */	b lbl_80266798
-    lbl_80266780:
-    /* 80266780 002636C0  7F E3 FB 78 */	mr r3, r31
-    /* 80266784 002636C4  4B FF FE BD */	bl cPhs_UnCompleate
-    /* 80266788 002636C8  38 60 00 05 */	li r3, 5
-    /* 8026678C 002636CC  48 00 00 0C */	b lbl_80266798
-    /* 80266790 002636D0  48 00 00 08 */	b lbl_80266798
-    lbl_80266794:
-    /* 80266794 002636D4  4B FF FE D5 */	bl cPhs_Compleate
-    lbl_80266798:
-    /* 80266798 002636D8  83 E1 00 0C */	lwz r31, 0xc(r1)
-    /* 8026679C 002636DC  80 01 00 14 */	lwz r0, 0x14(r1)
-    /* 802667A0 002636E0  7C 08 03 A6 */	mtlr r0
-    /* 802667A4 002636E4  38 21 00 10 */	addi r1, r1, 0x10
-    /* 802667A8 002636E8  4E 80 00 20 */	blr 
+        /* 802666D8 00263618  94 21 FF F0 */ stwu r1,
+        -0x10(r1)
+        /* 802666DC 0026361C  7C 08 02 A6 */ mflr r0
+            /* 802666E0 00263620  90 01 00 14 */ stw r0,
+        0x14(r1)
+        /* 802666E4 00263624  93 E1 00 0C */ stw r31,
+        0xc(r1)
+        /* 802666E8 00263628  7C 7F 1B 78 */ mr r31,
+        r3
+            /* 802666EC 0026362C  80 A3 00 00 */ lwz r5,
+        0(r3)
+        /* 802666F0 00263630  28 05 00 00 */ cmplwi r5,
+        0
+        /* 802666F4 00263634  41 82 00 A0 */ beq lbl_80266794
+            /* 802666F8 00263638  80 1F 00 04 */ lwz r0,
+        4(r31)
+        /* 802666FC 0026363C  54 00 10 3A */ slwi r0,
+        r0,
+        2
+        /* 80266700 00263640  7C 83 23 78 */ mr r3,
+        r4
+            /* 80266704 00263644  7D 85 00 2E */ lwzx r12,
+        r5,
+        r0
+            /* 80266708 00263648  7D 89 03 A6 */ mtctr r12
+                /* 8026670C 0026364C  4E 80 04 21 */ bctrl
+                    /* 80266710 00263650  2C 03 00 03 */ cmpwi r3,
+        3
+        /* 80266714 00263654  41 82 00 5C */ beq lbl_80266770
+            /* 80266718 00263658  40 80 00 14 */ bge lbl_8026672C
+                /* 8026671C 0026365C  2C 03 00 01 */ cmpwi r3,
+        1
+        /* 80266720 00263660  41 82 00 1C */ beq lbl_8026673C
+            /* 80266724 00263664  40 80 00 24 */ bge lbl_80266748
+                /* 80266728 00263668  48 00 00 70 */ b lbl_80266798 lbl_8026672C :
+        /* 8026672C 0026366C  2C 03 00 05 */ cmpwi r3,
+        5
+        /* 80266730 00263670  41 82 00 50 */ beq lbl_80266780
+            /* 80266734 00263674  40 80 00 64 */ bge lbl_80266798
+                /* 80266738 00263678  48 00 00 2C */ b lbl_80266764 lbl_8026673C :
+        /* 8026673C 0026367C  7F E3 FB 78 */ mr r3,
+        r31
+            /* 80266740 00263680  4B FF FF 39 */ bl cPhs_Next
+                /* 80266744 00263684  48 00 00 54 */ b lbl_80266798 lbl_80266748 :
+        /* 80266748 00263688  7F E3 FB 78 */ mr r3,
+        r31
+            /* 8026674C 0026368C  4B FF FF 2D */ bl cPhs_Next
+                /* 80266750 00263690  2C 03 00 01 */ cmpwi r3,
+        1
+        /* 80266754 00263694  38 60 00 04 */ li r3,
+        4
+        /* 80266758 00263698  40 82 00 40 */ bne lbl_80266798
+            /* 8026675C 0026369C  38 60 00 02 */ li r3,
+        2
+        /* 80266760 002636A0  48 00 00 38 */ b lbl_80266798 lbl_80266764 :
+        /* 80266764 002636A4  7F E3 FB 78 */ mr r3,
+        r31
+            /* 80266768 002636A8  4B FF FF 01 */ bl cPhs_Compleate
+                /* 8026676C 002636AC  48 00 00 2C */ b lbl_80266798 lbl_80266770 :
+        /* 80266770 002636B0  7F E3 FB 78 */ mr r3,
+        r31
+            /* 80266774 002636B4  4B FF FE CD */ bl cPhs_UnCompleate
+                /* 80266778 002636B8  38 60 00 03 */ li r3,
+        3
+        /* 8026677C 002636BC  48 00 00 1C */ b lbl_80266798 lbl_80266780 :
+        /* 80266780 002636C0  7F E3 FB 78 */ mr r3,
+        r31
+            /* 80266784 002636C4  4B FF FE BD */ bl cPhs_UnCompleate
+                /* 80266788 002636C8  38 60 00 05 */ li r3,
+        5
+        /* 8026678C 002636CC  48 00 00 0C */ b lbl_80266798
+            /* 80266790 002636D0  48 00 00 08 */ b lbl_80266798 lbl_80266794 :
+        /* 80266794 002636D4  4B FF FE D5 */ bl cPhs_Compleate lbl_80266798 :
+        /* 80266798 002636D8  83 E1 00 0C */ lwz r31,
+        0xc(r1)
+        /* 8026679C 002636DC  80 01 00 14 */ lwz r0,
+        0x14(r1)
+        /* 802667A0 002636E0  7C 08 03 A6 */ mtlr r0
+            /* 802667A4 002636E4  38 21 00 10 */ addi r1,
+        r1,
+        0x10
+        /* 802667A8 002636E8  4E 80 00 20 */ blr
 }
 #endif
 
-int cPhs_Handler(request_of_phase_process_class *pPhase, cPhs__Handler *pHandlerTable, void *pUserData)
-{
+int cPhs_Handler(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable,
+                 void* pUserData) {
     pPhase->mpHandlerTable = pHandlerTable;
     return cPhs_Do(pPhase, pUserData);
 }
diff --git a/libs/SSystem/SComponent/c_tag.cpp b/libs/SSystem/SComponent/c_tag.cpp
index 7e4c62e902..8910e8ef05 100644
--- a/libs/SSystem/SComponent/c_tag.cpp
+++ b/libs/SSystem/SComponent/c_tag.cpp
@@ -4,13 +4,11 @@
 
 extern "C" {
 
-int cTg_IsUse(create_tag_class *pTag)
-{
+int cTg_IsUse(create_tag_class* pTag) {
     return pTag->mbIsUse;
 }
 
-int cTg_SingleCutFromTree(create_tag_class *pTag)
-{
+int cTg_SingleCutFromTree(create_tag_class* pTag) {
     if (pTag->mbIsUse == true) {
         pTag->mbIsUse = false;
         cTr_SingleCut(&pTag->mpNode);
@@ -20,8 +18,7 @@ int cTg_SingleCutFromTree(create_tag_class *pTag)
     }
 }
 
-int cTg_AdditionToTree(node_lists_tree_class *pTree, int listIdx, create_tag_class *pTag)
-{
+int cTg_AdditionToTree(node_lists_tree_class* pTree, int listIdx, create_tag_class* pTag) {
     if (!pTag->mbIsUse) {
         int ret = cTr_Addition(pTree, listIdx, &pTag->mpNode);
         if (ret) {
@@ -33,8 +30,7 @@ int cTg_AdditionToTree(node_lists_tree_class *pTree, int listIdx, create_tag_cla
     return 0;
 }
 
-int cTg_InsertToTree(node_lists_tree_class *pTree, int listIdx, create_tag_class *pTag, int idx)
-{
+int cTg_InsertToTree(node_lists_tree_class* pTree, int listIdx, create_tag_class* pTag, int idx) {
     if (!pTag->mbIsUse) {
         int ret = cTr_Insert(pTree, listIdx, &pTag->mpNode, idx);
         if (ret) {
@@ -46,9 +42,8 @@ int cTg_InsertToTree(node_lists_tree_class *pTree, int listIdx, create_tag_class
     return 0;
 }
 
-node_class * cTg_GetFirst(node_list_class *pList)
-{
-    create_tag_class *pTag = (create_tag_class *) cLs_GetFirst(pList);
+node_class* cTg_GetFirst(node_list_class* pList) {
+    create_tag_class* pTag = (create_tag_class*)cLs_GetFirst(pList);
     if (pTag != NULL) {
         pTag->mbIsUse = false;
     } else {
@@ -57,8 +52,7 @@ node_class * cTg_GetFirst(node_list_class *pList)
     return &pTag->mpNode;
 }
 
-int cTg_SingleCut(create_tag_class *pTag)
-{
+int cTg_SingleCut(create_tag_class* pTag) {
     if (pTag->mbIsUse == 1) {
         pTag->mbIsUse = false;
         cLs_SingleCut(&pTag->mpNode);
@@ -68,8 +62,7 @@ int cTg_SingleCut(create_tag_class *pTag)
     return 0;
 }
 
-int cTg_Addition(node_list_class *pList, create_tag_class *pTag)
-{
+int cTg_Addition(node_list_class* pList, create_tag_class* pTag) {
     if (!pTag->mbIsUse) {
         int ret = cLs_Addition(pList, &pTag->mpNode);
         if (ret) {
@@ -81,11 +74,9 @@ int cTg_Addition(node_list_class *pList, create_tag_class *pTag)
     return 0;
 }
 
-void cTg_Create(create_tag_class *pTag, void *pData)
-{
+void cTg_Create(create_tag_class* pTag, void* pData) {
     cNd_Create(&pTag->mpNode, NULL);
     pTag->mpTagData = pData;
     pTag->mbIsUse = false;
 }
-
 };
diff --git a/libs/SSystem/SComponent/c_tag_iter.cpp b/libs/SSystem/SComponent/c_tag_iter.cpp
index 9748d44da1..5166857eec 100644
--- a/libs/SSystem/SComponent/c_tag_iter.cpp
+++ b/libs/SSystem/SComponent/c_tag_iter.cpp
@@ -1,17 +1,14 @@
 
-#include "global.h"
 #include "SComponent/c_tag_iter.h"
+#include "global.h"
 
 extern "C" {
 
-int cTgIt_MethodCall(create_tag_class *pTag, method_filter *pMethodFilter)
-{
-    return pMethodFilter->mpMethodFunc((node_class *) pTag->mpTagData, pMethodFilter->mpUserData);
+int cTgIt_MethodCall(create_tag_class* pTag, method_filter* pMethodFilter) {
+    return pMethodFilter->mpMethodFunc((node_class*)pTag->mpTagData, pMethodFilter->mpUserData);
 }
 
-void * cTgIt_JudgeFilter(create_tag_class *pTag, judge_filter *pJudgeFilter)
-{
-    return pJudgeFilter->mpJudgeFunc((node_class *) pTag->mpTagData, pJudgeFilter->mpUserData);
+void* cTgIt_JudgeFilter(create_tag_class* pTag, judge_filter* pJudgeFilter) {
+    return pJudgeFilter->mpJudgeFunc((node_class*)pTag->mpTagData, pJudgeFilter->mpUserData);
 }
-
 };
diff --git a/libs/SSystem/SComponent/c_tree.cpp b/libs/SSystem/SComponent/c_tree.cpp
index 036d871866..ea9593ac4f 100644
--- a/libs/SSystem/SComponent/c_tree.cpp
+++ b/libs/SSystem/SComponent/c_tree.cpp
@@ -1,37 +1,32 @@
 
-#include "global.h"
 #include "SComponent/c_tree.h"
+#include "global.h"
 
 extern "C" {
 
-int cTr_SingleCut(node_class *pNode)
-{
+int cTr_SingleCut(node_class* pNode) {
     return cLs_SingleCut(pNode);
 }
 
-int cTr_Addition(node_lists_tree_class *pTree, int listIdx, node_class *pNode)
-{
+int cTr_Addition(node_lists_tree_class* pTree, int listIdx, node_class* pNode) {
     if (listIdx >= pTree->mNumLists)
         return 0;
 
     return cLs_Addition(&pTree->mpLists[listIdx], pNode);
 }
 
-int cTr_Insert(node_lists_tree_class *pTree, int listIdx, node_class *pNode, int idx)
-{
+int cTr_Insert(node_lists_tree_class* pTree, int listIdx, node_class* pNode, int idx) {
     if (listIdx >= pTree->mNumLists)
         return 0;
 
     return cLs_Insert(&pTree->mpLists[listIdx], idx, pNode);
 }
 
-void cTr_Create(node_lists_tree_class *pTree, node_list_class *pLists, int numLists)
-{
+void cTr_Create(node_lists_tree_class* pTree, node_list_class* pLists, int numLists) {
     pTree->mpLists = pLists;
     pTree->mNumLists = numLists;
 
     while (numLists-- > 0)
         cLs_Create(pLists++);
 }
-
 };
diff --git a/libs/SSystem/SComponent/c_tree_iter.cpp b/libs/SSystem/SComponent/c_tree_iter.cpp
index cf8ff41c91..c123749dda 100644
--- a/libs/SSystem/SComponent/c_tree_iter.cpp
+++ b/libs/SSystem/SComponent/c_tree_iter.cpp
@@ -1,13 +1,12 @@
 
-#include "global.h"
-#include "SComponent/c_list_iter.h"
 #include "SComponent/c_tree_iter.h"
+#include "SComponent/c_list_iter.h"
+#include "global.h"
 
 extern "C" {
 
-int cTrIt_Method(node_lists_tree_class *pTree, cNdIt_MethodFunc pMethod, void *pUserData)
-{
-    node_list_class *pList = pTree->mpLists;
+int cTrIt_Method(node_lists_tree_class* pTree, cNdIt_MethodFunc pMethod, void* pUserData) {
+    node_list_class* pList = pTree->mpLists;
     int i = pTree->mNumLists;
     int ret = 1;
     while (i-- > 0) {
@@ -18,16 +17,14 @@ int cTrIt_Method(node_lists_tree_class *pTree, cNdIt_MethodFunc pMethod, void *p
     return ret;
 }
 
-void * cTrIt_Judge(node_lists_tree_class *pTree, cNdIt_JudgeFunc pJudge, void *pUserData)
-{
-    node_list_class *pList = pTree->mpLists;
+void* cTrIt_Judge(node_lists_tree_class* pTree, cNdIt_JudgeFunc pJudge, void* pUserData) {
+    node_list_class* pList = pTree->mpLists;
     int i = pTree->mNumLists;
     while (i-- > 0) {
-        void *pJudgeRet = cLsIt_Judge(pList++, pJudge, pUserData);
+        void* pJudgeRet = cLsIt_Judge(pList++, pJudge, pUserData);
         if (pJudgeRet != NULL)
             return pJudgeRet;
     }
     return NULL;
 }
-
 };
diff --git a/libs/Z2AudioLib/Z2Calc.cpp b/libs/Z2AudioLib/Z2Calc.cpp
index 071bcfecd4..4ea0436fb3 100644
--- a/libs/Z2AudioLib/Z2Calc.cpp
+++ b/libs/Z2AudioLib/Z2Calc.cpp
@@ -2,104 +2,97 @@
 
 // 1 instruction off
 #ifdef NONMATCHING
-float Z2Calc::linearTransform(float param1, float param2, float param3, float param4, float param5, bool param6){
+float Z2Calc::linearTransform(float param1, float param2, float param3, float param4, float param5,
+                              bool param6) {
     float temp;
-    
+
     temp = param4 + (param1 - param2) * ((param5 - param4) / (param3 - param2));
 
-    if(param6){
+    if (param6) {
         return temp;
-    }
-    else if(param4 < param5){
-        if(temp > param5){
+    } else if (param4 < param5) {
+        if (temp > param5) {
             return param5;
-        }
-        else if(temp >= param4){ // something wrong here idk
+        } else if (temp >= param4) {  // something wrong here idk
             return temp;
-        }
-        else{
+        } else {
             return param4;
         }
-    }
-    else if(temp > param4){
+    } else if (temp > param4) {
         return param4;
-    }
-    else if(temp < param5){
+    } else if (temp < param5) {
         return param5;
-    }
-    else{
+    } else {
         return temp;
     }
 }
 #else
-asm float Z2Calc::linearTransform(float param1, float param2, float param3, float param4, float param5, bool param6) {
+asm float Z2Calc::linearTransform(float param1, float param2, float param3, float param4,
+                                  float param5, bool param6) {
     nofralloc
-    #include "Z2AudioLib/Z2Calc/asm/func_802A968C.s"
+#include "Z2AudioLib/Z2Calc/asm/func_802A968C.s"
 }
 #endif
 
 asm float Z2Calc::getParamByExp(float, float, float, float, float, float, Z2Calc::CurveSign) {
     nofralloc
-    #include "Z2AudioLib/Z2Calc/asm/func_802A96F4.s"
+#include "Z2AudioLib/Z2Calc/asm/func_802A96F4.s"
 }
 
 asm float Z2Calc::getRandom(float, float, float) {
     nofralloc
-    #include "Z2AudioLib/Z2Calc/asm/func_802A9814.s"
+#include "Z2AudioLib/Z2Calc/asm/func_802A9814.s"
 }
 
 asm float Z2Calc::getRandom_0_1(void) {
     nofralloc
-    #include "Z2AudioLib/Z2Calc/asm/func_802A98D4.s"
+#include "Z2AudioLib/Z2Calc/asm/func_802A98D4.s"
 }
 
-
-void Z2Calc::FNoise1f::setParam(float param1, float param2, float param3){
+void Z2Calc::FNoise1f::setParam(float param1, float param2, float param3) {
     this->unk0 = param1;
     this->unk4 = param1;
     this->unk12 = param2;
     this->unk8 = param3;
 }
 
-float Z2Calc::FNoise1f::tau(float param1){
+float Z2Calc::FNoise1f::tau(float param1) {
     float temp1;
     float temp2;
 
     temp1 = param1;
     temp2 = temp1 + (temp1 * temp1);
 
-    if(temp2 > lbl_8045582C){
+    if (temp2 > lbl_8045582C) {
         temp2 = temp2 - lbl_8045582C;
-        
-        if(temp1 < this->unk12){
+
+        if (temp1 < this->unk12) {
             temp2 = temp2 + this->unk12;
         }
 
         return temp2;
-    }
-    else if(temp1 < this->unk12){
+    } else if (temp1 < this->unk12) {
         temp2 = temp2 + this->unk12;
     }
     return temp2;
 }
 
-float Z2Calc::FNoise1f::calcNoise1f(void){
+float Z2Calc::FNoise1f::calcNoise1f(void) {
     float temp1;
     float temp2;
 
     temp1 = this->unk0;
 
-    if(this->unk0 < this->unk4){
+    if (this->unk0 < this->unk4) {
         this->unk0 = temp1 + this->unk8;
 
-        if(this->unk0 < this->unk4){
+        if (this->unk0 < this->unk4) {
             return this->unk0;
         }
-    }
-    else{
+    } else {
         this->unk0 = temp1 - this->unk8;
-        
-        if(this->unk0 > this->unk4){
+
+        if (this->unk0 > this->unk4) {
             return this->unk0;
         }
     }
diff --git a/libs/Z2AudioLib/Z2LinkMgr.cpp b/libs/Z2AudioLib/Z2LinkMgr.cpp
index 35c2c7f4a6..64277f9af9 100644
--- a/libs/Z2AudioLib/Z2LinkMgr.cpp
+++ b/libs/Z2AudioLib/Z2LinkMgr.cpp
@@ -13,32 +13,32 @@ void Z2CreatureLink::setLinkHp(s32 health, s32 param2) {
 
 asm void Z2CreatureLink::setLinkSwordType(s32, s32) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3228.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3228.s"
 }
 
 asm void Z2CreatureLink::setLinkShieldType(s32, s32) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C328C.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C328C.s"
 }
 
 asm void Z2CreatureLink::setLinkBootsType(s32) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C32F0.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C32F0.s"
 }
 
 asm Z2CreatureLink::Z2CreatureLink(void) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s"
 }
 
 asm Z2LinkSoundStarter::~Z2LinkSoundStarter() {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3464.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3464.s"
 }
 
 asm Z2CreatureLink::~Z2CreatureLink() {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s"
 }
 
 // few instructions off
@@ -52,18 +52,18 @@ asm Z2CreatureLink::~Z2CreatureLink() {
 #else
 asm void Z2CreatureLink::deleteObject(void) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C35F8.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C35F8.s"
 }
 #endif
 
 asm void Z2CreatureLink::init(Vec* param1, Vec* param2, Vec* param3) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3638.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3638.s"
 }
 
 asm void Z2CreatureLink::initKantera(Vec* param1) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3710.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3710.s"
 }
 
 // 1 instruction off
@@ -75,7 +75,7 @@ asm void Z2CreatureLink::initKantera(Vec* param1) {
 #else
 asm void Z2CreatureLink::deleteKantera(void) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C374C.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C374C.s"
 }
 #endif
 
@@ -85,7 +85,7 @@ void Z2CreatureLink::setKanteraState(u8 param1) {
 
 asm void Z2CreatureLink::framework(u32 param1, s8 param2) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3780.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3780.s"
 }
 
 void Z2CreatureLink::setSinkDepth(s8 param1) {
@@ -94,7 +94,7 @@ void Z2CreatureLink::setSinkDepth(s8 param1) {
 
 asm void Z2CreatureLink::setRiding(bool) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3A6C.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3A6C.s"
 }
 
 // 1 instruction off
@@ -105,59 +105,59 @@ void Z2CreatureLink::setMagnetized(bool param1) {
 #else
 asm void Z2CreatureLink::setMagnetized(bool param1) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3AEC.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3AEC.s"
 }
 #endif
 
 asm void Z2CreatureLink::setWolfEyeOpen(bool) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s"
 }
 
 asm void Z2CreatureLink::startLinkSound(JAISoundID, u32, s8) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s"
 }
 
 asm void Z2CreatureLink::startLinkSoundLevel(JAISoundID, u32, s8) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s"
 }
 
 asm void Z2CreatureLink::startLinkVoice(JAISoundID, s8) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C4320.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C4320.s"
 }
 
 asm void Z2CreatureLink::startLinkVoiceLevel(JAISoundID, s8) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C45B0.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C45B0.s"
 }
 
 asm void Z2CreatureLink::startLinkSwordSound(JAISoundID, u32, s8) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C46F0.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C46F0.s"
 }
 
 asm void Z2CreatureLink::startCollisionSE(u32, u32) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C4784.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C4784.s"
 }
 
 asm int Z2CreatureLink::startHitItemSE(u32, u32, Z2SoundObjBase*, float) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C4814.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C4814.s"
 }
 
 // 1 instruction off
 #ifdef NONMATCHING
-void Z2CreatureLink::setResumeAttack(bool param1){
+void Z2CreatureLink::setResumeAttack(bool param1) {
     this->unk203 = ((param1 & 0x1) << 5) | (unk203 & 0xdf);
     return;
 }
 #else
 asm void Z2CreatureLink::setResumeAttack(bool) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C48D8.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C48D8.s"
 }
 #endif
\ No newline at end of file
diff --git a/libs/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp
index 9c7abd0e98..c4fc6d5a50 100644
--- a/libs/Z2AudioLib/Z2SceneMgr.cpp
+++ b/libs/Z2AudioLib/Z2SceneMgr.cpp
@@ -3,9 +3,9 @@
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 
-//Missing 2 instructions (beginning and end)
+// Missing 2 instructions (beginning and end)
 #ifdef NONMATCHING
-Z2SceneMgr::Z2SceneMgr(void){
+Z2SceneMgr::Z2SceneMgr(void) {
     lbl_80450B80 = this;
     this->sceneNum = -1;
     this->timer = -1;
@@ -32,53 +32,49 @@ Z2SceneMgr::Z2SceneMgr(void){
     return;
 }
 #else
-asm Z2SceneMgr::Z2SceneMgr(void){
+asm Z2SceneMgr::Z2SceneMgr(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SceneMgr/asm/func_802B6840.s"
+#include "Z2AudioLib/Z2SceneMgr/asm/func_802B6840.s"
 }
 #endif
 
-
-void Z2SceneMgr::setInDarkness(bool param_1){
+void Z2SceneMgr::setInDarkness(bool param_1) {
     this->inDarkness = param_1;
-    if (param_1 == false){
+    if (param_1 == false) {
         lbl_80450B60->resetFilterAll();
     }
     return;
 }
 
-
 extern float lbl_80455A38;
 extern float lbl_80455A3C;
 
 #ifdef NONMATCHING
-void Z2SceneMgr::setSceneExist(bool param_1){
-    Z2SoundMgr *Z2soundMgrPtr;
+void Z2SceneMgr::setSceneExist(bool param_1) {
+    Z2SoundMgr* Z2soundMgrPtr;
     this->sceneExist = param_1;
     this->timer = 0;
     Z2soundMgrPtr = lbl_80450B60;
-    if(param_1==false){
-        Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lbl_80455A38,0xb4);
-    }
-    else{
+    if (param_1 == false) {
+        Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lbl_80455A38, 0xb4);
+    } else {
         this->inGame = 1;
         if (this->SeWave_3 == 0x85) {
-            Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lbl_80455A38,0);
-        }
-        else{
+            Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lbl_80455A38, 0);
+        } else {
             if (this->SeWave_3 == 0x7f) {
-                lbl_80450B88->seMoveVolumeAll(lbl_80455A38,0);
-            }else{
-                Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lbl_80455A3C,0x21);
+                lbl_80450B88->seMoveVolumeAll(lbl_80455A38, 0);
+            } else {
+                Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lbl_80455A3C, 0x21);
             }
         }
     }
     return;
 }
 #else
-asm void Z2SceneMgr::setSceneExist(bool param_1){
+asm void Z2SceneMgr::setSceneExist(bool param_1) {
     nofralloc
-    #include "Z2AudioLib/Z2SceneMgr/asm/func_802B68E0.s"
+#include "Z2AudioLib/Z2SceneMgr/asm/func_802B68E0.s"
 }
 #endif
 
@@ -87,54 +83,50 @@ extern double lbl_80455A48;
 
 asm void Z2SceneMgr::setFadeOutStart(u8 param_1) {
     nofralloc
-    #include "Z2AudioLib/Z2SceneMgr/asm/func_802B697C.s"
+#include "Z2AudioLib/Z2SceneMgr/asm/func_802B697C.s"
 }
 
 asm void Z2SceneMgr::setFadeInStart(u8 param_1) {
     nofralloc
-    #include "Z2AudioLib/Z2SceneMgr/asm/func_802B6A18.s"
+#include "Z2AudioLib/Z2SceneMgr/asm/func_802B6A18.s"
 }
 
-
 extern float lbl_80455A50;
-extern char lbl_8039BFA8[]; //probably wrong
-extern char* lbl_803CA5C0[]; //array of char*
-extern void* lbl_803CA878[]; //switch table (array of void*)
-extern void* lbl_803CA844[]; //switch table (array of void*)
-extern void* lbl_803CA824[]; //switch table (array of void*)
-extern void* lbl_803CA7F4[]; //switch table (array of void*)
-extern void* lbl_803CA7BC[]; //switch table (array of void*)
-extern void* lbl_803CA784[]; //switch table (array of void*)
+extern char lbl_8039BFA8[];   // probably wrong
+extern char* lbl_803CA5C0[];  // array of char*
+extern void* lbl_803CA878[];  // switch table (array of void*)
+extern void* lbl_803CA844[];  // switch table (array of void*)
+extern void* lbl_803CA824[];  // switch table (array of void*)
+extern void* lbl_803CA7F4[];  // switch table (array of void*)
+extern void* lbl_803CA7BC[];  // switch table (array of void*)
+extern void* lbl_803CA784[];  // switch table (array of void*)
 extern float lbl_80455A54;
 extern float lbl_80455A58;
-extern void* lbl_803CA744[]; //switch table (array of void*)
-extern void* lbl_803CA704[]; //switch table (array of void*)
+extern void* lbl_803CA744[];  // switch table (array of void*)
+extern void* lbl_803CA704[];  // switch table (array of void*)
 extern float lbl_80455A5C;
 extern u32 lbl_80450860;
 extern float lbl_80455A60;
 extern float lbl_80455A64;
-extern void* lbl_80450B58; //JAUSoundTable sInstance
-extern void* lbl_80450B3C; //Z2EnvSeMgr sInstance
+extern void* lbl_80450B58;  // JAUSoundTable sInstance
+extern void* lbl_80450B3C;  // Z2EnvSeMgr sInstance
 
-
-
-asm void Z2SceneMgr::setSceneName(char* stageName, long roomNum, long layerNum) {
-    nofralloc
-    #include "Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s"
+asm void Z2SceneMgr::setSceneName(char* stageName, long roomNum, long layerNum){nofralloc
+#include "Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s"
 }
 
-JAISoundID::JAISoundID(JAISoundID const &soundIdToSet){
+JAISoundID::JAISoundID(JAISoundID const& soundIdToSet) {
     this->soundId = soundIdToSet.soundId;
     return;
 }
 
-#ifdef NONMATCHING //1 Instruction off
+#ifdef NONMATCHING  // 1 Instruction off
 void Z2SeqMgr::setFieldBgmPlay(bool param_1) {
     this->unk_1 = (param_1 & 1U) << 2 | this->unk_1 & 0xfb;
 }
-#else 
-asm void Z2SeqMgr::setFieldBgmPlay(bool param_1){
+#else
+asm void Z2SeqMgr::setFieldBgmPlay(bool param_1) {
     nofralloc
-    #include "Z2AudioLib/Z2SceneMgr/asm/func_802B9968.s"
+#include "Z2AudioLib/Z2SceneMgr/asm/func_802B9968.s"
 }
 #endif
\ No newline at end of file
diff --git a/libs/Z2AudioLib/Z2SeMgr.cpp b/libs/Z2AudioLib/Z2SeMgr.cpp
index 2a120b7eb2..9018ec675e 100644
--- a/libs/Z2AudioLib/Z2SeMgr.cpp
+++ b/libs/Z2AudioLib/Z2SeMgr.cpp
@@ -1,144 +1,143 @@
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 
-extern "C"{
-    void JAISoundHandle(void);
-    void JAISoundHandle_NS_dtor(void);
-    void Z2MultiSeObj_NS_dtor(void);
+extern "C" {
+void JAISoundHandle(void);
+void JAISoundHandle_NS_dtor(void);
+void Z2MultiSeObj_NS_dtor(void);
 }
 
-asm Z2SeMgr::Z2SeMgr(void){
+asm Z2SeMgr::Z2SeMgr(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s"
 }
 
-asm Z2MultiSeObj::Z2MultiSeObj(void){
+asm Z2MultiSeObj::Z2MultiSeObj(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB710.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AB710.s"
 }
 
-asm void Z2SeMgr::initSe(void){
+asm void Z2SeMgr::initSe(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB750.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AB750.s"
 }
 
-asm void Z2SeMgr::resetModY(void){
+asm void Z2SeMgr::resetModY(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB80C.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AB80C.s"
 }
 
-asm void Z2SeMgr::modHeightAtCamera(Vec const** param1){
+asm void Z2SeMgr::modHeightAtCamera(Vec const** param1) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB830.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AB830.s"
 }
 
-asm void Z2SeMgr::incrCrowdSize(void){
+asm void Z2SeMgr::incrCrowdSize(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB93C.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AB93C.s"
 }
 
-asm void Z2SeMgr::decrCrowdSize(void){
+asm void Z2SeMgr::decrCrowdSize(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB960.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AB960.s"
 }
 
-asm void Z2SeMgr::seStart(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8){
+asm void Z2SeMgr::seStart(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB984.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AB984.s"
 }
 
-asm void Z2SeMgr::seStartLevel(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8){
+asm void Z2SeMgr::seStartLevel(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s"
 }
 
-asm void Z2SeMgr::seStop(JAISoundID, u32){
+asm void Z2SeMgr::seStop(JAISoundID, u32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AD8B0.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AD8B0.s"
 }
 
-asm void Z2SeMgr::seStopAll(u32){
+asm void Z2SeMgr::seStopAll(u32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AD94C.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AD94C.s"
 }
 
-asm void Z2SeMgr::seMoveVolumeAll(float, u32){
+asm void Z2SeMgr::seMoveVolumeAll(float, u32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AD9F4.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AD9F4.s"
 }
 
-asm void Z2SeMgr::messageSePlay(u16, Vec*, s8){
+asm void Z2SeMgr::messageSePlay(u16, Vec*, s8) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADB14.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802ADB14.s"
 }
 
-asm void Z2SeMgr::talkInSe(void){
+asm void Z2SeMgr::talkInSe(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADB50.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802ADB50.s"
 }
 
-asm void Z2SeMgr::talkOutSe(void){
+asm void Z2SeMgr::talkOutSe(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADC54.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802ADC54.s"
 }
 
-asm void Z2SeMgr::menuInSe(void){
+asm void Z2SeMgr::menuInSe(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADD58.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802ADD58.s"
 }
 
-asm void Z2SeMgr::setLevObjSE(u32, Vec*, s8){
+asm void Z2SeMgr::setLevObjSE(u32, Vec*, s8) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADE5C.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802ADE5C.s"
 }
 
-asm void Z2SeMgr::setMultiTriggerSE(u32, Vec*, s8){
+asm void Z2SeMgr::setMultiTriggerSE(u32, Vec*, s8) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADFF4.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802ADFF4.s"
 }
 
-asm void Z2SeMgr::processSeFramework(void){
+asm void Z2SeMgr::processSeFramework(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AE184.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AE184.s"
 }
 
-asm bool Z2SeMgr::isLevelSe(JAISoundID){
+asm bool Z2SeMgr::isLevelSe(JAISoundID) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AE524.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AE524.s"
 }
 
-asm bool Z2SeMgr::isSoundCulling(JAISoundID){
+asm bool Z2SeMgr::isSoundCulling(JAISoundID) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AE5B0.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AE5B0.s"
 }
 
-
-asm Z2MultiSeMgr::Z2MultiSeMgr(void){
+asm Z2MultiSeMgr::Z2MultiSeMgr(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AEB04.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AEB04.s"
 }
 
-asm Z2MultiSeMgr::~Z2MultiSeMgr(){
+asm Z2MultiSeMgr::~Z2MultiSeMgr() {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AEB34.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AEB34.s"
 }
 
-asm u32 Z2MultiSeMgr::registMultiSePos(Vec*){
+asm u32 Z2MultiSeMgr::registMultiSePos(Vec*) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AEB70.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AEB70.s"
 }
 
-asm void Z2MultiSeMgr::resetMultiSePos(void){
+asm void Z2MultiSeMgr::resetMultiSePos(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AECBC.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AECBC.s"
 }
 
-asm float Z2MultiSeMgr::getPanPower(void){
+asm float Z2MultiSeMgr::getPanPower(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AECE0.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AECE0.s"
 }
 
-asm float Z2MultiSeMgr::getDolbyPower(void){
+asm float Z2MultiSeMgr::getDolbyPower(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AEDC0.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AEDC0.s"
 }
\ No newline at end of file
diff --git a/libs/Z2AudioLib/Z2SeqMgr.cpp b/libs/Z2AudioLib/Z2SeqMgr.cpp
index e11887d804..7417820c78 100644
--- a/libs/Z2AudioLib/Z2SeqMgr.cpp
+++ b/libs/Z2AudioLib/Z2SeqMgr.cpp
@@ -1,93 +1,92 @@
-#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
+#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 
-
-asm Z2SeqMgr::Z2SeqMgr(void){
+asm Z2SeqMgr::Z2SeqMgr(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AEEA0.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AEEA0.s"
 }
 
-asm void Z2SeqMgr::bgmStart(u32,u32,s32){
+asm void Z2SeqMgr::bgmStart(u32, u32, s32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s"
 }
 
-asm void Z2SeqMgr::bgmStop(u32,s32){
+asm void Z2SeqMgr::bgmStop(u32, s32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AF408.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AF408.s"
 }
 
-asm void Z2SeqMgr::subBgmStart(u32){
+asm void Z2SeqMgr::subBgmStart(u32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s"
 }
 
-asm void Z2SeqMgr::subBgmStop(void){
+asm void Z2SeqMgr::subBgmStop(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s"
 }
 
-asm void Z2SeqMgr::subBgmStopInner(void){
+asm void Z2SeqMgr::subBgmStopInner(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s"
 }
 
-asm void Z2SeqMgr::bgmStreamPrepare(u32){
+asm void Z2SeqMgr::bgmStreamPrepare(u32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s"
 }
 
-asm int Z2SeqMgr::bgmStreamCheckReady(void){
+asm int Z2SeqMgr::bgmStreamCheckReady(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AFDEC.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AFDEC.s"
 }
 
-asm void Z2SeqMgr::bgmStreamPlay(void){
+asm void Z2SeqMgr::bgmStreamPlay(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s"
 }
 
-asm void Z2SeqMgr::bgmStreamStop(u32){
+asm void Z2SeqMgr::bgmStreamStop(u32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AFEDC.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AFEDC.s"
 }
 
-asm void Z2SeqMgr::changeBgmStatus(s32){
+asm void Z2SeqMgr::changeBgmStatus(s32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s"
 }
 
-asm void Z2SeqMgr::changeSubBgmStatus(s32){
+asm void Z2SeqMgr::changeSubBgmStatus(s32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s"
 }
 
-asm void Z2SeqMgr::onVariantBgmJumpEnd(bool){
+asm void Z2SeqMgr::onVariantBgmJumpEnd(bool) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B299C.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802B299C.s"
 }
 
-asm void Z2SeqMgr::changeFishingBgm(s32){
+asm void Z2SeqMgr::changeFishingBgm(s32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B2A88.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802B2A88.s"
 }
 
-asm void Z2SeqMgr::talkInBgm(void){
+asm void Z2SeqMgr::talkInBgm(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B2CA4.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802B2CA4.s"
 }
 
-asm void Z2SeqMgr::talkOutBgm(void){
+asm void Z2SeqMgr::talkOutBgm(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B2D64.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802B2D64.s"
 }
 
-asm void Z2SeqMgr::menuInBgm(void){
+asm void Z2SeqMgr::menuInBgm(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B2DAC.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802B2DAC.s"
 }
 
-asm void Z2SeqMgr::menuOutBgm(void){
+asm void Z2SeqMgr::menuOutBgm(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B2DF4.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802B2DF4.s"
 }
\ No newline at end of file
diff --git a/libs/Z2AudioLib/Z2StatusMgr.cpp b/libs/Z2AudioLib/Z2StatusMgr.cpp
index b653e59e1f..2817c907bb 100644
--- a/libs/Z2AudioLib/Z2StatusMgr.cpp
+++ b/libs/Z2AudioLib/Z2StatusMgr.cpp
@@ -1,10 +1,10 @@
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 #include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
-#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
+#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 
-Z2StatusMgr::Z2StatusMgr(){
+Z2StatusMgr::Z2StatusMgr() {
     lbl_80450B7C = this;
     this->hour = 0;
     this->minute = 0;
@@ -25,106 +25,104 @@ Z2StatusMgr::Z2StatusMgr(){
     this->heart_gauge_on = 0;
 }
 
-void Z2StatusMgr::heartGaugeOn(void){
+void Z2StatusMgr::heartGaugeOn(void) {
     this->heart_gauge_on = 2;
 }
 
-asm void Z2StatusMgr::processHeartGaugeSound(void){
+asm void Z2StatusMgr::processHeartGaugeSound(void) {
     nofralloc
-    #include "Z2AudioLib/Z2StatusMgr/asm/func_802B5F7C.s"
+#include "Z2AudioLib/Z2StatusMgr/asm/func_802B5F7C.s"
 }
 
-void Z2StatusMgr::talkIn(void){
+void Z2StatusMgr::talkIn(void) {
     u8 is_demo;
 
     is_demo = isMovieDemo();
-    if(is_demo == false){
+    if (is_demo == false) {
         lbl_80450B84->talkInBgm();
         lbl_80450B88->talkInSe();
     }
 }
 
-void Z2StatusMgr::talkOut(void){
+void Z2StatusMgr::talkOut(void) {
     u8 is_demo;
 
     is_demo = isMovieDemo();
-    if(is_demo == false){
+    if (is_demo == false) {
         lbl_80450B84->talkOutBgm();
         lbl_80450B88->talkOutSe();
     }
 }
 
-void Z2StatusMgr::menuIn(){
+void Z2StatusMgr::menuIn() {
     lbl_80450B84->menuInBgm();
     lbl_80450B88->menuInSe();
-    
+
     this->is_menu_in = true;
 }
 
-void Z2StatusMgr::menuOut(){
+void Z2StatusMgr::menuOut() {
     lbl_80450B84->menuOutBgm();
     lbl_80450B88->talkOutSe();
-    
+
     this->is_menu_in = false;
 }
 
-//right instructions, wrong registers
+// right instructions, wrong registers
 #ifdef NONMATCHING
-bool Z2StatusMgr::isMovieDemo(void){
+bool Z2StatusMgr::isMovieDemo(void) {
     bool uvar2;
 
     uvar2 = false;
-    if(this->demo_status == 2 || this->demo_status == 8 || this->demo_status == 9){
+    if (this->demo_status == 2 || this->demo_status == 8 || this->demo_status == 9) {
         uvar2 = true;
     }
     return uvar2;
 }
 #else
-asm bool Z2StatusMgr::isMovieDemo(void){
+asm bool Z2StatusMgr::isMovieDemo(void) {
     nofralloc
-    #include "Z2AudioLib/Z2StatusMgr/asm/func_802B61BC.s"
+#include "Z2AudioLib/Z2StatusMgr/asm/func_802B61BC.s"
 }
 #endif
 
-asm void Z2StatusMgr::setDemoName(char*){
+asm void Z2StatusMgr::setDemoName(char*) {
     nofralloc
-    #include "Z2AudioLib/Z2StatusMgr/asm/func_802B61E8.s"
+#include "Z2AudioLib/Z2StatusMgr/asm/func_802B61E8.s"
 }
 
-void Z2StatusMgr::processTime(void){
+void Z2StatusMgr::processTime(void) {
     u16 temp = this->hour * 256;
     this->time = temp + minute;
 }
 
-bool Z2StatusMgr::checkDayTime(void){
-    if(this->hour >= 6 && this->hour < 19){
+bool Z2StatusMgr::checkDayTime(void) {
+    if (this->hour >= 6 && this->hour < 19) {
         return true;
-    }
-    else{
+    } else {
         return false;
     }
 }
 
-void Z2StatusMgr::setEventBit(void* event_bit){
+void Z2StatusMgr::setEventBit(void* event_bit) {
     this->event_bit = event_bit;
 }
 
-void Z2StatusMgr::setCameraPolygonPos(Vec* polygon_pos){
-    if(polygon_pos == 0){
+void Z2StatusMgr::setCameraPolygonPos(Vec* polygon_pos) {
+    if (polygon_pos == 0) {
         return;
-    }
-    else{
+    } else {
         this->polygon_position.x = polygon_pos->x;
         this->polygon_position.y = polygon_pos->y;
         this->polygon_position.z = polygon_pos->z;
     }
 }
 
-void Z2StatusMgr::setCameraGroupInfo(u8 param1){
+void Z2StatusMgr::setCameraGroupInfo(u8 param1) {
     return;
 }
 
-asm void Z2StatusMgr::setCameraInWaterDepth(float){
+asm void Z2StatusMgr::setCameraInWaterDepth(float) {
     nofralloc
-    #include "Z2AudioLib/Z2StatusMgr/asm/func_802B6788.s"
+#include "Z2AudioLib/Z2StatusMgr/asm/func_802B6788.s"
 }
\ No newline at end of file
diff --git a/src/d/d_a/d_a_alink.cpp b/src/d/d_a/d_a_alink.cpp
index 8a9e3dc700..7fd70d76ff 100644
--- a/src/d/d_a/d_a_alink.cpp
+++ b/src/d/d_a/d_a_alink.cpp
@@ -1,26 +1,26 @@
 #include "d/d_a/d_a_alink/d_a_alink.h"
 #include "f/f_pc/f_pc_searcher.h"
 
-u32 daAlink_c::getE3Zhint(void){
+u32 daAlink_c::getE3Zhint(void) {
     return 0;
 }
 
-asm const char* daAlink_c::getAlinkArcName(void){
+asm const char* daAlink_c::getAlinkArcName(void) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009D884.s"
+#include "d/d_a/d_a_alink/asm/func_8009D884.s"
 }
 
-asm void daAlink_tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*,fopAc_ac_c*, dCcD_GObjInf*){
+asm void daAlink_tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009D88C.s"
+#include "d/d_a/d_a_alink/asm/func_8009D88C.s"
 }
 
-asm void daAlink_coHitCallback(fopAc_ac_c*, dCcD_GObjInf*,fopAc_ac_c*, dCcD_GObjInf*){
+asm void daAlink_coHitCallback(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009D8B8.s"
+#include "d/d_a/d_a_alink/asm/func_8009D8B8.s"
 }
 
-void daAlink_matAnm_c::init(void){
+void daAlink_matAnm_c::init(void) {
     float init = lbl_80452CC0;
 
     unk244 = init;
@@ -32,119 +32,120 @@ void daAlink_matAnm_c::init(void){
     unk260 = 0;
 }
 
-asm void daAlink_matAnm_c::calc(J3DMaterial*) const{
+asm void daAlink_matAnm_c::calc(J3DMaterial*) const {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009D90C.s"
+#include "d/d_a/d_a_alink/asm/func_8009D90C.s"
 }
 
 // 1 missing mr instruction
 #ifdef NONMATCHING
-u32 daAlink_c::checkStageName(const char* stage){
-    return (u32)__cntlzw(strcmp(g_dComIfG_gameInfo.stage,(char*)stage)) >> 5; // no idea if current stage vars are a struct or part of some class
+u32 daAlink_c::checkStageName(const char* stage) {
+    return (u32)__cntlzw(strcmp(g_dComIfG_gameInfo.stage, (char*)stage)) >>
+           5;  // no idea if current stage vars are a struct or part of some class
 }
 #else
-asm u32 daAlink_c::checkStageName(char const* stage){
+asm u32 daAlink_c::checkStageName(char const* stage) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009DA60.s"
+#include "d/d_a/d_a_alink/asm/func_8009DA60.s"
 }
 #endif
 
-asm void daAlink_c::tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*){
+asm void daAlink_c::tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009DA98.s"
+#include "d/d_a/d_a_alink/asm/func_8009DA98.s"
 }
 
-asm void daAlink_c::coHitCallback(fopAc_ac_c*, dCcD_GObjInf*){
+asm void daAlink_c::coHitCallback(fopAc_ac_c*, dCcD_GObjInf*) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009DB64.s"
+#include "d/d_a/d_a_alink/asm/func_8009DB64.s"
 }
 
-asm void daAlink_c::setMatrixWorldAxisRot(float(*)[4],short,short,short,int,const cXyz*){
+asm void daAlink_c::setMatrixWorldAxisRot(float (*)[4], short, short, short, int, const cXyz*) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009DC6C.s"
+#include "d/d_a/d_a_alink/asm/func_8009DC6C.s"
 }
 
-asm bool daAlink_c::jointControll(int){
+asm bool daAlink_c::jointControll(int) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009DD90.s"
+#include "d/d_a/d_a_alink/asm/func_8009DD90.s"
 }
 
-asm void daAlink_c::setUpperFront(void){
+asm void daAlink_c::setUpperFront(void) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009E7B8.s"
+#include "d/d_a/d_a_alink/asm/func_8009E7B8.s"
 }
 
-asm void daAlink_c::changeBlendRate(int){
+asm void daAlink_c::changeBlendRate(int) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009E91C.s"
+#include "d/d_a/d_a_alink/asm/func_8009E91C.s"
 }
 
-asm void daAlink_c::resetRootMtx(void){
+asm void daAlink_c::resetRootMtx(void) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009EB18.s"
+#include "d/d_a/d_a_alink/asm/func_8009EB18.s"
 }
 
-asm bool daAlink_c::modelCallBack(int){
+asm bool daAlink_c::modelCallBack(int) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009EB58.s"
+#include "d/d_a/d_a_alink/asm/func_8009EB58.s"
 }
 
-asm bool daAlink_modelCallBack(J3DJoint*, int){
+asm bool daAlink_modelCallBack(J3DJoint*, int) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009EC28.s"
+#include "d/d_a/d_a_alink/asm/func_8009EC28.s"
 }
 
-asm bool daAlink_c::headModelCallBack(int){
+asm bool daAlink_c::headModelCallBack(int) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009ECA0.s"
+#include "d/d_a/d_a_alink/asm/func_8009ECA0.s"
 }
 
-asm bool daAlink_headModelCallBack(J3DJoint*, int){
+asm bool daAlink_headModelCallBack(J3DJoint*, int) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009EF38.s"
+#include "d/d_a/d_a_alink/asm/func_8009EF38.s"
 }
 
-asm bool daAlink_c::wolfModelCallBack(int){
+asm bool daAlink_c::wolfModelCallBack(int) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009EF7C.s"
+#include "d/d_a/d_a_alink/asm/func_8009EF7C.s"
 }
 
-asm bool daAlink_wolfModelCallBack(J3DJoint*, int){
+asm bool daAlink_wolfModelCallBack(J3DJoint*, int) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009EFF0.s"
+#include "d/d_a/d_a_alink/asm/func_8009EFF0.s"
 }
 
-asm void daAlink_c::setHatAngle(void){
+asm void daAlink_c::setHatAngle(void) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009F034.s"
+#include "d/d_a/d_a_alink/asm/func_8009F034.s"
 }
 
-asm void daAlink_c::calcHairAngle(short*){
+asm void daAlink_c::calcHairAngle(short*) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_8009FFF8.s"
+#include "d/d_a/d_a_alink/asm/func_8009FFF8.s"
 }
 
-asm void daAlink_c::setHairAngle(cXyz*,float,float){
+asm void daAlink_c::setHairAngle(cXyz*, float, float) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_800A002C.s"
+#include "d/d_a/d_a_alink/asm/func_800A002C.s"
 }
 
-asm void daAlink_c::setLookPosFromOut(cXyz*){
+asm void daAlink_c::setLookPosFromOut(cXyz*) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_800A0744.s"
+#include "d/d_a/d_a_alink/asm/func_800A0744.s"
 }
 
-asm int daAlink_c::checkAttentionPosAngle(cXyz*){
+asm int daAlink_c::checkAttentionPosAngle(cXyz*) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_800A07D8.s"
+#include "d/d_a/d_a_alink/asm/func_800A07D8.s"
 }
 
-asm bool daAlink_c::checkActorPosAngle(fopAc_ac_c*, cXyz**){
+asm bool daAlink_c::checkActorPosAngle(fopAc_ac_c*, cXyz**) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_800A0868.s"
+#include "d/d_a/d_a_alink/asm/func_800A0868.s"
 }
 
-asm cXyz* daAlink_c::getNeckAimPos(cXyz*, int*, int){
+asm cXyz* daAlink_c::getNeckAimPos(cXyz*, int*, int) {
     nofralloc
-    #include "d/d_a/d_a_alink/asm/func_800A093C.s"
+#include "d/d_a/d_a_alink/asm/func_800A093C.s"
 }
\ No newline at end of file
diff --git a/src/d/d_a/d_a_horse_static.cpp b/src/d/d_a/d_a_horse_static.cpp
index 6b6935d6ca..2c2ae7017f 100644
--- a/src/d/d_a/d_a_horse_static.cpp
+++ b/src/d/d_a/d_a_horse_static.cpp
@@ -1,14 +1,14 @@
 #include "d/d_a/d_a_horse_static/d_a_horse_static.h"
 #include "global.h"
 
-u32 e_wb_class::checkWait(void){
+u32 e_wb_class::checkWait(void) {
     u32 temp;
 
     temp = __cntlzw(0x2a - this->unk1460);
     return (u8)(temp >> 5);
 }
 
-void e_wb_class::setPlayerRideNow(void){
+void e_wb_class::setPlayerRideNow(void) {
     this->unk1680 = 0x67;
     this->unk1460 = 0;
     this->unk1726 |= 3;
@@ -16,68 +16,67 @@ void e_wb_class::setPlayerRideNow(void){
 
 // 2 instructions off
 #ifdef NONMATCHING
-void e_wb_class::setPlayerRide(void){
+void e_wb_class::setPlayerRide(void) {
     this->unk1680 = 0x65;
     this->unk1460 = 0;
     this->unk1726 |= 3;
 
-    setLinkRiding(true); // needs to call Z2CreatureRide
+    setLinkRiding(true);  // needs to call Z2CreatureRide
 }
 #else
 asm void e_wb_class::setPlayerRide(void) {
     nofralloc
-    #include "d/d_a/d_a_horse_static/asm/func_80037CB0.s"
+#include "d/d_a/d_a_horse_static/asm/func_80037CB0.s"
 }
 #endif
 
 // 2 instructions off
 #ifdef NONMATCHING
-void e_wb_class::getOff(void){
+void e_wb_class::getOff(void) {
     int temp;
 
     temp = checkDownDamage();
-    if((temp == 0) || (this->unk1680 == 0x67)){
+    if ((temp == 0) || (this->unk1680 == 0x67)) {
         this->unk1680 = 0;
-    }
-    else{
+    } else {
         this->unk1682 = 0;
     }
     this->unk1460 = 0;
     this->unk1726 &= 0xfffc;
-    setLinkRiding(false); // same issue as above
+    setLinkRiding(false);  // same issue as above
 }
 #else
 asm void e_wb_class::getOff(void) {
     nofralloc
-    #include "d/d_a/d_a_horse_static/asm/func_80037CF4.s"
+#include "d/d_a/d_a_horse_static/asm/func_80037CF4.s"
 }
 #endif
 
-u8 e_wb_class::checkDownDamage(){
+u8 e_wb_class::checkDownDamage() {
     u8 temp1;
     s16 temp2;
 
     temp1 = 0;
     temp2 = this->unk1680;
-    if((temp2 != 0x65) && (temp2 != 0x66) && (temp2 != 0x15)){
+    if ((temp2 != 0x65) && (temp2 != 0x66) && (temp2 != 0x15)) {
         temp1 = 1;
     }
     return (u8)temp1;
 }
 
-u8 e_wb_class::checkNormalRideMode(void) const{
+u8 e_wb_class::checkNormalRideMode(void) const {
     u8 temp;
 
     temp = 0;
-    if((this->unk1680 != 0x66) || (this->unk1460 < 1)){
+    if ((this->unk1680 != 0x66) || (this->unk1460 < 1)) {
         temp = 1;
     }
 
     return (u8)temp;
 }
 
-void e_wb_class::setRunRideMode(void){
-    if(this->unk1680 == 0x65){
+void e_wb_class::setRunRideMode(void) {
+    if (this->unk1680 == 0x65) {
         this->unk1460 = 0;
         this->unk1680 = 0x15;
         this->unk1682 = 0x65;
diff --git a/src/d/d_a/d_a_item_static.cpp b/src/d/d_a/d_a_item_static.cpp
index 63a4032ead..2f6d41d24a 100644
--- a/src/d/d_a/d_a_item_static.cpp
+++ b/src/d/d_a/d_a_item_static.cpp
@@ -1,17 +1,17 @@
 #include "d/d_a/d_a_item_static/d_a_item_static.h"
 #include "global.h"
 
-u32 daItem_c::startCtrl(void){
+u32 daItem_c::startCtrl(void) {
     this->unk2376 |= 4;
     return 1;
 }
 
-u32 daItem_c::startControl(void){
+u32 daItem_c::startControl(void) {
     this->unk2378 = 1;
     return 1;
 }
 
-u32 daItem_c::endControl(void){
+u32 daItem_c::endControl(void) {
     this->unk2378 = 0;
     return 1;
 }
\ No newline at end of file
diff --git a/src/d/d_bomb.cpp b/src/d/d_bomb.cpp
index 62ed336006..9415517c9c 100644
--- a/src/d/d_bomb.cpp
+++ b/src/d/d_bomb.cpp
@@ -1,17 +1,17 @@
 #include "d/d_bomb/d_bomb.h"
 
-bool dBomb_c::checkStateCarry(){
-   return ((unk_3 & 0x2000) != 0 || (unk_3 & 0x100000) != 0 || unk_2 == 2 || unk_2 == 1);
+bool dBomb_c::checkStateCarry() {
+    return ((unk_3 & 0x2000) != 0 || (unk_3 & 0x100000) != 0 || unk_2 == 2 || unk_2 == 1);
 }
 
-bool dBomb_c::checkFlowerBombWait(fopAc_ac_c* param_1){
+bool dBomb_c::checkFlowerBombWait(fopAc_ac_c* param_1) {
     return (unk_1 == 0x221 && unk_2 == 4);
 }
 
-bool dBomb_c::checkWaterBomb(fopAc_ac_c* param_1){
-    return (unk_1 == 0x221 && (unk_4 & 0x10)!=0);
+bool dBomb_c::checkWaterBomb(fopAc_ac_c* param_1) {
+    return (unk_1 == 0x221 && (unk_4 & 0x10) != 0);
 }
 
-bool dBomb_c::checkInsectBombMove(fopAc_ac_c* param_1){
+bool dBomb_c::checkInsectBombMove(fopAc_ac_c* param_1) {
     return (unk_1 == 0x221 && unk_2 == 7);
 }
\ No newline at end of file
diff --git a/src/d/d_com/d_com_inf_game.cpp b/src/d/d_com/d_com_inf_game.cpp
index 2038bb021c..a6ae403651 100644
--- a/src/d/d_com/d_com_inf_game.cpp
+++ b/src/d/d_com/d_com_inf_game.cpp
@@ -4,12 +4,12 @@
 
 asm void dComIfG_play_c::ct(void) {
     nofralloc
-    #include "d/d_com/d_com_inf_game/asm/func_8002B1DC.s"
+#include "d/d_com/d_com_inf_game/asm/func_8002B1DC.s"
 }
 
 asm void dComIfG_play_c::init(void) {
     nofralloc
-    #include "d/d_com/d_com_inf_game/asm/func_8002B22C.s"
+#include "d/d_com/d_com_inf_game/asm/func_8002B22C.s"
 }
 
 void dComIfGp_checkItemGet(u8 param_1, int param_2) {
diff --git a/src/d/d_file/d_file_sel_info.cpp b/src/d/d_file/d_file_sel_info.cpp
index 7aaae896f0..35d6c2a6dc 100644
--- a/src/d/d_file/d_file_sel_info.cpp
+++ b/src/d/d_file/d_file_sel_info.cpp
@@ -2,27 +2,24 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
 
-asm dFile_info_c::dFile_info_c(JKRArchive*,u8) {
+asm dFile_info_c::dFile_info_c(JKRArchive*, u8) {
     nofralloc
-    #include "d/d_file/d_file_sel_info/asm/func_80192434.s"
+#include "d/d_file/d_file_sel_info/asm/func_80192434.s"
 }
 
 asm dFile_info_c::~dFile_info_c(void) {
     nofralloc
-    #include "d/d_file/d_file_sel_info/asm/func_801924A0.s"
+#include "d/d_file/d_file_sel_info/asm/func_801924A0.s"
 }
 
 asm void dFile_info_c::screenSet(void) {
     nofralloc
-    #include "d/d_file/d_file_sel_info/asm/func_80192570.s"
+#include "d/d_file/d_file_sel_info/asm/func_80192570.s"
 }
 
-
 // not even close
 #if NONMATCHING
-class JMSMesgEntry_c {
-
-};
+class JMSMesgEntry_c {};
 
 extern void dMeter2Info_c_NS_getString(u32, char*, JMSMesgEntry_c*);
 extern u8 DAT_804070D8;
@@ -40,18 +37,18 @@ s32 dFile_info_c::setSaveData(dSv_save_c* save_file, int param_2, u8 param_3) {
                 save_file->getPlayer().getPlayerStatusA().getCurrentHealth() = DAT_804061C2;
                 this->setHeartCnt(save_file);
                 save_file->getPlayer().getPlayerStatusA().getCurrentHealth() = 0xC;
-                strcpy(this->unk44,DAT_80406374);
+                strcpy(this->unk44, DAT_80406374);
                 strcpy(this->save_date, (char*)DAT_803948D8);
                 strcpy(this->play_time, (char*)DAT_803948D8);
-                dMeter2Info_c_NS_getString(0x4d,this->unk56,0);
+                dMeter2Info_c_NS_getString(0x4d, this->unk56, 0);
                 return 2;
             } else {
-                dMeter2Info_c_NS_getString(0x4d,this->unk56,0);
+                dMeter2Info_c_NS_getString(0x4d, this->unk56, 0);
                 return 1;
             }
         } else {
             this->setHeartCnt(save_file);
-            strcpy(this->unk44,save_file->getPlayer().getPlayerInfo().getLinkName());
+            strcpy(this->unk44, save_file->getPlayer().getPlayerInfo().getLinkName());
             setSaveDate(save_file);
             setPlayTime(save_file);
             return 0;
@@ -61,51 +58,51 @@ s32 dFile_info_c::setSaveData(dSv_save_c* save_file, int param_2, u8 param_3) {
 #else
 asm s32 dFile_info_c::setSaveData(dSv_save_c* save_file, int param_2, u8 param_3) {
     nofralloc
-    #include "d/d_file/d_file_sel_info/asm/func_80192954.s"
+#include "d/d_file/d_file_sel_info/asm/func_80192954.s"
 }
 #endif
 
 asm void dFile_info_c::setHeartCnt(dSv_save_c*) {
     nofralloc
-    #include "d/d_file/d_file_sel_info/asm/func_80192AA0.s"
+#include "d/d_file/d_file_sel_info/asm/func_80192AA0.s"
 }
 
 asm void dFile_info_c::setSaveDate(dSv_save_c*) {
     nofralloc
-    #include "d/d_file/d_file_sel_info/asm/func_80192C08.s"
+#include "d/d_file/d_file_sel_info/asm/func_80192C08.s"
 }
 
 asm void dFile_info_c::setPlayTime(dSv_save_c*) {
     nofralloc
-    #include "d/d_file/d_file_sel_info/asm/func_80192C70.s"
+#include "d/d_file/d_file_sel_info/asm/func_80192C70.s"
 }
 
 asm void dFile_info_c::modeWait(void) {
     nofralloc
-    #include "d/d_file/d_file_sel_info/asm/func_80192D58.s"
+#include "d/d_file/d_file_sel_info/asm/func_80192D58.s"
 }
 
 asm void dFile_info_c::modeMove(void) {
     nofralloc
-    #include "d/d_file/d_file_sel_info/asm/func_80192D5C.s"
+#include "d/d_file/d_file_sel_info/asm/func_80192D5C.s"
 }
 
 asm void dFile_info_c::_draw(void) {
     nofralloc
-    #include "d/d_file/d_file_sel_info/asm/func_80192D60.s"
+#include "d/d_file/d_file_sel_info/asm/func_80192D60.s"
 }
 
 asm void dDlst_FileInfo_c::draw(void) {
     nofralloc
-    #include "d/d_file/d_file_sel_info/asm/func_80192D9C.s"
+#include "d/d_file/d_file_sel_info/asm/func_80192D9C.s"
 }
 
 asm void _sinit_d_file_sel_info_cpp(void) {
     nofralloc
-    #include "d/d_file/d_file_sel_info/asm/func_80192E88.s"
+#include "d/d_file/d_file_sel_info/asm/func_80192E88.s"
 }
 
 asm dDlst_FileInfo_c::~dDlst_FileInfo_c() {
     nofralloc
-    #include "d/d_file/d_file_sel_info/asm/func_80192EC8.s"
+#include "d/d_file/d_file_sel_info/asm/func_80192EC8.s"
 }
\ No newline at end of file
diff --git a/src/d/d_item/d_item.cpp b/src/d/d_item/d_item.cpp
index ac8fcce47a..154aef414a 100644
--- a/src/d/d_item/d_item.cpp
+++ b/src/d/d_item/d_item.cpp
@@ -1,8 +1,8 @@
-#include "global.h"
 #include "d/d_item/d_item/d_item.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "global.h"
 
-void execItemGet(u8 item_id){
+void execItemGet(u8 item_id) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().onFirstBit(item_id);
     item_func_ptr[item_id]();
 }
@@ -15,1284 +15,1399 @@ int checkItemGet(u8 item_id, int param_2) {
     return uVar2;
 }
 
-void item_func_HEART(void){
+void item_func_HEART(void) {
     g_dComIfG_gameInfo.give_item.hearts += lbl_80452BD8;
     g_dComIfG_gameInfo.unk35[0xBE] = 0;
 }
 
-void item_func_GREEN_RUPEE(void){
+void item_func_GREEN_RUPEE(void) {
     g_dComIfG_gameInfo.give_item.rupees += 1;
 }
 
-void item_func_BLUE_RUPEE(void){
+void item_func_BLUE_RUPEE(void) {
     g_dComIfG_gameInfo.give_item.rupees += 5;
 }
 
-void item_func_YELLOW_RUPEE(void){
+void item_func_YELLOW_RUPEE(void) {
     g_dComIfG_gameInfo.give_item.rupees += 10;
 }
 
-void item_func_RED_RUPEE(void){
+void item_func_RED_RUPEE(void) {
     g_dComIfG_gameInfo.give_item.rupees += 20;
 }
 
-void item_func_PURPLE_RUPEE(void){
+void item_func_PURPLE_RUPEE(void) {
     g_dComIfG_gameInfo.give_item.rupees += 50;
 }
 
-void item_func_ORANGE_RUPEE(void){
+void item_func_ORANGE_RUPEE(void) {
     g_dComIfG_gameInfo.give_item.rupees += 100;
 }
 
-void item_func_SILVER_RUPEE(void){
+void item_func_SILVER_RUPEE(void) {
     g_dComIfG_gameInfo.give_item.rupees += 200;
 }
 
-void item_func_S_MAGIC(void){
+void item_func_S_MAGIC(void) {
     g_dComIfG_gameInfo.give_item.magic += 4;
 }
 
-void item_func_L_MAGIC(void){
+void item_func_L_MAGIC(void) {
     g_dComIfG_gameInfo.give_item.magic += 8;
 }
 
-void item_func_BOMB_5(void){
+void item_func_BOMB_5(void) {
     addBombCount(NORMAL_BOMB, 5);
 }
 
-void item_func_BOMB_10(void){
+void item_func_BOMB_10(void) {
     addBombCount(NORMAL_BOMB, 10);
 }
 
-void item_func_BOMB_20(void){
+void item_func_BOMB_20(void) {
     addBombCount(NORMAL_BOMB, 20);
 }
 
-void item_func_BOMB_30(void){
+void item_func_BOMB_30(void) {
     addBombCount(NORMAL_BOMB, 30);
 }
 
-void item_func_ARROW_10(void){
+void item_func_ARROW_10(void) {
     g_dComIfG_gameInfo.give_item.arrows += 10;
 }
 
-void item_func_ARROW_20(void){
+void item_func_ARROW_20(void) {
     g_dComIfG_gameInfo.give_item.arrows += 20;
 }
 
-void item_func_ARROW_30(void){
+void item_func_ARROW_30(void) {
     g_dComIfG_gameInfo.give_item.arrows += 30;
 }
 
-void item_func_ARROW_1(void){
+void item_func_ARROW_1(void) {
     g_dComIfG_gameInfo.give_item.arrows += 1;
 }
 
-void item_func_PACHINKO_SHOT(void){
+void item_func_PACHINKO_SHOT(void) {
     g_dComIfG_gameInfo.give_item.seeds += 50;
 }
 
-void item_func_WATER_BOMB_5(void){
+void item_func_WATER_BOMB_5(void) {
     addBombCount(WATER_BOMB, 5);
 }
 
-void item_func_WATER_BOMB_10(void){
+void item_func_WATER_BOMB_10(void) {
     addBombCount(WATER_BOMB, 10);
 }
 
-void item_func_WATER_BOMB_20(void){
+void item_func_WATER_BOMB_20(void) {
     addBombCount(WATER_BOMB, 15);
 }
 
-void item_func_WATER_BOMB_30(void){
+void item_func_WATER_BOMB_30(void) {
     addBombCount(WATER_BOMB, 3);
 }
 
-void item_func_BOMB_INSECT_5(void){
+void item_func_BOMB_INSECT_5(void) {
     addBombCount(POKE_BOMB, 5);
 }
 
-void item_func_BOMB_INSECT_10(void){
+void item_func_BOMB_INSECT_10(void) {
     addBombCount(POKE_BOMB, 10);
 }
 
-void item_func_BOMB_INSECT_20(void){
+void item_func_BOMB_INSECT_20(void) {
     addBombCount(POKE_BOMB, 3);
 }
 
-void item_func_BOMB_INSECT_30(void){
+void item_func_BOMB_INSECT_30(void) {
     return;
 }
 
-void item_func_RECOVER_FAILY(void){
+void item_func_RECOVER_FAILY(void) {
     g_dComIfG_gameInfo.give_item.hearts += lbl_80452BDC;
     g_dComIfG_gameInfo.unk35[0xBE] = 0;
 }
 
-void item_func_TRIPLE_HEART(void){
+void item_func_TRIPLE_HEART(void) {
     return;
 }
 
-void item_func_SMALL_KEY(void){
+void item_func_SMALL_KEY(void) {
     g_dComIfG_gameInfo.give_item.small_keys += 1;
 }
 
-void item_func_KAKERA_HEART(void){
+void item_func_KAKERA_HEART(void) {
     g_dComIfG_gameInfo.give_item.kakera_heart += 1;
 }
 
-asm void item_func_UTUWA_HEART(void){
+asm void item_func_UTUWA_HEART(void) {
     nofralloc
-    #include "d/d_item/d_item/asm/func_800982B4.s"
+#include "d/d_item/d_item/asm/func_800982B4.s"
 }
 
-void item_func_MAP(void){
+void item_func_MAP(void) {
     g_dComIfG_gameInfo.info.getMemory().getTempFlags().onDungeonItem(MAP_FLAG);
 }
 
-void item_func_COMPUS(void){
+void item_func_COMPUS(void) {
     g_dComIfG_gameInfo.info.getMemory().getTempFlags().onDungeonItem(COMPASS_FLAG);
 }
 
-void item_func_DUNGEON_EXIT(void){
+void item_func_DUNGEON_EXIT(void) {
     g_dComIfG_gameInfo.info.getMemory().getTempFlags().onDungeonItem(OOCCOO_NOTE_FLAG);
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_18,DUNGEON_EXIT);
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_18,
+                                                                              DUNGEON_EXIT);
 }
 
-void item_func_BOSS_KEY(void){
+void item_func_BOSS_KEY(void) {
     g_dComIfG_gameInfo.info.getMemory().getTempFlags().onDungeonItem(BOSS_KEY_FLAG);
 }
 
-void item_func_DUNGEON_BACK(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_18,DUNGEON_BACK);
+void item_func_DUNGEON_BACK(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_18,
+                                                                              DUNGEON_BACK);
 }
 
-void item_func_SWORD(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().setCollect(SWORD_BITFIELD,ORDON_SWORD_FLAG);
+void item_func_SWORD(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().setCollect(
+        SWORD_BITFIELD, ORDON_SWORD_FLAG);
     dComIfGs_setSelectEquipSword(SWORD);
 }
 
-void item_func_MASTER_SWORD(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().setCollect(SWORD_BITFIELD,MASTER_SWORD_FLAG);
+void item_func_MASTER_SWORD(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().setCollect(
+        SWORD_BITFIELD, MASTER_SWORD_FLAG);
     dComIfGs_setSelectEquipSword(MASTER_SWORD);
 }
 
-void item_func_WOOD_SHIELD(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().setCollect(SHIELD_BITFIELD,ORDON_SHIELD_FLAG);
+void item_func_WOOD_SHIELD(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().setCollect(
+        SHIELD_BITFIELD, ORDON_SHIELD_FLAG);
     dComIfGs_setSelectEquipShield(WOOD_SHIELD);
 }
 
-void item_func_SHIELD(void){
+void item_func_SHIELD(void) {
     return;
 }
 
-void item_func_HYLIA_SHIELD(void){
+void item_func_HYLIA_SHIELD(void) {
     return;
 }
 
-void item_func_TKS_LETTER(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_18,TKS_LETTER);
+void item_func_TKS_LETTER(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_18, TKS_LETTER);
 }
 
-void item_func_WEAR_CASUAL(void){
+void item_func_WEAR_CASUAL(void) {
     dComIfGs_setSelectEquipClothes(WEARS_CASUAL);
 }
 
-void item_func_WEAR_KOKIRI(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().setCollect(CLOTHING_BITFIELD,KOKIRI_CLOTHES_FLAG);
+void item_func_WEAR_KOKIRI(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().setCollect(
+        CLOTHING_BITFIELD, KOKIRI_CLOTHES_FLAG);
     dComIfGs_setSelectEquipClothes(WEAR_KOKIRI);
 }
 
-void item_func_ARMOR(void){
+void item_func_ARMOR(void) {
     return;
 }
 
-void item_func_WEAR_ZORA(void){
+void item_func_WEAR_ZORA(void) {
     return;
 }
 
-void item_func_MAGIC_LV1(void){
+void item_func_MAGIC_LV1(void) {
     g_dComIfG_gameInfo.give_item.magic += 16;
     g_dComIfG_gameInfo.give_item.magic_lv += 16;
 }
 
-void item_func_DUNGEON_EXIT_2(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_18,DUNGEON_EXIT);
+void item_func_DUNGEON_EXIT_2(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_18,
+                                                                              DUNGEON_EXIT);
 }
 
-void item_func_WALLET_LV1(void){
+void item_func_WALLET_LV1(void) {
     g_dComIfG_gameInfo.info.getSaveFile().setPlayerStatusAWallet(WALLET);
 }
 
-void item_func_WALLET_LV2(void){
+void item_func_WALLET_LV2(void) {
     g_dComIfG_gameInfo.info.getSaveFile().setPlayerStatusAWallet(BIG_WALLET);
 }
 
-void item_func_WALLET_LV3(void){
+void item_func_WALLET_LV3(void) {
     g_dComIfG_gameInfo.info.getSaveFile().setPlayerStatusAWallet(GIANT_WALLET);
 }
 
-void item_func_ZORAS_JEWEL(void){
+void item_func_ZORAS_JEWEL(void) {
     int checkFishingRod;
 
     checkFishingRod = item_getcheck_func_FISHING_ROD_1();
-    if(checkFishingRod != 0){
-        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setRodTypeLevelUp();   
-    }
-    else{
-        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_20,ZORAS_JEWEL);
+    if (checkFishingRod != 0) {
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setRodTypeLevelUp();
+    } else {
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_20,
+                                                                                  ZORAS_JEWEL);
     }
 }
 
-void item_func_HAWK_EYE(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_5,HAWK_EYE);
+void item_func_HAWK_EYE(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_5, HAWK_EYE);
 }
 
 #ifdef NONMATCHING
-void item_func_WOOD_STICK(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().setCollect(SWORD_BITFIELD,WOODEN_SWORD_FLAG);
+void item_func_WOOD_STICK(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().setCollect(
+        SWORD_BITFIELD, WOODEN_SWORD_FLAG);
     dComIfGs_setSelectEquipSword(WOOD_STICK);
-    g_dComIfG_gameInfo.info.onSwitch(28,lbl_80450D64); // wrong order
+    g_dComIfG_gameInfo.info.onSwitch(28, lbl_80450D64);  // wrong order
 }
 #else
 asm void item_func_WOOD_STICK(void) {
     nofralloc
-    #include "d/d_item/d_item/asm/func_800986C4.s"
+#include "d/d_item/d_item/asm/func_800986C4.s"
 }
 #endif
 
-void item_func_BOOMERANG(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_0,BOOMERANG);
+void item_func_BOOMERANG(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_0, BOOMERANG);
 }
 
-void item_func_SPINNER(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_2,SPINNER);
+void item_func_SPINNER(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_2, SPINNER);
 }
 
-void item_func_IRONBALL(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_6,IRONBALL);
+void item_func_IRONBALL(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_6, IRONBALL);
 }
 
 // li r0, 0x1e instruction in wrong place
 #ifdef NONMATCHING
-void item_func_BOW(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_4,BOW);
+void item_func_BOW(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_4, BOW);
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemRecord().setBowAmount(30);
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemMax().setBowCapacity(30);
 }
 #else
 asm void item_func_BOW(void) {
     nofralloc
-    #include "d/d_item/d_item/asm/func_800987B4.s"
+#include "d/d_item/d_item/asm/func_800987B4.s"
 }
 #endif
 
-void item_func_HOOKSHOT(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_9,HOOKSHOT);
+void item_func_HOOKSHOT(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_9, HOOKSHOT);
 }
 
-void item_func_HVY_BOOTS(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_3,HVY_BOOTS);
+void item_func_HVY_BOOTS(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_3, HVY_BOOTS);
 }
 
-void item_func_COPY_ROD(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_8,COPY_ROD);
+void item_func_COPY_ROD(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_8, COPY_ROD);
 }
 
-void item_func_W_HOOKSHOT(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_9,NO_ITEM);
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_10,W_HOOKSHOT);
+void item_func_W_HOOKSHOT(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_9, NO_ITEM);
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_10, W_HOOKSHOT);
 }
 
-void item_func_KANTERA(void){
+void item_func_KANTERA(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().setPlayerStatusAOil(21600);
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_1,KANTERA);
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_1, KANTERA);
 }
 
-void item_func_LIGHT_SWORD(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().setCollect(SWORD_BITFIELD,LIGHT_SWORD_FLAG);
-    dMeter2Info_setSword(LIGHT_SWORD,0);
+void item_func_LIGHT_SWORD(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().setCollect(
+        SWORD_BITFIELD, LIGHT_SWORD_FLAG);
+    dMeter2Info_setSword(LIGHT_SWORD, 0);
 }
 
-void item_func_FISHING_ROD_1(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_20,FISHING_ROD_1);
+void item_func_FISHING_ROD_1(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_20,
+                                                                              FISHING_ROD_1);
 }
 
-void item_func_PACHINKO(void){
+void item_func_PACHINKO(void) {
     g_dComIfG_gameInfo.give_item.seeds += 50;
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_23,PACHINKO);
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_23, PACHINKO);
 }
 
-void item_func_COPY_ROD_2(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_8,COPY_ROD);
+void item_func_COPY_ROD_2(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_8, COPY_ROD);
 }
 
-void item_func_BOMB_BAG_LV2(void){
+void item_func_BOMB_BAG_LV2(void) {
     return;
 }
 
-void item_func_BOMB_BAG_LV1(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBag(NORMAL_BOMB,30);
+void item_func_BOMB_BAG_LV1(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBag(NORMAL_BOMB,
+                                                                                      30);
 }
 
-void item_func_BOMB_IN_BAG(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBag(NORMAL_BOMB,30);
+void item_func_BOMB_IN_BAG(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBag(NORMAL_BOMB,
+                                                                                      30);
 }
 
-void item_func_LIGHT_ARROW(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_4,LIGHT_ARROW);
+void item_func_LIGHT_ARROW(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_4, LIGHT_ARROW);
 }
 
 // li r0, 0x3C instruction in wrong place
 #ifdef NONMATCHING
-void item_func_ARROW_LV1(void){
+void item_func_ARROW_LV1(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemRecord().setBowAmount(60);
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemMax().setBowCapacity(60);
 }
 #else
 asm void item_func_ARROW_LV1(void) {
     nofralloc
-    #include "d/d_item/d_item/asm/func_80098AB0.s"
+#include "d/d_item/d_item/asm/func_80098AB0.s"
 }
 #endif
 
 // li r0, 0x3C instruction in wrong place
 #ifdef NONMATCHING
-void item_func_ARROW_LV2(void){
+void item_func_ARROW_LV2(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemRecord().setBowAmount(60);
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemMax().setBowCapacity(60);
 }
 #else
 asm void item_func_ARROW_LV2(void) {
     nofralloc
-    #include "d/d_item/d_item/asm/func_80098AB0.s" // didnt bother splitting as its exactly the same as LV1
+#include "d/d_item/d_item/asm/func_80098AB0.s"  // didnt bother splitting as its exactly the same as LV1
 }
 #endif
 
 // li r0, 0x64 instruction in wrong place
 #ifdef NONMATCHING
-void item_func_ARROW_LV3(void){
+void item_func_ARROW_LV3(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemRecord().setBowAmount(100);
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemMax().setBowCapacity(100);
 }
 #else
 asm void item_func_ARROW_LV3(void) {
     nofralloc
-    #include "d/d_item/d_item/asm/func_80098AE0.s"
+#include "d/d_item/d_item/asm/func_80098AE0.s"
 }
 #endif
 
-void item_func_LURE_ROD(void){
+void item_func_LURE_ROD(void) {
     return;
 }
 
-void item_func_BOMB_ARROW(void){
+void item_func_BOMB_ARROW(void) {
     return;
 }
 
-void item_func_HAWK_ARROW(void){
+void item_func_HAWK_ARROW(void) {
     return;
 }
 
-void item_func_BEE_ROD(void){
+void item_func_BEE_ROD(void) {
     return;
 }
 
-void item_func_JEWEL_ROD(void){
+void item_func_JEWEL_ROD(void) {
     return;
 }
 
-void item_func_WORM_ROD(void){
+void item_func_WORM_ROD(void) {
     return;
 }
 
-void item_func_JEWEL_BEE_ROD(void){
+void item_func_JEWEL_BEE_ROD(void) {
     return;
 }
 
-void item_func_JEWEL_WORM_ROD(void){
+void item_func_JEWEL_WORM_ROD(void) {
     return;
 }
 
-void item_func_EMPTY_BOTTLE(void){
+void item_func_EMPTY_BOTTLE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottle();
 }
 
-void item_func_RED_BOTTLE(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(RED_BOTTLE);
+void item_func_RED_BOTTLE(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        RED_BOTTLE);
 }
 
-void item_func_GREEN_BOTTLE(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(GREEN_BOTTLE);
+void item_func_GREEN_BOTTLE(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        GREEN_BOTTLE);
 }
 
-void item_func_BLUE_BOTTLE(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(BLUE_BOTTLE);
+void item_func_BLUE_BOTTLE(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        BLUE_BOTTLE);
 }
 
-void item_func_MILK_BOTTLE(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(MILK_BOTTLE);
+void item_func_MILK_BOTTLE(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        MILK_BOTTLE);
 }
 
-void item_func_HALF_MILK_BOTTLE(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottle(HALF_MILK_BOTTLE);
+void item_func_HALF_MILK_BOTTLE(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottle(
+        HALF_MILK_BOTTLE);
 }
 
-void item_func_OIL_BOTTLE(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(OIL_BOTTLE);
+void item_func_OIL_BOTTLE(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        OIL_BOTTLE);
 }
 
-void item_func_WATER_BOTTLE(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(WATER_BOTTLE);
+void item_func_WATER_BOTTLE(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        WATER_BOTTLE);
 }
 
-void item_func_OIL_BOTTLE2(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(OIL_BOTTLE);
+void item_func_OIL_BOTTLE2(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        OIL_BOTTLE);
 }
 
-void item_func_RED_BOTTLE2(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(RED_BOTTLE);
+void item_func_RED_BOTTLE2(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        RED_BOTTLE);
 }
 
-void item_func_UGLY_SOUP(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(UGLY_SOUP);
+void item_func_UGLY_SOUP(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        UGLY_SOUP);
 }
 
-void item_func_HOT_SPRING(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(HOT_SPRING);
+void item_func_HOT_SPRING(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        HOT_SPRING);
 }
 
-void item_func_FAIRY_BOTTLE(void){
+void item_func_FAIRY_BOTTLE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(FAIRY);
 }
 
-void item_func_HOT_SPRING2(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(HOT_SPRING);
+void item_func_HOT_SPRING2(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        HOT_SPRING);
 }
 
-void item_func_OIL2(void){
+void item_func_OIL2(void) {
     return;
 }
 
-void item_func_OIL(void){
+void item_func_OIL(void) {
     return;
 }
 
-void item_func_NORMAL_BOMB(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBag(NORMAL_BOMB,60);
+void item_func_NORMAL_BOMB(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBag(NORMAL_BOMB,
+                                                                                      60);
 }
 
-void item_func_WATER_BOMB(void){
+void item_func_WATER_BOMB(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBag();
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBagItemIn(WATER_BOMB,1);
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBagItemIn(
+        WATER_BOMB, 1);
 }
 
-void item_func_POKE_BOMB(void){
+void item_func_POKE_BOMB(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBag();
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBagItemIn(POKE_BOMB,1);
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBombBagItemIn(
+        POKE_BOMB, 1);
 }
 
-void item_func_FAIRY_DROP(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(FAIRY_DROP);
+void item_func_FAIRY_DROP(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        FAIRY_DROP);
 }
 
-void item_func_WORM(void){
+void item_func_WORM(void) {
     return;
 }
 
-void item_func_DROP_BOTTLE(void){
+void item_func_DROP_BOTTLE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottle(FAIRY_DROP);
 }
 
 asm void item_func_BEE_CHILD(void) {
     nofralloc
-    #include "d/d_item/d_item/asm/func_80098EE4.s"
+#include "d/d_item/d_item/asm/func_80098EE4.s"
 }
 
-void item_func_CHUCHU_RARE(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_RARE);
+void item_func_CHUCHU_RARE(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        CHUCHU_RARE);
 }
 
-void item_func_CHUCHU_RED(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_RED);
+void item_func_CHUCHU_RED(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        CHUCHU_RED);
 }
 
-void item_func_CHUCHU_BLUE(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_BLUE);
+void item_func_CHUCHU_BLUE(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        CHUCHU_BLUE);
 }
 
-void item_func_CHUCHU_GREEN(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_GREEN);
+void item_func_CHUCHU_GREEN(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        CHUCHU_GREEN);
 }
 
-void item_func_CHUCHU_YELLOW(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_YELLOW);
+void item_func_CHUCHU_YELLOW(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        CHUCHU_YELLOW);
 }
 
-void item_func_CHUCHU_PURPLE(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_PURPLE);
+void item_func_CHUCHU_PURPLE(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        CHUCHU_PURPLE);
 }
 
-void item_func_LV1_SOUP(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(LV1_SOUP);
+void item_func_LV1_SOUP(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        LV1_SOUP);
 }
 
-void item_func_LV2_SOUP(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(LV2_SOUP);
+void item_func_LV2_SOUP(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        LV2_SOUP);
 }
 
-void item_func_LV3_SOUP(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(LV3_SOUP);
+void item_func_LV3_SOUP(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        LV3_SOUP);
 }
 
-void item_func_LETTER(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_21,LETTER);
+void item_func_LETTER(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_21, LETTER);
 }
 
-void item_func_BILL(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_21,BILL);
+void item_func_BILL(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_21, BILL);
 }
 
-void item_func_WOOD_STATUE(void){
+void item_func_WOOD_STATUE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getEventFlags().onEventBit(lbl_803A7288.unk566);
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_21,WOOD_STATUE);
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_21, WOOD_STATUE);
 }
 
-void item_func_IRIAS_PENDANT(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_21,IRIAS_PENDANT);
+void item_func_IRIAS_PENDANT(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_21,
+                                                                              IRIAS_PENDANT);
 }
 
-void item_func_HORSE_FLUTE(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_21,HORSE_FLUTE);
+void item_func_HORSE_FLUTE(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_21, HORSE_FLUTE);
 }
 
-void item_func_RAFRELS_MEMO(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_19,RAFRELS_MEMO);
+void item_func_RAFRELS_MEMO(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_19,
+                                                                              RAFRELS_MEMO);
 }
 
-void item_func_ASHS_SCRIBBLING(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_19,ASHS_SCRIBBLING);
+void item_func_ASHS_SCRIBBLING(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_19,
+                                                                              ASHS_SCRIBBLING);
 }
 
-void item_func_CHUCHU_YELLOW2(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_YELLOW);
+void item_func_CHUCHU_YELLOW2(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        CHUCHU_YELLOW);
 }
 
-void item_func_OIL_BOTTLE3(void){
+void item_func_OIL_BOTTLE3(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottle(OIL_BOTTLE);
 }
 
-void item_func_SHOP_BEE_CHILD(void){
+void item_func_SHOP_BEE_CHILD(void) {
     item_func_BEE_CHILD();
 }
 
-void item_func_CHUCHU_BLACK(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_BLACK);
+void item_func_CHUCHU_BLACK(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setEmptyBottleItemIn(
+        CHUCHU_BLACK);
 }
 
-void item_func_LIGHT_DROP(void){
+void item_func_LIGHT_DROP(void) {
     return;
 }
 
-void item_func_DROP_CONTAINER(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getLightDrop().onLightDropGetFlag(FARON_VESSEL);
+void item_func_DROP_CONTAINER(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getLightDrop().onLightDropGetFlag(
+        FARON_VESSEL);
 }
 
-void item_func_DROP_CONTAINER02(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getLightDrop().onLightDropGetFlag(ELDIN_VESSEL);
+void item_func_DROP_CONTAINER02(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getLightDrop().onLightDropGetFlag(
+        ELDIN_VESSEL);
 }
 
-void item_func_DROP_CONTAINER03(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getLightDrop().onLightDropGetFlag(LANAYRU_VESSEL);
+void item_func_DROP_CONTAINER03(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getLightDrop().onLightDropGetFlag(
+        LANAYRU_VESSEL);
 }
 
-void item_func_FILLED_CONTAINER(void){
+void item_func_FILLED_CONTAINER(void) {
     return;
 }
 
-void item_func_MIRROR_PIECE_2(void){
+void item_func_MIRROR_PIECE_2(void) {
     return;
 }
 
-void item_func_MIRROR_PIECE_3(void){
+void item_func_MIRROR_PIECE_3(void) {
     return;
 }
 
-void item_func_MIRROR_PIECE_4(void){
+void item_func_MIRROR_PIECE_4(void) {
     return;
 }
 
-void item_func_SMELL_YELIA_POUCH(void){
+void item_func_SMELL_YELIA_POUCH(void) {
     return;
 }
 
-void item_func_SMELL_PUMPKIN(void){
+void item_func_SMELL_PUMPKIN(void) {
     return;
 }
 
-void item_func_SMELL_POH(void){
+void item_func_SMELL_POH(void) {
     return;
 }
 
-void item_func_SMELL_FISH(void){
+void item_func_SMELL_FISH(void) {
     return;
 }
 
-void item_func_SMELL_CHILDREN(void){
+void item_func_SMELL_CHILDREN(void) {
     return;
 }
 
-void item_func_SMELL_MEDICINE(void){
+void item_func_SMELL_MEDICINE(void) {
     return;
 }
 
-void item_func_M_BEETLE(void){
+void item_func_M_BEETLE(void) {
     return;
 }
 
-void item_func_F_BEETLE(void){
+void item_func_F_BEETLE(void) {
     return;
 }
 
-void item_func_M_BUTTERFLY(void){
+void item_func_M_BUTTERFLY(void) {
     return;
 }
 
-void item_func_F_BUTTERFLY(void){
+void item_func_F_BUTTERFLY(void) {
     return;
 }
 
-void item_func_M_STAG_BEETLE(void){
+void item_func_M_STAG_BEETLE(void) {
     return;
 }
 
-void item_func_F_STAG_BEETLE(void){
+void item_func_F_STAG_BEETLE(void) {
     return;
 }
 
-void item_func_M_GRASSHOPPER(void){
+void item_func_M_GRASSHOPPER(void) {
     return;
 }
 
-void item_func_F_GRASSHOPPER(void){
+void item_func_F_GRASSHOPPER(void) {
     return;
 }
 
-void item_func_M_NANAFUSHI(void){
+void item_func_M_NANAFUSHI(void) {
     return;
 }
 
-void item_func_F_NANAFUSHI(void){
+void item_func_F_NANAFUSHI(void) {
     return;
 }
 
-void item_func_M_DANGOMUSHI(void){
+void item_func_M_DANGOMUSHI(void) {
     return;
 }
 
-void item_func_F_DANGOMUSHI(void){
+void item_func_F_DANGOMUSHI(void) {
     return;
 }
 
-void item_func_M_MANTIS(void){
+void item_func_M_MANTIS(void) {
     return;
 }
 
-void item_func_F_MANTIS(void){
+void item_func_F_MANTIS(void) {
     return;
 }
 
-void item_func_M_LADYBUG(void){
+void item_func_M_LADYBUG(void) {
     return;
 }
 
-void item_func_F_LADYBUG(void){
+void item_func_F_LADYBUG(void) {
     return;
 }
 
-void item_func_M_SNAIL(void){
+void item_func_M_SNAIL(void) {
     return;
 }
 
-void item_func_F_SNAIL(void){
+void item_func_F_SNAIL(void) {
     return;
 }
 
-void item_func_M_DRAGONFLY(void){
+void item_func_M_DRAGONFLY(void) {
     return;
 }
 
-void item_func_F_DRAGONFLY(void){
+void item_func_F_DRAGONFLY(void) {
     return;
 }
 
-void item_func_M_ANT(void){
+void item_func_M_ANT(void) {
     return;
 }
 
-void item_func_F_ANT(void){
+void item_func_F_ANT(void) {
     return;
 }
 
-void item_func_M_MAYFLY(void){
+void item_func_M_MAYFLY(void) {
     return;
 }
 
-void item_func_F_MAYFLY(void){
+void item_func_F_MAYFLY(void) {
     return;
 }
 
-void item_func_POU_SPIRIT(void){
+void item_func_POU_SPIRIT(void) {
     return;
 }
 
-void item_func_ANCIENT_DOCUMENT(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_22,ANCIENT_DOCUMENT);
+void item_func_ANCIENT_DOCUMENT(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_22,
+                                                                              ANCIENT_DOCUMENT);
 }
 
-void item_func_AIR_LETTER(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_22,AIR_LETTER);
+void item_func_AIR_LETTER(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_22, AIR_LETTER);
 }
 
-void item_func_ANCIENT_DOCUMENT2(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_22,ANCIENT_DOCUMENT2);
+void item_func_ANCIENT_DOCUMENT2(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_22,
+                                                                              ANCIENT_DOCUMENT2);
 }
 
-void item_func_LV7_DUNGEON_EXIT(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_18,LV7_DUNGEON_EXIT);
+void item_func_LV7_DUNGEON_EXIT(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_18,
+                                                                              LV7_DUNGEON_EXIT);
 }
 
-void item_func_LINKS_SAVINGS(void){
+void item_func_LINKS_SAVINGS(void) {
     g_dComIfG_gameInfo.give_item.rupees += 50;
 }
 
-void item_func_SMALL_KEY2(void){
+void item_func_SMALL_KEY2(void) {
     g_dComIfG_gameInfo.give_item.small_keys += 1;
 }
 
-void item_func_POU_FIRE1(void){
+void item_func_POU_FIRE1(void) {
     return;
 }
 
-void item_func_POU_FIRE2(void){
+void item_func_POU_FIRE2(void) {
     return;
 }
 
-void item_func_POU_FIRE3(void){
+void item_func_POU_FIRE3(void) {
     return;
 }
 
-void item_func_POU_FIRE4(void){
+void item_func_POU_FIRE4(void) {
     return;
 }
 
-void item_func_BOSSRIDER_KEY(void){
+void item_func_BOSSRIDER_KEY(void) {
     return;
 }
 
-void item_func_TOMATO_PUREE(void){
+void item_func_TOMATO_PUREE(void) {
     return;
 }
 
-void item_func_TASTE(void){
+void item_func_TASTE(void) {
     return;
 }
 
-void item_func_LV5_BOSS_KEY(void){
+void item_func_LV5_BOSS_KEY(void) {
     g_dComIfG_gameInfo.info.getMemory().getTempFlags().onDungeonItem(BOSS_KEY_FLAG);
 }
 
-void item_func_SURFBOARD(void){
+void item_func_SURFBOARD(void) {
     return;
 }
 
-void item_func_KANTERA2(void){
+void item_func_KANTERA2(void) {
     return;
 }
 
-void item_func_L2_KEY_PIECES1(void){
+void item_func_L2_KEY_PIECES1(void) {
     return;
 }
 
-void item_func_L2_KEY_PIECES2(void){
+void item_func_L2_KEY_PIECES2(void) {
     return;
 }
 
-void item_func_L2_KEY_PIECES3(void){
+void item_func_L2_KEY_PIECES3(void) {
     return;
 }
 
-void item_func_KEY_OF_CARAVAN(void){
+void item_func_KEY_OF_CARAVAN(void) {
     return;
 }
 
-void item_func_LV2_BOSS_KEY(void){
+void item_func_LV2_BOSS_KEY(void) {
     g_dComIfG_gameInfo.info.getMemory().getTempFlags().onDungeonItem(BOSS_KEY_FLAG);
 }
 
-void item_func_KEY_OF_FILONE(void){
+void item_func_KEY_OF_FILONE(void) {
     g_dComIfG_gameInfo.give_item.small_keys += 1;
 }
 
-void item_func_noentry(void){
+void item_func_noentry(void) {
     return;
 }
 
-int item_getcheck_func_noentry(void){
+int item_getcheck_func_noentry(void) {
     return -1;
 }
 
-int item_getcheck_func_HEART(void){
+int item_getcheck_func_HEART(void) {
     return -1;
 }
 
-void item_getcheck_func_GREEN_RUPEE(void){
+void item_getcheck_func_GREEN_RUPEE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(GREEN_RUPEE);
 }
 
-void item_getcheck_func_BLUE_RUPEE(void){
+void item_getcheck_func_BLUE_RUPEE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BLUE_RUPEE);
 }
 
-void item_getcheck_func_YELLOW_RUPEE(void){
+void item_getcheck_func_YELLOW_RUPEE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(YELLOW_RUPEE);
 }
 
-void item_getcheck_func_RED_RUPEE(void){
+void item_getcheck_func_RED_RUPEE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(RED_RUPEE);
 }
 
-void item_getcheck_func_PURPLE_RUPEE(void){
+void item_getcheck_func_PURPLE_RUPEE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(PURPLE_RUPEE);
 }
 
-void item_getcheck_func_ORANGE_RUPEE(void){
+void item_getcheck_func_ORANGE_RUPEE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(ORANGE_RUPEE);
 }
 
-void item_getcheck_func_SILVER_RUPEE(void){
+void item_getcheck_func_SILVER_RUPEE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(SILVER_RUPEE);
 }
 
-int item_getcheck_func_S_MAGIC(void){
+int item_getcheck_func_S_MAGIC(void) {
     return -1;
 }
 
-int item_getcheck_func_L_MAGIC(void){
+int item_getcheck_func_L_MAGIC(void) {
     return -1;
 }
 
-void item_getcheck_func_BOMB_5(void){
+void item_getcheck_func_BOMB_5(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_5);
 }
 
-void item_getcheck_func_BOMB_10(void){
+void item_getcheck_func_BOMB_10(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_10);
 }
 
-void item_getcheck_func_BOMB_20(void){
+void item_getcheck_func_BOMB_20(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_20);
 }
 
-void item_getcheck_func_BOMB_30(void){
+void item_getcheck_func_BOMB_30(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_30);
 }
 
-void item_getcheck_func_ARROW_10(void){
+void item_getcheck_func_ARROW_10(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(ARROW_10);
 }
 
-void item_getcheck_func_ARROW_20(void){
+void item_getcheck_func_ARROW_20(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(ARROW_20);
 }
 
-void item_getcheck_func_ARROW_30(void){
+void item_getcheck_func_ARROW_30(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(ARROW_30);
 }
 
-void item_getcheck_func_ARROW_1(void){
+void item_getcheck_func_ARROW_1(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(ARROW_1);
 }
 
-void item_getcheck_func_PACHINKO_SHOT(void){
+void item_getcheck_func_PACHINKO_SHOT(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(PACHINKO_SHOT);
 }
 
-int item_getcheck_func_WATER_BOMB_5(void){
+int item_getcheck_func_WATER_BOMB_5(void) {
     return -1;
 }
 
-int item_getcheck_func_WATER_BOMB_10(void){
+int item_getcheck_func_WATER_BOMB_10(void) {
     return -1;
 }
 
-int item_getcheck_func_WATER_BOMB_20(void){
+int item_getcheck_func_WATER_BOMB_20(void) {
     return -1;
 }
 
-int item_getcheck_func_WATER_BOMB_30(void){
+int item_getcheck_func_WATER_BOMB_30(void) {
     return -1;
 }
 
-int item_getcheck_func_BOMB_INSECT_5(void){
+int item_getcheck_func_BOMB_INSECT_5(void) {
     return -1;
 }
 
-void item_getcheck_func_BOMB_INSECT_10(void){
+void item_getcheck_func_BOMB_INSECT_10(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_INSECT_10);
 }
 
-void item_getcheck_func_BOMB_INSECT_20(void){
+void item_getcheck_func_BOMB_INSECT_20(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_INSECT_20);
 }
 
-void item_getcheck_func_BOMB_INSECT_30(void){
+void item_getcheck_func_BOMB_INSECT_30(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_INSECT_30);
 }
 
-int item_getcheck_func_RECOVER_FAILY(void){
+int item_getcheck_func_RECOVER_FAILY(void) {
     return -1;
 }
 
-int item_getcheck_func_TRIPLE_HEART(void){
+int item_getcheck_func_TRIPLE_HEART(void) {
     return -1;
 }
 
-int item_getcheck_func_SMALL_KEY(void){
+int item_getcheck_func_SMALL_KEY(void) {
     return -1;
 }
 
-int item_getcheck_func_KAKERA_HEART(void){
+int item_getcheck_func_KAKERA_HEART(void) {
     return -1;
 }
 
-int item_getcheck_func_UTUWA_HEART(void){
+int item_getcheck_func_UTUWA_HEART(void) {
     return -1;
 }
 
-bool item_getcheck_func_MAP(void){
+bool item_getcheck_func_MAP(void) {
     return g_dComIfG_gameInfo.info.getMemory().getTempFlags().isDungeonItem(MAP_FLAG);
 }
 
-int item_getcheck_func_COMPUS(void){
+int item_getcheck_func_COMPUS(void) {
     return -1;
 }
 
-int item_getcheck_func_DUNGEON_EXIT(void){
-    u32 check_item = __cntlzw(DUNGEON_EXIT - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18,true));
+int item_getcheck_func_DUNGEON_EXIT(void) {
+    u32 check_item = __cntlzw(
+        DUNGEON_EXIT -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18, true));
     return check_item >> 5;
 }
 
-bool item_getcheck_func_BOSS_KEY(void){
+bool item_getcheck_func_BOSS_KEY(void) {
     return g_dComIfG_gameInfo.info.getMemory().getTempFlags().isDungeonItem(BOSS_KEY_FLAG);
 }
 
-int item_getcheck_func_DUNGEON_BACK(void){
-    u32 check_item = __cntlzw(DUNGEON_BACK - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18,true));
+int item_getcheck_func_DUNGEON_BACK(void) {
+    u32 check_item = __cntlzw(
+        DUNGEON_BACK -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18, true));
     return check_item >> 5;
 }
 
-void item_getcheck_func_SWORD(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().isCollect(SWORD_BITFIELD,ORDON_SWORD_FLAG);
+void item_getcheck_func_SWORD(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().isCollect(
+        SWORD_BITFIELD, ORDON_SWORD_FLAG);
 }
 
-void item_getcheck_func_MASTER_SWORD(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().isCollect(SWORD_BITFIELD,MASTER_SWORD_FLAG);
+void item_getcheck_func_MASTER_SWORD(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().isCollect(
+        SWORD_BITFIELD, MASTER_SWORD_FLAG);
 }
 
-void item_getcheck_func_WOOD_SHIELD(void){
+void item_getcheck_func_WOOD_SHIELD(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(WOOD_SHIELD);
 }
 
-void item_getcheck_func_SHIELD(void){
+void item_getcheck_func_SHIELD(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(SHIELD);
 }
 
-void item_getcheck_func_HYLIA_SHIELD(void){
+void item_getcheck_func_HYLIA_SHIELD(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(HYLIA_SHIELD);
 }
 
-int item_getcheck_func_TKS_LETTER(void){
-    u32 check_item = __cntlzw(TKS_LETTER - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18,true));
+int item_getcheck_func_TKS_LETTER(void) {
+    u32 check_item = __cntlzw(
+        TKS_LETTER -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18, true));
     return check_item >> 5;
 }
 
-void item_getcheck_func_WEAR_CASUAL(void){
+void item_getcheck_func_WEAR_CASUAL(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(WEARS_CASUAL);
 }
 
-void item_getcheck_func_WEAR_KOKIRI(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().isCollect(CLOTHING_BITFIELD,KOKIRI_CLOTHES_FLAG);
+void item_getcheck_func_WEAR_KOKIRI(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().isCollect(
+        CLOTHING_BITFIELD, KOKIRI_CLOTHES_FLAG);
 }
 
-void item_getcheck_func_ARMOR(void){
+void item_getcheck_func_ARMOR(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(ARMOR);
 }
 
-void item_getcheck_func_WEAR_ZORA(void){
+void item_getcheck_func_WEAR_ZORA(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(WEAR_ZORA);
 }
 
-int item_getcheck_func_MAGIC_LV1(void){
+int item_getcheck_func_MAGIC_LV1(void) {
     return -1;
 }
 
-int item_getcheck_func_DUNGEON_EXIT_2(void){
-    u32 check_item = __cntlzw(DUNGEON_EXIT - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18,true));
+int item_getcheck_func_DUNGEON_EXIT_2(void) {
+    u32 check_item = __cntlzw(
+        DUNGEON_EXIT -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18, true));
     return check_item >> 5;
 }
 
-int item_getcheck_func_WALLET_LV1(void){
+int item_getcheck_func_WALLET_LV1(void) {
     return -1;
 }
 
-int item_getcheck_func_WALLET_LV2(void){
+int item_getcheck_func_WALLET_LV2(void) {
     return -1;
 }
 
-int item_getcheck_func_WALLET_LV3(void){
+int item_getcheck_func_WALLET_LV3(void) {
     return -1;
 }
 
-int item_getcheck_func_ZORAS_JEWEL(void){
-    u32 check_item = __cntlzw(ZORAS_JEWEL - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_20,true));
+int item_getcheck_func_ZORAS_JEWEL(void) {
+    u32 check_item = __cntlzw(
+        ZORAS_JEWEL -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_20, true));
     return check_item >> 5;
 }
 
-void item_getcheck_func_HAWK_EYE(void){
+void item_getcheck_func_HAWK_EYE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(HAWK_EYE);
 }
 
-void item_getcheck_func_WOOD_STICK(void){
+void item_getcheck_func_WOOD_STICK(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(WOOD_STICK);
 }
 
-int item_getcheck_func_BOOMERANG(void){
-    u32 check_item = __cntlzw(BOOMERANG - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_0,true));
+int item_getcheck_func_BOOMERANG(void) {
+    u32 check_item = __cntlzw(
+        BOOMERANG -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_0, true));
     return check_item >> 5;
 }
 
-int item_getcheck_func_SPINNER(void){
-    u32 check_item = __cntlzw(SPINNER - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_2,true));
+int item_getcheck_func_SPINNER(void) {
+    u32 check_item = __cntlzw(
+        SPINNER -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_2, true));
     return check_item >> 5;
 }
 
-int item_getcheck_func_IRONBALL(void){
-    u32 check_item = __cntlzw(IRONBALL - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_6,true));
+int item_getcheck_func_IRONBALL(void) {
+    u32 check_item = __cntlzw(
+        IRONBALL -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_6, true));
     return check_item >> 5;
 }
 
-int item_getcheck_func_BOW(void){
-    u32 check_item = __cntlzw(BOW - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_4,false));
+int item_getcheck_func_BOW(void) {
+    u32 check_item =
+        __cntlzw(BOW - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
+                           SLOT_4, false));
     return check_item >> 5;
 }
 
-int item_getcheck_func_HOOKSHOT(void){
-    u32 check_item = __cntlzw(HOOKSHOT - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_9,true));
+int item_getcheck_func_HOOKSHOT(void) {
+    u32 check_item = __cntlzw(
+        HOOKSHOT -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_9, true));
     return check_item >> 5;
 }
 
-int item_getcheck_func_HVY_BOOTS(void){
-    u32 check_item = __cntlzw(HVY_BOOTS - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_3,true));
+int item_getcheck_func_HVY_BOOTS(void) {
+    u32 check_item = __cntlzw(
+        HVY_BOOTS -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_3, true));
     return check_item >> 5;
 }
 
-int item_getcheck_func_COPY_ROD(void){
-    u32 check_item = __cntlzw(COPY_ROD - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_8,true));
+int item_getcheck_func_COPY_ROD(void) {
+    u32 check_item = __cntlzw(
+        COPY_ROD -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_8, true));
     return check_item >> 5;
 }
 
-int item_getcheck_func_W_HOOKSHOT(void){
-    u32 check_item = __cntlzw(W_HOOKSHOT - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_10,true));
+int item_getcheck_func_W_HOOKSHOT(void) {
+    u32 check_item = __cntlzw(
+        W_HOOKSHOT -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_10, true));
     return check_item >> 5;
 }
 
-int item_getcheck_func_KANTERA(void){
-    u32 check_item = __cntlzw(KANTERA - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_1,true));
+int item_getcheck_func_KANTERA(void) {
+    u32 check_item = __cntlzw(
+        KANTERA -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_1, true));
     return check_item >> 5;
 }
 
-void item_getcheck_func_LIGHT_SWORD(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().isCollect(SWORD_BITFIELD,LIGHT_SWORD_FLAG);
+void item_getcheck_func_LIGHT_SWORD(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().isCollect(
+        SWORD_BITFIELD, LIGHT_SWORD_FLAG);
 }
 
-asm int item_getcheck_func_FISHING_ROD_1(void){
+asm int item_getcheck_func_FISHING_ROD_1(void) {
     nofralloc
-    #include "d/d_item/d_item/asm/func_8009A0C8.s"
+#include "d/d_item/d_item/asm/func_8009A0C8.s"
 }
 
-int item_getcheck_func_PACHINKO(void){
-    u32 check_item = __cntlzw(PACHINKO - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_23,true));
+int item_getcheck_func_PACHINKO(void) {
+    u32 check_item = __cntlzw(
+        PACHINKO -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_23, true));
     return check_item >> 5;
 }
 
-int item_getcheck_func_COPY_ROD_2(void){
+int item_getcheck_func_COPY_ROD_2(void) {
     return -1;
 }
 
-void item_getcheck_func_BOMB_BAG_LV2(void){
+void item_getcheck_func_BOMB_BAG_LV2(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_BAG_LV2);
 }
 
-void item_getcheck_func_BOMB_BAG_LV1(void){
+void item_getcheck_func_BOMB_BAG_LV1(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_BAG_LV1);
 }
 
-void item_getcheck_func_BOMB_IN_BAG(void){
+void item_getcheck_func_BOMB_IN_BAG(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_IN_BAG);
 }
 
-void item_getcheck_func_LIGHT_ARROW(void){
+void item_getcheck_func_LIGHT_ARROW(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(LIGHT_ARROW);
 }
 
-int item_getcheck_func_ARROW_LV1(void){
-    return (g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_4,false) == 0x43 && g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >= 30) ? 1 : 0;
+int item_getcheck_func_ARROW_LV1(void) {
+    return (g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
+                SLOT_4, false) == 0x43 &&
+            g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >=
+                30) ?
+               1 :
+               0;
 }
 
 int item_getcheck_func_ARROW_LV2(void) {
-    return (g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_4,false) == 0x43 && g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >= 60) ? 1 : 0;
+    return (g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
+                SLOT_4, false) == 0x43 &&
+            g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >=
+                60) ?
+               1 :
+               0;
 }
 
 int item_getcheck_func_ARROW_LV3(void) {
-    return (g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_4,false) == 0x43 && g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >= 100) ? 1 : 0;
+    return (g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
+                SLOT_4, false) == 0x43 &&
+            g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >=
+                100) ?
+               1 :
+               0;
 }
 
-int item_getcheck_func_LURE_ROD(void){
+int item_getcheck_func_LURE_ROD(void) {
     return -1;
 }
 
-int item_getcheck_func_BOMB_ARROW(void){
+int item_getcheck_func_BOMB_ARROW(void) {
     return -1;
 }
 
-int item_getcheck_func_HAWK_ARROW(void){
+int item_getcheck_func_HAWK_ARROW(void) {
     return -1;
 }
 
-void item_getcheck_func_BEE_ROD(void){
+void item_getcheck_func_BEE_ROD(void) {
     item_getcheck_func_FISHING_ROD_1();
 }
 
-void item_getcheck_func_JEWEL_ROD(void){
+void item_getcheck_func_JEWEL_ROD(void) {
     item_getcheck_func_FISHING_ROD_1();
 }
 
-void item_getcheck_func_WORM_ROD(void){
+void item_getcheck_func_WORM_ROD(void) {
     item_getcheck_func_FISHING_ROD_1();
 }
 
-void item_getcheck_func_JEWEL_BEE_ROD(void){
+void item_getcheck_func_JEWEL_BEE_ROD(void) {
     item_getcheck_func_FISHING_ROD_1();
 }
 
-void item_getcheck_func_JEWEL_WORM_ROD(void){
+void item_getcheck_func_JEWEL_WORM_ROD(void) {
     item_getcheck_func_FISHING_ROD_1();
 }
 
-int item_getcheck_func_EMPTY_BOTTLE(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(EMPTY_BOTTLE);
+int item_getcheck_func_EMPTY_BOTTLE(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(EMPTY_BOTTLE);
     return bottle_check;
 }
 
-int item_getcheck_func_RED_BOTTLE(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(RED_BOTTLE);
+int item_getcheck_func_RED_BOTTLE(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(RED_BOTTLE);
     return bottle_check;
 }
 
-int item_getcheck_func_GREEN_BOTTLE(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(GREEN_BOTTLE);
+int item_getcheck_func_GREEN_BOTTLE(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(GREEN_BOTTLE);
     return bottle_check;
 }
 
-int item_getcheck_func_BLUE_BOTTLE(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(BLUE_BOTTLE);
+int item_getcheck_func_BLUE_BOTTLE(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(BLUE_BOTTLE);
     return bottle_check;
 }
 
-int item_getcheck_func_MILK_BOTTLE(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(MILK_BOTTLE);
+int item_getcheck_func_MILK_BOTTLE(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(MILK_BOTTLE);
     return bottle_check;
 }
 
-int item_getcheck_func_HALF_MILK_BOTTLE(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(HALF_MILK_BOTTLE);
+int item_getcheck_func_HALF_MILK_BOTTLE(void) {
+    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
+        HALF_MILK_BOTTLE);
     return bottle_check;
 }
 
-int item_getcheck_func_OIL_BOTTLE(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL_BOTTLE);
+int item_getcheck_func_OIL_BOTTLE(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL_BOTTLE);
     return bottle_check;
 }
 
-int item_getcheck_func_WATER_BOTTLE(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(WATER_BOTTLE);
+int item_getcheck_func_WATER_BOTTLE(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(WATER_BOTTLE);
     return bottle_check;
 }
 
-int item_getcheck_func_OIL_BOTTLE2(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL_BOTTLE_2);
+int item_getcheck_func_OIL_BOTTLE2(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL_BOTTLE_2);
     return bottle_check;
 }
 
-int item_getcheck_func_RED_BOTTLE2(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(RED_BOTTLE_2);
+int item_getcheck_func_RED_BOTTLE2(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(RED_BOTTLE_2);
     return bottle_check;
 }
 
-int item_getcheck_func_UGLY_SOUP(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(UGLY_SOUP);
+int item_getcheck_func_UGLY_SOUP(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(UGLY_SOUP);
     return bottle_check;
 }
 
-int item_getcheck_func_HOT_SPRING(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(HOT_SPRING);
+int item_getcheck_func_HOT_SPRING(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(HOT_SPRING);
     return bottle_check;
 }
 
-int item_getcheck_func_FAIRY_BOTTLE(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(FAIRY);
+int item_getcheck_func_FAIRY_BOTTLE(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(FAIRY);
     return bottle_check;
 }
 
-int item_getcheck_func_HOT_SPRING2(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(HOT_SPRING);
+int item_getcheck_func_HOT_SPRING2(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(HOT_SPRING);
     return bottle_check;
 }
 
-int item_getcheck_func_OIL2(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL2);
+int item_getcheck_func_OIL2(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL2);
     return bottle_check;
 }
 
-int item_getcheck_func_OIL(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL);
+int item_getcheck_func_OIL(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL);
     return bottle_check;
 }
 
-void item_getcheck_func_NORMAL_BOMB(void){
+void item_getcheck_func_NORMAL_BOMB(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(NORMAL_BOMB);
 }
 
-void item_getcheck_func_WATER_BOMB(void){
+void item_getcheck_func_WATER_BOMB(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(WATER_BOMB);
 }
 
-void item_getcheck_func_POKE_BOMB(void){
+void item_getcheck_func_POKE_BOMB(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(POKE_BOMB);
 }
 
-int item_getcheck_func_FAIRY_DROP(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(FAIRY_DROP);
+int item_getcheck_func_FAIRY_DROP(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(FAIRY_DROP);
     return bottle_check;
 }
 
-int item_getcheck_func_WORM(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(WORM);
+int item_getcheck_func_WORM(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(WORM);
     return bottle_check;
 }
 
-void item_getcheck_func_DROP_BOTTLE(void){
+void item_getcheck_func_DROP_BOTTLE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(DROP_BOTTLE);
 }
 
@@ -1300,428 +1415,471 @@ int item_getcheck_func_BEE_CHILD(void) {
     return -1;
 }
 
-int item_getcheck_func_CHUCHU_RARE(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_RARE);
+int item_getcheck_func_CHUCHU_RARE(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_RARE);
     return bottle_check;
 }
 
-int item_getcheck_func_CHUCHU_RED(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_RED);
+int item_getcheck_func_CHUCHU_RED(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_RED);
     return bottle_check;
 }
 
-int item_getcheck_func_CHUCHU_BLUE(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_BLUE);
+int item_getcheck_func_CHUCHU_BLUE(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_BLUE);
     return bottle_check;
 }
 
-int item_getcheck_func_CHUCHU_GREEN(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_GREEN);
+int item_getcheck_func_CHUCHU_GREEN(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_GREEN);
     return bottle_check;
 }
 
-int item_getcheck_func_CHUCHU_YELLOW(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_YELLOW);
+int item_getcheck_func_CHUCHU_YELLOW(void) {
+    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
+        CHUCHU_YELLOW);
     return bottle_check;
 }
 
-int item_getcheck_func_CHUCHU_PURPLE(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_PURPLE);
+int item_getcheck_func_CHUCHU_PURPLE(void) {
+    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
+        CHUCHU_PURPLE);
     return bottle_check;
 }
 
-void item_getcheck_func_LV1_SOUP(void){
+void item_getcheck_func_LV1_SOUP(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(LV1_SOUP);
 }
 
-void item_getcheck_func_LV2_SOUP(void){
+void item_getcheck_func_LV2_SOUP(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(LV2_SOUP);
 }
 
-void item_getcheck_func_LV3_SOUP(void){
+void item_getcheck_func_LV3_SOUP(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(LV3_SOUP);
 }
 
 int item_getcheck_func_LETTER(void) {
-    u32 check_item = __cntlzw(LETTER - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_21,true));
+    u32 check_item =
+        __cntlzw(LETTER - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
+                              SLOT_21, true));
     return check_item >> 5;
 }
 
 int item_getcheck_func_BILL(void) {
-    u32 check_item = __cntlzw(BILL - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_21,true));
+    u32 check_item =
+        __cntlzw(BILL - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
+                            SLOT_21, true));
     return check_item >> 5;
 }
 
 int item_getcheck_func_WOOD_STATUE(void) {
-    u32 check_item = __cntlzw(WOOD_STATUE - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_21,true));
+    u32 check_item = __cntlzw(
+        WOOD_STATUE -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_21, true));
     return check_item >> 5;
 }
 
 int item_getcheck_func_IRIAS_PENDANT(void) {
-    u32 check_item = __cntlzw(IRIAS_PENDANT - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_21,true));
+    u32 check_item = __cntlzw(
+        IRIAS_PENDANT -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_21, true));
     return check_item >> 5;
 }
 
 int item_getcheck_func_HORSE_FLUTE(void) {
-    u32 check_item = __cntlzw(HORSE_FLUTE - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_22,true));
+    u32 check_item = __cntlzw(
+        HORSE_FLUTE -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_22, true));
     return check_item >> 5;
 }
 
 int item_getcheck_func_RAFRELS_MEMO(void) {
-    u32 check_item = __cntlzw(RAFRELS_MEMO - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_19,true));
+    u32 check_item = __cntlzw(
+        RAFRELS_MEMO -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_19, true));
     return check_item >> 5;
 }
 
 int item_getcheck_func_ASHS_SCRIBBLING(void) {
-    u32 check_item = __cntlzw(ASHS_SCRIBBLING - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_19,true));
+    u32 check_item = __cntlzw(
+        ASHS_SCRIBBLING -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_19, true));
     return check_item >> 5;
 }
 
-int item_getcheck_func_CHUCHU_YELLOW2(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_YELLOW2);
+int item_getcheck_func_CHUCHU_YELLOW2(void) {
+    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
+        CHUCHU_YELLOW2);
     return bottle_check;
 }
 
-int item_getcheck_func_OIL_BOTTLE3(void){
+int item_getcheck_func_OIL_BOTTLE3(void) {
     return -1;
 }
 
-int item_getcheck_func_SHOP_BEE_CHILD(void){
+int item_getcheck_func_SHOP_BEE_CHILD(void) {
     return -1;
 }
 
-int item_getcheck_func_CHUCHU_BLACK(void){
-    u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_BLACK);
+int item_getcheck_func_CHUCHU_BLACK(void) {
+    u8 bottle_check =
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_BLACK);
     return bottle_check;
 }
 
-void item_getcheck_func_LIGHT_DROP(void){
+void item_getcheck_func_LIGHT_DROP(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(LIGHT_DROP);
 }
 
-void item_getcheck_func_DROP_CONTAINER(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getLightDrop().isLightDropGetFlag(FARON_VESSEL);
+void item_getcheck_func_DROP_CONTAINER(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getLightDrop().isLightDropGetFlag(
+        FARON_VESSEL);
 }
 
-void item_getcheck_func_DROP_CONTAINER02(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getLightDrop().isLightDropGetFlag(ELDIN_VESSEL);
+void item_getcheck_func_DROP_CONTAINER02(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getLightDrop().isLightDropGetFlag(
+        ELDIN_VESSEL);
 }
 
-void item_getcheck_func_DROP_CONTAINER03(void){
-    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getLightDrop().isLightDropGetFlag(LANAYRU_VESSEL);
+void item_getcheck_func_DROP_CONTAINER03(void) {
+    g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getLightDrop().isLightDropGetFlag(
+        LANAYRU_VESSEL);
 }
 
-int item_getcheck_func_FILLED_CONTAINER(void){
+int item_getcheck_func_FILLED_CONTAINER(void) {
     return -1;
 }
 
-int item_getcheck_func_MIRROR_PIECE_2(void){
+int item_getcheck_func_MIRROR_PIECE_2(void) {
     return -1;
 }
 
-int item_getcheck_func_MIRROR_PIECE_3(void){
+int item_getcheck_func_MIRROR_PIECE_3(void) {
     return -1;
 }
 
-int item_getcheck_func_MIRROR_PIECE_4(void){
+int item_getcheck_func_MIRROR_PIECE_4(void) {
     return -1;
 }
 
 int item_getcheck_func_SMELL_YELIA_POUCH(void) {
-    u32 check_item = __cntlzw(SMELL_YELIA_POUCH - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent());
+    u32 check_item =
+        __cntlzw(SMELL_YELIA_POUCH -
+                 g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent());
     return check_item >> 5;
 }
 
-int item_getcheck_func_SMELL_PUMPKIN(void){
+int item_getcheck_func_SMELL_PUMPKIN(void) {
     return -1;
 }
 
 int item_getcheck_func_SMELL_POH(void) {
-    u32 check_item = __cntlzw(SMELL_POH - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent());
+    u32 check_item =
+        __cntlzw(SMELL_POH -
+                 g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent());
     return check_item >> 5;
 }
 
 int item_getcheck_func_SMELL_FISH(void) {
-    u32 check_item = __cntlzw(SMELL_FISH - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent());
+    u32 check_item =
+        __cntlzw(SMELL_FISH -
+                 g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent());
     return check_item >> 5;
 }
 
 int item_getcheck_func_SMELL_CHILDREN(void) {
-    u32 check_item = __cntlzw(SMELL_CHILDREN - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent());
+    u32 check_item =
+        __cntlzw(SMELL_CHILDREN -
+                 g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent());
     return check_item >> 5;
 }
 
 int item_getcheck_func_SMELL_MEDICINE(void) {
-    u32 check_item = __cntlzw(SMELL_MEDICINE - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent());
+    u32 check_item =
+        __cntlzw(SMELL_MEDICINE -
+                 g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent());
     return check_item >> 5;
 }
 
-void item_getcheck_func_M_BEETLE(void){
+void item_getcheck_func_M_BEETLE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_BEETLE);
 }
 
-void item_getcheck_func_F_BEETLE(void){
+void item_getcheck_func_F_BEETLE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_BEETLE);
 }
 
-void item_getcheck_func_M_BUTTERFLY(void){
+void item_getcheck_func_M_BUTTERFLY(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_BUTTERFLY);
 }
 
-void item_getcheck_func_F_BUTTERFLY(void){
+void item_getcheck_func_F_BUTTERFLY(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_BUTTERFLY);
 }
 
-void item_getcheck_func_M_STAG_BEETLE(void){
+void item_getcheck_func_M_STAG_BEETLE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_STAG_BEETLE);
 }
 
-void item_getcheck_func_F_STAG_BEETLE(void){
+void item_getcheck_func_F_STAG_BEETLE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_STAG_BEETLE);
 }
 
-void item_getcheck_func_M_GRASSHOPPER(void){
+void item_getcheck_func_M_GRASSHOPPER(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_GRASSHOPPER);
 }
 
-void item_getcheck_func_F_GRASSHOPPER(void){
+void item_getcheck_func_F_GRASSHOPPER(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_GRASSHOPPER);
 }
 
-void item_getcheck_func_M_NANAFUSHI(void){
+void item_getcheck_func_M_NANAFUSHI(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_NANAFUSHI);
 }
 
-void item_getcheck_func_F_NANAFUSHI(void){
+void item_getcheck_func_F_NANAFUSHI(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_NANAFUSHI);
 }
 
-void item_getcheck_func_M_DANGOMUSHI(void){
+void item_getcheck_func_M_DANGOMUSHI(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_DANGOMUSHI);
 }
 
-void item_getcheck_func_F_DANGOMUSHI(void){
+void item_getcheck_func_F_DANGOMUSHI(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_DANGOMUSHI);
 }
 
-void item_getcheck_func_M_MANTIS(void){
+void item_getcheck_func_M_MANTIS(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_MANTIS);
 }
 
-void item_getcheck_func_F_MANTIS(void){
+void item_getcheck_func_F_MANTIS(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_MANTIS);
 }
 
-void item_getcheck_func_M_LADYBUG(void){
+void item_getcheck_func_M_LADYBUG(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_LADYBUG);
 }
 
-void item_getcheck_func_F_LADYBUG(void){
+void item_getcheck_func_F_LADYBUG(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_LADYBUG);
 }
 
-void item_getcheck_func_M_SNAIL(void){
+void item_getcheck_func_M_SNAIL(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_SNAIL);
 }
 
-void item_getcheck_func_F_SNAIL(void){
+void item_getcheck_func_F_SNAIL(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_SNAIL);
 }
 
-void item_getcheck_func_M_DRAGONFLY(void){
+void item_getcheck_func_M_DRAGONFLY(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_DRAGONFLY);
 }
 
-void item_getcheck_func_F_DRAGONFLY(void){
+void item_getcheck_func_F_DRAGONFLY(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_DRAGONFLY);
 }
 
-void item_getcheck_func_M_ANT(void){
+void item_getcheck_func_M_ANT(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_ANT);
 }
 
-void item_getcheck_func_F_ANT(void){
+void item_getcheck_func_F_ANT(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_ANT);
 }
 
-void item_getcheck_func_M_MAYFLY(void){
+void item_getcheck_func_M_MAYFLY(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_MAYFLY);
 }
 
-void item_getcheck_func_F_MAYFLY(void){
+void item_getcheck_func_F_MAYFLY(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_MAYFLY);
 }
 
-int item_getcheck_func_POU_SPIRIT(void){
+int item_getcheck_func_POU_SPIRIT(void) {
     return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().getPoeCount();
 }
 
 int item_getcheck_func_ANCIENT_DOCUMENT(void) {
-    u32 check_item = __cntlzw(ANCIENT_DOCUMENT - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_22,true));
+    u32 check_item = __cntlzw(
+        ANCIENT_DOCUMENT -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_22, true));
     return check_item >> 5;
 }
 
 int item_getcheck_func_AIR_LETTER(void) {
-    u32 check_item = __cntlzw(AIR_LETTER - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_22,true));
+    u32 check_item = __cntlzw(
+        AIR_LETTER -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_22, true));
     return check_item >> 5;
 }
 
 int item_getcheck_func_ANCIENT_DOCUMENT2(void) {
-    u32 check_item = __cntlzw(ANCIENT_DOCUMENT2 - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_22,true));
+    u32 check_item = __cntlzw(
+        ANCIENT_DOCUMENT2 -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_22, true));
     return check_item >> 5;
 }
 
 int item_getcheck_func_LV7_DUNGEON_EXIT(void) {
-    u32 check_item = __cntlzw(LV7_DUNGEON_EXIT - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18,true));
+    u32 check_item = __cntlzw(
+        LV7_DUNGEON_EXIT -
+        g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18, true));
     return check_item >> 5;
 }
 
-int item_getcheck_func_LINKS_SAVINGS(void){
+int item_getcheck_func_LINKS_SAVINGS(void) {
     return -1;
 }
 
-int item_getcheck_func_SMALL_KEY2(void){
+int item_getcheck_func_SMALL_KEY2(void) {
     return -1;
 }
 
-int item_getcheck_func_POU_FIRE1(void){
+int item_getcheck_func_POU_FIRE1(void) {
     return -1;
 }
 
-int item_getcheck_func_POU_FIRE2(void){
+int item_getcheck_func_POU_FIRE2(void) {
     return -1;
 }
 
-int item_getcheck_func_POU_FIRE3(void){
+int item_getcheck_func_POU_FIRE3(void) {
     return -1;
 }
 
-int item_getcheck_func_POU_FIRE4(void){
+int item_getcheck_func_POU_FIRE4(void) {
     return -1;
 }
 
-int item_getcheck_func_BOSSRIDER_KEY(void){
+int item_getcheck_func_BOSSRIDER_KEY(void) {
     return -1;
 }
 
-void item_getcheck_func_TOMATO_PUREE(void){
+void item_getcheck_func_TOMATO_PUREE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(TOMATO_PUREE);
 }
 
-void item_getcheck_func_TASTE(void){
+void item_getcheck_func_TASTE(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(TASTE);
 }
 
-void item_getcheck_func_LV5_BOSS_KEY(void){
+void item_getcheck_func_LV5_BOSS_KEY(void) {
     g_dComIfG_gameInfo.info.getMemory().getTempFlags().isDungeonItem(BOSS_KEY_FLAG);
 }
 
-int item_getcheck_func_SURFBOARD(void){
+int item_getcheck_func_SURFBOARD(void) {
     return -1;
 }
 
-int item_getcheck_func_KANTERA2(void){
+int item_getcheck_func_KANTERA2(void) {
     return -1;
 }
 
-void item_getcheck_func_L2_KEY_PIECES1(void){
+void item_getcheck_func_L2_KEY_PIECES1(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(L2_KEY_PIECES1);
 }
 
-void item_getcheck_func_L2_KEY_PIECES2(void){
+void item_getcheck_func_L2_KEY_PIECES2(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(L2_KEY_PIECES2);
 }
 
-void item_getcheck_func_L2_KEY_PIECES3(void){
+void item_getcheck_func_L2_KEY_PIECES3(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(L2_KEY_PIECES3);
 }
 
-void item_getcheck_func_KEY_OF_CARAVAN(void){
+void item_getcheck_func_KEY_OF_CARAVAN(void) {
     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(KEY_OF_CARAVAN);
 }
 
-void item_getcheck_func_LV2_BOSS_KEY(void){
+void item_getcheck_func_LV2_BOSS_KEY(void) {
     g_dComIfG_gameInfo.info.getMemory().getTempFlags().isDungeonItem(BOSS_KEY_FLAG);
 }
 
-int item_getcheck_func_KEY_OF_FILONE(void){
+int item_getcheck_func_KEY_OF_FILONE(void) {
     return g_dComIfG_gameInfo.info.getMemory().getTempFlags().getSmallKeys();
 }
 
 #ifdef NONMATCHING
-int isBomb(u32 param1){
+int isBomb(u32 param1) {
     u32 uvar1;
     u32 uvar2;
     int ret;
 
     ret = 0;
-    if((u8)(param1 - 10) > 3){
+    if ((u8)(param1 - 10) > 3) {
         uvar1 = __cntlzw(0x70 - (u8)param1);
         uvar2 = __cntlzw(0x71 - (u8)param1);
-        
-        if((uvar1 | uvar2) == 0 && param1 == 0x72){
+
+        if ((uvar1 | uvar2) == 0 && param1 == 0x72) {
             ret = 1;
         }
     }
     return ret;
 }
 #else
-asm bool isBomb(u8 param1){
+asm bool isBomb(u8 param1) {
     nofralloc
-    #include "d/d_item/d_item/asm/func_8009B688.s"
+#include "d/d_item/d_item/asm/func_8009B688.s"
 }
 #endif
 
-bool isArrow(u8 param1){
+bool isArrow(u8 param1) {
     bool is_arrow;
 
     is_arrow = false;
-    if(param1 == ARROW_1 || (u8)(param1 - ARROW_10) <= 1 || param1 == ARROW_30){
+    if (param1 == ARROW_1 || (u8)(param1 - ARROW_10) <= 1 || param1 == ARROW_30) {
         is_arrow = true;
     }
 
     return is_arrow;
 }
 
-asm bool isBottleItem(u8 param1){
+asm bool isBottleItem(u8 param1) {
     nofralloc
-    #include "d/d_item/d_item/asm/func_8009B708.s"
+#include "d/d_item/d_item/asm/func_8009B708.s"
 }
 
 bool isHeart(u8 param1) {
     bool is_heart;
 
     is_heart = false;
-    if(param1 == HEART || param1 == TRIPLE_HEART){
+    if (param1 == HEART || param1 == TRIPLE_HEART) {
         is_heart = true;
     }
     return is_heart;
 }
 
-//close
+// close
 #ifdef NONMATCHING
 bool isInsect(u8 param1) {
     bool is_insect;
 
     is_insect = false;
-    if(param1 < noentry53 && param1 < M_BEETLE){
+    if (param1 < noentry53 && param1 < M_BEETLE) {
         is_insect = true;
     }
     return is_insect;
 }
 #else
-asm bool isInsect(u8 param1){
+asm bool isInsect(u8 param1) {
     nofralloc
-    #include "d/d_item/d_item/asm/func_8009B79C.s"
+#include "d/d_item/d_item/asm/func_8009B79C.s"
 }
 #endif
 
-asm u32 check_itemno(int param1){
+asm u32 check_itemno(int param1) {
     nofralloc
-    #include "d/d_item/d_item/asm/func_8009B7C4.s"
+#include "d/d_item/d_item/asm/func_8009B7C4.s"
 }
 
-asm void addBombCount(u8 param1, u8 param2){
+asm void addBombCount(u8 param1, u8 param2) {
     nofralloc
-    #include "d/d_item/d_item/asm/func_8009B940.s"
+#include "d/d_item/d_item/asm/func_8009B940.s"
 }
\ No newline at end of file
diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp
index daf172182e..79db598944 100644
--- a/src/d/d_save/d_save.cpp
+++ b/src/d/d_save/d_save.cpp
@@ -5,14 +5,14 @@
 
 u8 dSv_item_rename(u8 item_id) {
     switch (item_id) {
-        case OIL_BOTTLE_2:
-            return OIL_BOTTLE;
-        case RED_BOTTLE_2:
-            return RED_BOTTLE;
-        case OIL2:
-            return OIL;
-        default:
-            return item_id;
+    case OIL_BOTTLE_2:
+        return OIL_BOTTLE;
+    case RED_BOTTLE_2:
+        return RED_BOTTLE;
+    case OIL2:
+        return OIL;
+    default:
+        return item_id;
     }
 }
 
@@ -80,12 +80,12 @@ u8 dSv_player_status_a_c::getMixItemIndex(signed int i_no) const {
 u16 dSv_player_status_a_c::getRupeeMax(void) const {
     if (mCurrentWallet < 3) {  // if you make this a default, it wont match. Compiler, pls.
         switch (mCurrentWallet) {
-            case WALLET:
-                return 300;
-            case BIG_WALLET:
-                return 600;
-            case GIANT_WALLET:
-                return 1000;
+        case WALLET:
+            return 300;
+        case BIG_WALLET:
+            return 600;
+        case GIANT_WALLET:
+            return 1000;
         }
     }
     return 0;
@@ -127,7 +127,7 @@ void dSv_player_status_b_c::onTransformLV(int flagOnOff) {
 BOOL dSv_player_status_b_c::isTransformLV(int unk) const {
     return this->mTransformLevelFlag & (u8)(1 << unk) ? TRUE : FALSE;
 }
-//extern u8 lbl_80379234[16];
+// extern u8 lbl_80379234[16];
 void dSv_horse_place_c::init(void) {
     f32 position_val;
     char* default_stage;
@@ -142,7 +142,8 @@ void dSv_horse_place_c::init(void) {
     this->mRoomId = 0;
 }
 
-void dSv_horse_place_c::set(const char* i_name, const cXyz& i_position, s16 i_x_rot, signed char i_room_id) {
+void dSv_horse_place_c::set(const char* i_name, const cXyz& i_position, s16 i_x_rot,
+                            signed char i_room_id) {
     strcpy(mCurrentStage, i_name);
     this->mPosition.x = i_position.x;
     this->mPosition.y = i_position.y;
@@ -185,7 +186,9 @@ void dSv_player_field_last_stay_info_c::init() {
     }
 }
 
-void dSv_player_field_last_stay_info_c::set(const char* i_name, const cXyz& i_last_position, s16 i_last_angle, signed char i_last_spawn_id, u8 i_last_room_id) {
+void dSv_player_field_last_stay_info_c::set(const char* i_name, const cXyz& i_last_position,
+                                            s16 i_last_angle, signed char i_last_spawn_id,
+                                            u8 i_last_room_id) {
     strcpy(mLastStage, i_name);
 
     this->mLastPosition = i_last_position;
@@ -229,7 +232,9 @@ void dSv_player_last_mark_info_c::init(void) {
     }
 }
 
-void dSv_player_last_mark_info_c::setWarpItemData(const char* i_ooccoo_stage, const cXyz& i_ooccoo_position, s16 i_ooccoo_angle, s8 i_ooccoo_room_id, u8 unk1, u8 unk2) {
+void dSv_player_last_mark_info_c::setWarpItemData(const char* i_ooccoo_stage,
+                                                  const cXyz& i_ooccoo_position, s16 i_ooccoo_angle,
+                                                  s8 i_ooccoo_room_id, u8 unk1, u8 unk2) {
     strcpy(mOoccooStage, i_ooccoo_stage);
     this->mOoccooPosition = i_ooccoo_position;
     this->mOoccooXRotation = i_ooccoo_angle;
@@ -252,7 +257,9 @@ void dSv_player_item_c::setItem(int current_items_index, u8 new_items_index) {
     int select_item_index = DEFAULT_SELECT_ITEM_INDEX;
 
     do {
-        if (current_items_index == g_dComIfG_gameInfo.info.getSaveFile().getPlayerStatusA().getSelectItemIndex(select_item_index)) {
+        if (current_items_index ==
+            g_dComIfG_gameInfo.info.getSaveFile().getPlayerStatusA().getSelectItemIndex(
+                select_item_index)) {
             dComIfGp_setSelectItem(select_item_index);
         }
         select_item_index++;
@@ -270,8 +277,10 @@ u8 dSv_player_item_c::getItem(int param_1, bool param_2) const {
             for (int select_item_index = 0; select_item_index < 2; select_item_index++) {
                 current_select_item_index = getSelectItemIndex(select_item_index);
                 if (((param_1 == (current_select_item_index)) ||
-                     (current_select_item_index = dComIfGs_getMixItemIndex(select_item_index), param_1 == (current_select_item_index))) &&
-                    (current_select_item_index = dComIfGs_getMixItemIndex(select_item_index), (current_select_item_index) != NO_ITEM)) {
+                     (current_select_item_index = dComIfGs_getMixItemIndex(select_item_index),
+                      param_1 == (current_select_item_index))) &&
+                    (current_select_item_index = dComIfGs_getMixItemIndex(select_item_index),
+                     (current_select_item_index) != NO_ITEM)) {
                     current_select_item_index = getSelectItemIndex(select_item_index);
                     IVar1 = items[current_select_item_index];
                     current_select_item_index = dComIfGs_getMixItemIndex(select_item_index);
@@ -307,7 +316,8 @@ u8 dSv_player_item_c::getItem(int param_1, bool param_2) const {
                     if (((select_item_index == 0x3) &&
                          (current_select_item_index = getSelectItemIndex(0x3),
                           (current_select_item_index & 0xff) == 0x0)) &&
-                        (current_select_item_index = dComIfGs_getMixItemIndex(0x3), (current_select_item_index & 0xff) == 0x0)) {
+                        (current_select_item_index = dComIfGs_getMixItemIndex(0x3),
+                         (current_select_item_index & 0xff) == 0x0)) {
                         dComIfGs_setSelectItemIndex(0x3, -0x1);
                         dComIfGs_setMixItemIndex(0x3, -0x1);
                         return 0xff;
@@ -438,8 +448,7 @@ u8 dSv_player_item_c::checkBottle(u8 i_item_id) {
     return num_bottles;
 }
 
-asm u8 dSv_player_item_c::checkInsectBottle(void){
-    nofralloc
+asm u8 dSv_player_item_c::checkInsectBottle(void){nofralloc
 #include "d/d_save/d_save/asm/func_80033754.s"
 }
 
@@ -496,8 +505,7 @@ asm void dSv_player_item_c::setEmptyBombBag(void) {
 }
 #endif
 
-asm void dSv_player_item_c::setEmptyBombBag(u8, u8){
-    nofralloc
+asm void dSv_player_item_c::setEmptyBombBag(u8, u8){nofralloc
 #include "d/d_save/d_save/asm/func_80033B08.s"
 }
 
@@ -522,18 +530,18 @@ void dSv_player_item_c::setRodTypeLevelUp(void) {
     int current_fishing_rod_item_id = this->mItems[SLOT_20];
 
     switch (current_fishing_rod_item_id) {
-        case BEE_ROD: {
-            this->mItems[SLOT_20] = JEWEL_BEE_ROD;
-            break;
-        }
-        case WORM_ROD: {
-            this->mItems[SLOT_20] = JEWEL_WORM_ROD;
-            break;
-        }
-        case FISHING_ROD_1: {
-            this->mItems[SLOT_20] = JEWEL_ROD;
-            break;
-        }
+    case BEE_ROD: {
+        this->mItems[SLOT_20] = JEWEL_BEE_ROD;
+        break;
+    }
+    case WORM_ROD: {
+        this->mItems[SLOT_20] = JEWEL_WORM_ROD;
+        break;
+    }
+    case FISHING_ROD_1: {
+        this->mItems[SLOT_20] = JEWEL_ROD;
+        break;
+    }
     }
 
     for (int i = 0; i < 4; i++) {
@@ -545,18 +553,18 @@ void dSv_player_item_c::setRodTypeLevelUp(void) {
 #ifdef NONMATCHING
 void dSv_player_item_c::setBaitItem(u8 param_1) {
     switch (param_1) {
-        case BEE_CHILD: {
-            isFirstBit(61) ? this->mItems[SLOT_20] = JEWEL_BEE_ROD : this->mItems[SLOT_20] = BEE_ROD;
-            break;
-        }
-        case WORM: {
-            isFirstBit(61) ? this->mItems[SLOT_20] = JEWEL_WORM_ROD : this->mItems[SLOT_20] = WORM_ROD;
-            break;
-        }
-        case NO_ITEM: {
-            isFirstBit(61) ? this->mItems[SLOT_20] = JEWEL_ROD : this->mItems[SLOT_20] = FISHING_ROD_1;
-            break;
-        }
+    case BEE_CHILD: {
+        isFirstBit(61) ? this->mItems[SLOT_20] = JEWEL_BEE_ROD : this->mItems[SLOT_20] = BEE_ROD;
+        break;
+    }
+    case WORM: {
+        isFirstBit(61) ? this->mItems[SLOT_20] = JEWEL_WORM_ROD : this->mItems[SLOT_20] = WORM_ROD;
+        break;
+    }
+    case NO_ITEM: {
+        isFirstBit(61) ? this->mItems[SLOT_20] = JEWEL_ROD : this->mItems[SLOT_20] = FISHING_ROD_1;
+        break;
+    }
     }
 
     for (int i = 0; i < 4; i++) {
@@ -660,15 +668,15 @@ void dSv_player_item_max_c::init(void) {
 
 void dSv_player_item_max_c::setBombNum(u8 bomb_id, u8 bomb_max) {
     switch (bomb_id) {
-        case NORMAL_BOMB:
-            this->mItemCapacities[1] = bomb_max;
-            return;
-        case WATER_BOMB:
-            this->mItemCapacities[2] = bomb_max;
-            return;
-        case POKE_BOMB:
-            this->mItemCapacities[6] = bomb_max;
-            return;
+    case NORMAL_BOMB:
+        this->mItemCapacities[1] = bomb_max;
+        return;
+    case WATER_BOMB:
+        this->mItemCapacities[2] = bomb_max;
+        return;
+    case POKE_BOMB:
+        this->mItemCapacities[6] = bomb_max;
+        return;
     }
 }
 
@@ -681,14 +689,14 @@ u8 dSv_player_item_max_c::getBombNum(u8 param_1) const {
     }
 
     switch (param_1) {
-        case NORMAL_BOMB:
-            return (u8)(this->mItemCapacities[0x1] * iVar3);
-        case WATER_BOMB:
-            return (u8)(this->mItemCapacities[0x2] * iVar3);
-        case POKE_BOMB:
-            return (u8)(this->mItemCapacities[0x6] * iVar3);
-        default:
-            return 0;
+    case NORMAL_BOMB:
+        return (u8)(this->mItemCapacities[0x1] * iVar3);
+    case WATER_BOMB:
+        return (u8)(this->mItemCapacities[0x2] * iVar3);
+    case POKE_BOMB:
+        return (u8)(this->mItemCapacities[0x6] * iVar3);
+    default:
+        return 0;
     }
 }
 
@@ -817,10 +825,10 @@ void dSv_fishing_info_c::addFishCount(u8 fish_index) {
 // a few instructions off
 #ifdef NONMATCHING
 namespace d_meter2_info {
-    class dMeter2Info_c {
-       public:
-        void getString(unsigned long, char*, JMSMesgEntry_c*);
-    };
+class dMeter2Info_c {
+public:
+    void getString(unsigned long, char*, JMSMesgEntry_c*);
+};
 }  // namespace d_meter2_info
 
 void dSv_player_info_c::init(void) {
diff --git a/src/d/d_save/d_save_HIO.cpp b/src/d/d_save/d_save_HIO.cpp
index f5c7f1e294..f63ad1b454 100644
--- a/src/d/d_save/d_save_HIO.cpp
+++ b/src/d/d_save/d_save_HIO.cpp
@@ -4,21 +4,18 @@
 
 #ifdef NONMATCHING
 dSvBit_childSwPerfectionHIO_c::dSvBit_childSwPerfectionHIO_c() {
-
-    this->__vt = (dSvBit_childSwPerfectionHIO_c_vtable *)0x803C3384;
+    this->__vt = (dSvBit_childSwPerfectionHIO_c_vtable*)0x803C3384;
     for (int i = 0; i < 0x80; i++) {
-
     }
 }
 #else
 asm dSvBit_childSwPerfectionHIO_c::dSvBit_childSwPerfectionHIO_c() {
     nofralloc
-    #include "d/d_save/d_save_HIO/asm/func_8025BB78.s"
+#include "d/d_save/d_save_HIO/asm/func_8025BB78.s"
 }
 #endif
 
-
 asm void dSvBit_childSwPerfectionHIO_c::init(void) {
     nofralloc
-    #include "d/d_save/d_save_HIO/asm/func_8025BBAC.s"
+#include "d/d_save/d_save_HIO/asm/func_8025BBAC.s"
 }
\ No newline at end of file
diff --git a/src/f/f_op/f_op_actor_tag.cpp b/src/f/f_op/f_op_actor_tag.cpp
index 67c8426ed4..b01cb943e6 100644
--- a/src/f/f_op/f_op_actor_tag.cpp
+++ b/src/f/f_op/f_op_actor_tag.cpp
@@ -1,6 +1,6 @@
 #include "f/f_op/f_op_actor_tag.h"
-#include "global.h"
 #include "SComponent/c_tag.h"
+#include "global.h"
 
 // f_op_actor_tag::g_fopAcTg_Queue
 extern node_list_class lbl_803A35E0;
@@ -19,5 +19,4 @@ u32 fopAcTg_Init(create_tag_class* pTag, void* data) {
     cTg_Create(pTag, data);
     return 1;
 }
-
 }
\ No newline at end of file
diff --git a/src/f/f_pc/f_pc_create_req.cpp b/src/f/f_pc/f_pc_create_req.cpp
index 93052366dc..01f57a9f48 100644
--- a/src/f/f_pc/f_pc_create_req.cpp
+++ b/src/f/f_pc/f_pc_create_req.cpp
@@ -4,43 +4,38 @@
 #include "SComponent/c_phase.h"
 #include "f/f_pc/f_pc_base.h"
 #include "f/f_pc/f_pc_create_iter.h"
+#include "f/f_pc/f_pc_deletor.h"
+#include "f/f_pc/f_pc_executor.h"
 #include "f/f_pc/f_pc_layer.h"
 #include "f/f_pc/f_pc_method.h"
-#include "f/f_pc/f_pc_executor.h"
-#include "f/f_pc/f_pc_deletor.h"
 
 extern "C" {
 
-bool fpcCtRq_isCreatingByID(create_tag *pTag, int *pId)
-{
-    create_request *pReq = (create_request *) (pTag->mpTagData);
+bool fpcCtRq_isCreatingByID(create_tag* pTag, int* pId) {
+    create_request* pReq = (create_request*)(pTag->mpTagData);
     return pReq->mBsPcId == *pId;
 }
 
-bool fpcCtRq_IsCreatingByID(unsigned int id)
-{
-    return fpcCtIt_Judge((cNdIt_JudgeFunc) fpcCtRq_isCreatingByID, &id) != NULL;
+bool fpcCtRq_IsCreatingByID(unsigned int id) {
+    return fpcCtIt_Judge((cNdIt_JudgeFunc)fpcCtRq_isCreatingByID, &id) != NULL;
 }
 
-void fpcCtRq_CreateQTo(create_request *pReq)
-{
+void fpcCtRq_CreateQTo(create_request* pReq) {
     fpcCtTg_CreateQTo(pReq);
     fpcLy_CreatedMesg(pReq->mpLayer);
     fpcLy_CancelQTo(&pReq->mMtdTg);
 }
 
-void fpcCtRq_ToCreateQ(create_request *pReq)
-{
+void fpcCtRq_ToCreateQ(create_request* pReq) {
     fpcLy_CreatingMesg(pReq->mpLayer);
     fpcLy_ToCancelQ(pReq->mpLayer, &pReq->mMtdTg);
     fpcCtTg_ToCreateQ(pReq);
 }
 
-extern void cMl_NS_free(void *pPtr);
+extern void cMl_NS_free(void* pPtr);
 
 #if NON_MATCHING
-bool fpcCtRq_Delete(create_request *pReq)
-{
+bool fpcCtRq_Delete(create_request* pReq) {
     fpcCtRq_CreateQTo(pReq);
     if (pReq->mpCtRqMtd != NULL) {
         // flow control
@@ -56,49 +51,64 @@ bool fpcCtRq_Delete(create_request *pReq)
     return 0;
 }
 #else
-asm bool fpcCtRq_Delete(create_request *pReq)
-{
+asm bool fpcCtRq_Delete(create_request* pReq) {
     nofralloc
-/* 80020BA0 0001DAE0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80020BA4 0001DAE4  7C 08 02 A6 */	mflr r0
-/* 80020BA8 0001DAE8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80020BAC 0001DAEC  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80020BB0 0001DAF0  7C 7F 1B 78 */	mr r31, r3
-/* 80020BB4 0001DAF4  4B FF FF 6D */	bl fpcCtRq_CreateQTo
-/* 80020BB8 0001DAF8  80 7F 00 34 */	lwz r3, 0x34(r31)
-/* 80020BBC 0001DAFC  28 03 00 00 */	cmplwi r3, 0
-/* 80020BC0 0001DB00  41 82 00 20 */	beq lbl_80020BE0
-/* 80020BC4 0001DB04  80 63 00 08 */	lwz r3, 8(r3)
-/* 80020BC8 0001DB08  7F E4 FB 78 */	mr r4, r31
-/* 80020BCC 0001DB0C  48 00 18 5D */	bl fpcMtd_Method
-/* 80020BD0 0001DB10  2C 03 00 00 */	cmpwi r3, 0
-/* 80020BD4 0001DB14  40 82 00 0C */	bne lbl_80020BE0
-/* 80020BD8 0001DB18  38 60 00 00 */	li r3, 0
-/* 80020BDC 0001DB1C  48 00 00 24 */	b lbl_80020C00
-lbl_80020BE0:
-/* 80020BE0 0001DB20  80 7F 00 40 */	lwz r3, 0x40(r31)
-/* 80020BE4 0001DB24  28 03 00 00 */	cmplwi r3, 0
-/* 80020BE8 0001DB28  41 82 00 0C */	beq lbl_80020BF4
-/* 80020BEC 0001DB2C  38 00 00 00 */	li r0, 0
-/* 80020BF0 0001DB30  90 03 00 14 */	stw r0, 0x14(r3)
-lbl_80020BF4:
-/* 80020BF4 0001DB34  7F E3 FB 78 */	mr r3, r31
-/* 80020BF8 0001DB38  48 24 26 69 */	bl cMl_NS_free
-/* 80020BFC 0001DB3C  38 60 00 01 */	li r3, 1
-lbl_80020C00:
-/* 80020C00 0001DB40  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80020C04 0001DB44  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80020C08 0001DB48  7C 08 03 A6 */	mtlr r0
-/* 80020C0C 0001DB4C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80020C10 0001DB50  4E 80 00 20 */	blr 
+        /* 80020BA0 0001DAE0  94 21 FF F0 */ stwu r1,
+        -0x10(r1)
+        /* 80020BA4 0001DAE4  7C 08 02 A6 */ mflr r0
+            /* 80020BA8 0001DAE8  90 01 00 14 */ stw r0,
+        0x14(r1)
+        /* 80020BAC 0001DAEC  93 E1 00 0C */ stw r31,
+        0xc(r1)
+        /* 80020BB0 0001DAF0  7C 7F 1B 78 */ mr r31,
+        r3
+            /* 80020BB4 0001DAF4  4B FF FF 6D */ bl fpcCtRq_CreateQTo
+                /* 80020BB8 0001DAF8  80 7F 00 34 */ lwz r3,
+        0x34(r31)
+        /* 80020BBC 0001DAFC  28 03 00 00 */ cmplwi r3,
+        0
+        /* 80020BC0 0001DB00  41 82 00 20 */ beq lbl_80020BE0
+            /* 80020BC4 0001DB04  80 63 00 08 */ lwz r3,
+        8(r3)
+        /* 80020BC8 0001DB08  7F E4 FB 78 */ mr r4,
+        r31
+            /* 80020BCC 0001DB0C  48 00 18 5D */ bl fpcMtd_Method
+                /* 80020BD0 0001DB10  2C 03 00 00 */ cmpwi r3,
+        0
+        /* 80020BD4 0001DB14  40 82 00 0C */ bne lbl_80020BE0
+            /* 80020BD8 0001DB18  38 60 00 00 */ li r3,
+        0
+        /* 80020BDC 0001DB1C  48 00 00 24 */ b lbl_80020C00 lbl_80020BE0 :
+        /* 80020BE0 0001DB20  80 7F 00 40 */ lwz r3,
+        0x40(r31)
+        /* 80020BE4 0001DB24  28 03 00 00 */ cmplwi r3,
+        0
+        /* 80020BE8 0001DB28  41 82 00 0C */ beq lbl_80020BF4
+            /* 80020BEC 0001DB2C  38 00 00 00 */ li r0,
+        0
+        /* 80020BF0 0001DB30  90 03 00 14 */ stw r0,
+        0x14(r3)lbl_80020BF4 :
+        /* 80020BF4 0001DB34  7F E3 FB 78 */ mr r3,
+        r31
+            /* 80020BF8 0001DB38  48 24 26 69 */ bl cMl_NS_free
+                /* 80020BFC 0001DB3C  38 60 00 01 */ li r3,
+        1 lbl_80020C00 :
+        /* 80020C00 0001DB40  83 E1 00 0C */ lwz r31,
+        0xc(r1)
+        /* 80020C04 0001DB44  80 01 00 14 */ lwz r0,
+        0x14(r1)
+        /* 80020C08 0001DB48  7C 08 03 A6 */ mtlr r0
+            /* 80020C0C 0001DB4C  38 21 00 10 */ addi r1,
+        r1,
+        0x10
+        /* 80020C10 0001DB50  4E 80 00 20 */ blr
 }
 #endif
 
-bool fpcCtRq_Cancel(create_request *pReq)
-{
+bool fpcCtRq_Cancel(create_request* pReq) {
     if (pReq != NULL && !pReq->mbIsCancelling) {
         pReq->mbIsCancelling = true;
-        base_process_class *pProc = pReq->mpRes;
+        base_process_class* pProc = pReq->mpRes;
 
         if (pProc != NULL && !fpcDt_Delete(pProc))
             return false;
@@ -112,16 +122,14 @@ bool fpcCtRq_Cancel(create_request *pReq)
     }
 }
 
-int fpcCtRq_IsDoing(create_request *pReq)
-{
+int fpcCtRq_IsDoing(create_request* pReq) {
     if (pReq != NULL)
         return pReq->mbIsCreating;
     else
         return false;
 }
 
-static bool fpcCtRq_Do(create_request *pReq)
-{
+static bool fpcCtRq_Do(create_request* pReq) {
     int ret = cPhs_COMPLEATE_e;
 
     if (pReq->mpCtRqMtd != NULL) {
@@ -149,21 +157,20 @@ static bool fpcCtRq_Do(create_request *pReq)
     return 1;
 }
 
-void fpcCtRq_Handler(void)
-{
-    fpcCtIt_Method((cNdIt_MethodFunc) fpcCtRq_Do, NULL);
+void fpcCtRq_Handler(void) {
+    fpcCtIt_Method((cNdIt_MethodFunc)fpcCtRq_Do, NULL);
 }
 
-extern void * cMl_NS_memalignB(int, unsigned long);
+extern void* cMl_NS_memalignB(int, unsigned long);
 extern int fpcBs_MakeOfId(void);
 
-create_request * fpcCtRq_Create(layer_class *pLayer, unsigned long size, create_request_method_class *pMthd)
-{
-    create_request *pReq = (create_request *) cMl_NS_memalignB(-4, size);
+create_request* fpcCtRq_Create(layer_class* pLayer, unsigned long size,
+                               create_request_method_class* pMthd) {
+    create_request* pReq = (create_request*)cMl_NS_memalignB(-4, size);
 
     if (pReq != NULL) {
         fpcCtTg_Init(pReq, pReq);
-        fpcMtdTg_Init(&pReq->mMtdTg, (process_method_tag_func) fpcCtRq_Cancel, pReq);
+        fpcMtdTg_Init(&pReq->mMtdTg, (process_method_tag_func)fpcCtRq_Cancel, pReq);
         pReq->mpLayer = pLayer;
         pReq->mpCtRqMtd = pMthd;
         pReq->mBsPcId = fpcBs_MakeOfId();
@@ -174,5 +181,4 @@ create_request * fpcCtRq_Create(layer_class *pLayer, unsigned long size, create_
 
     return pReq;
 }
-
 };
diff --git a/src/f/f_pc/f_pc_create_tag.cpp b/src/f/f_pc/f_pc_create_tag.cpp
index 56ec159d0a..f8fe89be2d 100644
--- a/src/f/f_pc/f_pc_create_tag.cpp
+++ b/src/f/f_pc/f_pc_create_tag.cpp
@@ -1,26 +1,22 @@
 
-#include "global.h"
 #include "f/f_pc/f_pc_create_tag.h"
+#include "global.h"
 
 // g_fpcCtTg_Queue
 extern node_list_class lbl_803A3990;
 
 extern "C" {
 
-void fpcCtTg_ToCreateQ(create_tag_class *pTag)
-{
+void fpcCtTg_ToCreateQ(create_tag_class* pTag) {
     cTg_Addition(&lbl_803A3990, pTag);
 }
 
-void fpcCtTg_CreateQTo(create_tag_class *pTag)
-{
+void fpcCtTg_CreateQTo(create_tag_class* pTag) {
     cTg_SingleCut(pTag);
 }
 
-int fpcCtTg_Init(create_tag *pTag, void *pUserData)
-{
+int fpcCtTg_Init(create_tag* pTag, void* pUserData) {
     cTg_Create(pTag, pUserData);
     return 1;
 }
-
 };
diff --git a/src/f/f_pc/f_pc_creator.cpp b/src/f/f_pc/f_pc_creator.cpp
index 7b75f4cccc..8721faa620 100644
--- a/src/f/f_pc/f_pc_creator.cpp
+++ b/src/f/f_pc/f_pc_creator.cpp
@@ -5,24 +5,19 @@
 
 extern "C" {
 
-bool fpcCt_IsCreatingByID(unsigned int id)
-{
+bool fpcCt_IsCreatingByID(unsigned int id) {
     return fpcCtRq_IsCreatingByID(id);
 }
 
-int fpcCt_IsDoing(base_process_class *pProc)
-{
+int fpcCt_IsDoing(base_process_class* pProc) {
     return fpcCtRq_IsDoing(pProc->mpCtRq);
 }
 
-void fpcCt_Abort(base_process_class *pProc)
-{
+void fpcCt_Abort(base_process_class* pProc) {
     fpcCtRq_Cancel(pProc->mpCtRq);
 }
 
-void fpcCt_Handler(void)
-{
+void fpcCt_Handler(void) {
     fpcCtRq_Handler();
 }
-
 };
diff --git a/src/f/f_pc/f_pc_delete_tag.cpp b/src/f/f_pc/f_pc_delete_tag.cpp
index 954eade357..ca523ebec9 100644
--- a/src/f/f_pc/f_pc_delete_tag.cpp
+++ b/src/f/f_pc/f_pc_delete_tag.cpp
@@ -1,30 +1,26 @@
 
-#include "global.h"
 #include "f/f_pc/f_pc_delete_tag.h"
+#include "global.h"
 
 // g_fpcDtTg_Queue
 extern node_list_class lbl_803A39A0;
 
 extern "C" {
 
-bool fpcDtTg_IsEmpty(delete_tag_class *pTag)
-{
+bool fpcDtTg_IsEmpty(delete_tag_class* pTag) {
     return lbl_803A39A0.mSize == 0;
 }
 
-void fpcDtTg_ToDeleteQ(delete_tag_class *pTag)
-{
+void fpcDtTg_ToDeleteQ(delete_tag_class* pTag) {
     pTag->mTimer = 1;
     cTg_Addition(&lbl_803A39A0, pTag);
 }
 
-void fpcDtTg_DeleteQTo(delete_tag_class *pTag)
-{
+void fpcDtTg_DeleteQTo(delete_tag_class* pTag) {
     cTg_SingleCut(pTag);
 }
 
-int fpcDtTg_Do(delete_tag_class *pTag, delete_tag_func pFunc)
-{
+int fpcDtTg_Do(delete_tag_class* pTag, delete_tag_func pFunc) {
     if (pTag->mTimer <= 0) {
         fpcDtTg_DeleteQTo(pTag);
         int ret = pFunc(pTag->mpTagData);
@@ -40,10 +36,8 @@ int fpcDtTg_Do(delete_tag_class *pTag, delete_tag_func pFunc)
     }
 }
 
-int fpcDtTg_Init(delete_tag_class *pTag, void *pUserData)
-{
+int fpcDtTg_Init(delete_tag_class* pTag, void* pUserData) {
     cTg_Create(pTag, pUserData);
     return 1;
 }
-
 };
diff --git a/src/f/f_pc/f_pc_deletor.cpp b/src/f/f_pc/f_pc_deletor.cpp
index 90af7ed3ea..742d9b253a 100644
--- a/src/f/f_pc/f_pc_deletor.cpp
+++ b/src/f/f_pc/f_pc_deletor.cpp
@@ -1,12 +1,11 @@
 
-#include "f/f_pc/f_pc_creator.h"
 #include "f/f_pc/f_pc_deletor.h"
 #include "f/f_pc/f_pc_base.h"
+#include "f/f_pc/f_pc_creator.h"
 
 extern "C" {
 
-int fpcDt_Delete(base_process_class *pProc)
-{
+int fpcDt_Delete(base_process_class* pProc) {
     if (pProc != NULL) {
         if (fpcCt_IsDoing(pProc) == 1)
             return 0;
@@ -19,5 +18,4 @@ int fpcDt_Delete(base_process_class *pProc)
         return 1;
     }
 }
-
 };
diff --git a/src/f/f_pc/f_pc_draw_priority.cpp b/src/f/f_pc/f_pc_draw_priority.cpp
index b4e3dc73b5..da77275f43 100644
--- a/src/f/f_pc/f_pc_draw_priority.cpp
+++ b/src/f/f_pc/f_pc_draw_priority.cpp
@@ -1,22 +1,18 @@
 
-#include "global.h"
 #include "f/f_pc/f_pc_draw_priority.h"
+#include "global.h"
 
 extern "C" {
 
-int fpcDwPi_Get(draw_priority_class *pDwPi)
-{
+int fpcDwPi_Get(draw_priority_class* pDwPi) {
     return pDwPi->mPriority;
 }
 
-void fpcDwPi_Set(draw_priority_class *pDwPi, int p)
-{
+void fpcDwPi_Set(draw_priority_class* pDwPi, int p) {
     pDwPi->mPriority = p;
 }
 
-void fpcDwPi_Init(draw_priority_class *pDwPi, int p)
-{
+void fpcDwPi_Init(draw_priority_class* pDwPi, int p) {
     fpcDwPi_Set(pDwPi, p);
 }
-
 };
diff --git a/src/f/f_pc/f_pc_executor.cpp b/src/f/f_pc/f_pc_executor.cpp
index b78af1e42f..5c38b966c4 100644
--- a/src/f/f_pc/f_pc_executor.cpp
+++ b/src/f/f_pc/f_pc_executor.cpp
@@ -1,50 +1,46 @@
 
 #include "f/f_pc/f_pc_executor.h"
 #include "f/f_pc/f_pc_base.h"
-#include "f/f_pc/f_pc_line_iter.h"
-#include "f/f_pc/f_pc_layer_tag.h"
-#include "f/f_pc/f_pc_layer_iter.h"
 #include "f/f_pc/f_pc_layer.h"
+#include "f/f_pc/f_pc_layer_iter.h"
+#include "f/f_pc/f_pc_layer_tag.h"
+#include "f/f_pc/f_pc_line_iter.h"
 #include "f/f_pc/f_pc_node.h"
 #include "f/f_pc/f_pc_searcher.h"
 
 extern "C" {
 
-extern int fpcPause_IsEnable(base_process_class *pProc, int);
+extern int fpcPause_IsEnable(base_process_class* pProc, int);
 
 // g_fpcNd_type
 extern int lbl_80450D40;
 
-base_process_class * fpcEx_Search(void *pFunc, void *pUserData)
-{
-    return (base_process_class *) fpcLyIt_AllJudge((cNdIt_MethodFunc) pFunc, pUserData);
+base_process_class* fpcEx_Search(void* pFunc, void* pUserData) {
+    return (base_process_class*)fpcLyIt_AllJudge((cNdIt_MethodFunc)pFunc, pUserData);
 }
 
-base_process_class * fpcEx_SearchByID(u32 id)
-{
+base_process_class* fpcEx_SearchByID(u32 id) {
     if (id + 2 <= 1)
         return NULL;
 
-    return fpcEx_Search(fpcSch_JudgeByID, &id);;
+    return fpcEx_Search(fpcSch_JudgeByID, &id);
+    ;
 }
 
-bool fpcEx_IsExist(int id)
-{
+bool fpcEx_IsExist(int id) {
     return fpcEx_SearchByID(id) != NULL;
 }
 
-int fpcEx_Execute(base_process_class *pProc)
-{
+int fpcEx_Execute(base_process_class* pProc) {
     if (pProc->mInitState != 2 || fpcPause_IsEnable(pProc, 1) == 1)
         return 0;
     fpcBs_Execute(pProc);
     // TODO: missing return?
 }
 
-int fpcEx_ToLineQ(base_process_class *pProc)
-{
-    layer_class *pLayer = pProc->mLyTg.mpLayer;
-    base_process_class *pLayerPcNode = pLayer->mpPcNode;
+int fpcEx_ToLineQ(base_process_class* pProc) {
+    layer_class* pLayer = pProc->mLyTg.mpLayer;
+    base_process_class* pLayerPcNode = pLayer->mpPcNode;
 
     if (pLayer->mLayerID == 0 || cTg_IsUse(&pLayerPcNode->mLnTg) == true) {
         int ret = fpcLnTg_ToQueue(&pProc->mLnTg, pProc->mPi.mInfoCurr.mListID);
@@ -55,8 +51,8 @@ int fpcEx_ToLineQ(base_process_class *pProc)
 
         pProc->mInitState = 2;
         if (fpcBs_Is_JustOfType(lbl_80450D40, pProc->mSubType)) {
-            process_node_class *pNode = (process_node_class *) pProc;
-            fpcLyIt_OnlyHere(&pNode->mLayer, (cNdIt_MethodFunc) fpcEx_ToLineQ, pNode);
+            process_node_class* pNode = (process_node_class*)pProc;
+            fpcLyIt_OnlyHere(&pNode->mLayer, (cNdIt_MethodFunc)fpcEx_ToLineQ, pNode);
         }
 
         return 1;
@@ -65,8 +61,7 @@ int fpcEx_ToLineQ(base_process_class *pProc)
     return 0;
 }
 
-int fpcEx_ExecuteQTo(base_process_class *pProc)
-{
+int fpcEx_ExecuteQTo(base_process_class* pProc) {
     int ret = fpcLyTg_QueueTo(&pProc->mLyTg);
     if (ret == 1) {
         pProc->mInitState = 3;
@@ -76,9 +71,9 @@ int fpcEx_ExecuteQTo(base_process_class *pProc)
     }
 }
 
-int fpcEx_ToExecuteQ(base_process_class *pProc)
-{
-    int ret = fpcLyTg_ToQueue(&pProc->mLyTg, pProc->mPi.mInfoCurr.mLayer, pProc->mPi.mInfoCurr.mListID, pProc->mPi.mInfoCurr.mListPrio);
+int fpcEx_ToExecuteQ(base_process_class* pProc) {
+    int ret = fpcLyTg_ToQueue(&pProc->mLyTg, pProc->mPi.mInfoCurr.mLayer,
+                              pProc->mPi.mInfoCurr.mListID, pProc->mPi.mInfoCurr.mListPrio);
     if (ret == 1) {
         fpcEx_ToLineQ(pProc);
         return 1;
@@ -87,9 +82,7 @@ int fpcEx_ToExecuteQ(base_process_class *pProc)
     }
 }
 
-void fpcEx_Handler(cNdIt_MethodFunc pFunc)
-{
+void fpcEx_Handler(cNdIt_MethodFunc pFunc) {
     return fpcLnIt_Queue(pFunc);
 }
-
 };
diff --git a/src/f/f_pc/f_pc_layer.cpp b/src/f/f_pc/f_pc_layer.cpp
index 9b963e28a8..3ac26bb0e5 100644
--- a/src/f/f_pc/f_pc_layer.cpp
+++ b/src/f/f_pc/f_pc_layer.cpp
@@ -1,10 +1,10 @@
-#include "global.h"
 #include "f/f_pc/f_pc_layer.h"
-#include "f/f_pc/f_pc_method_tag.h"
 #include "f/f_pc/f_pc_method_iter.h"
+#include "f/f_pc/f_pc_method_tag.h"
+#include "global.h"
 
 // f_pc_layer::l_fpcLy_CurrLayer_p
-extern layer_class *lbl_80450D18;
+extern layer_class* lbl_80450D18;
 extern s8 lbl_80450D20;
 // f_pc_layer::IsInitOfLayerList
 extern s32 lbl_80450D1C;
@@ -18,71 +18,71 @@ extern layer_class lbl_803A39B0;
 
 extern "C" {
 
-void fpcLy_CancelQTo(process_method_tag_class *pMthd) {
+void fpcLy_CancelQTo(process_method_tag_class* pMthd) {
     fpcMtdTg_MethodQTo(pMthd);
 }
 
-int fpcLy_ToCancelQ(layer_class *pLayer, process_method_tag_class *pMthd) {
+int fpcLy_ToCancelQ(layer_class* pLayer, process_method_tag_class* pMthd) {
     return fpcMtdTg_ToMethodQ(&pLayer->mCancelList, pMthd);
 }
 
-bool fpcLy_CancelMethod(process_method_tag_class *pLayer) {
+bool fpcLy_CancelMethod(process_method_tag_class* pLayer) {
     return fpcMtdTg_Do(pLayer) == 1;
 }
 
-int fpcLy_IntoQueue(layer_class *pLayer, int treeListIdx, create_tag_class *pTag, int idx) {
+int fpcLy_IntoQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag, int idx) {
     return cTg_InsertToTree(&pLayer->mNodeListTree, treeListIdx, pTag, idx);
 }
 
-int fpcLy_ToQueue(layer_class *pLayer, int treeListIdx, create_tag_class *pTag) {
+int fpcLy_ToQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag) {
     return cTg_AdditionToTree(&pLayer->mNodeListTree, treeListIdx, pTag);
 }
 
-int fpcLy_QueueTo(layer_class *pLayer, create_tag_class *pTag) {
+int fpcLy_QueueTo(layer_class* pLayer, create_tag_class* pTag) {
     return cTg_SingleCutFromTree(pTag);
 }
 
-bool fpcLy_IsDeletingMesg(layer_class *pLayer) {
+bool fpcLy_IsDeletingMesg(layer_class* pLayer) {
     return pLayer->mDeletingCount > 0;
 }
 
-void fpcLy_DeletingMesg(layer_class *pLayer) {
+void fpcLy_DeletingMesg(layer_class* pLayer) {
     pLayer->mDeletingCount++;
 }
 
-void fpcLy_DeletedMesg(layer_class *pLayer) {
+void fpcLy_DeletedMesg(layer_class* pLayer) {
     if (pLayer->mDeletingCount > 0) {
         pLayer->mDeletingCount--;
     }
 }
 
-bool fpcLy_IsCreatingMesg(layer_class *pLayer) {
+bool fpcLy_IsCreatingMesg(layer_class* pLayer) {
     return pLayer->mCreatingCount > 0;
 }
 
-void fpcLy_CreatingMesg(layer_class *pLayer) {
+void fpcLy_CreatingMesg(layer_class* pLayer) {
     pLayer->mCreatingCount++;
 }
 
-void fpcLy_CreatedMesg(layer_class *pLayer) {
+void fpcLy_CreatedMesg(layer_class* pLayer) {
     if (pLayer->mCreatingCount > 0) {
         pLayer->mCreatingCount--;
     }
 }
 
-layer_class * fpcLy_RootLayer(void) {
+layer_class* fpcLy_RootLayer(void) {
     return (layer_class*)lbl_803A39DC.mpHead;
 }
 
-void fpcLy_SetCurrentLayer(layer_class *pLayer) {
+void fpcLy_SetCurrentLayer(layer_class* pLayer) {
     lbl_80450D18 = pLayer;
 }
 
-layer_class * fpcLy_CurrentLayer(void) {
+layer_class* fpcLy_CurrentLayer(void) {
     return lbl_80450D18;
 }
 
-layer_class * fpcLy_Search(unsigned int id) {
+layer_class* fpcLy_Search(unsigned int id) {
     layer_class* iVar1 = fpcLy_RootLayer();
     while (iVar1 != NULL) {
         if (iVar1->mLayerID == id) {
@@ -93,7 +93,7 @@ layer_class * fpcLy_Search(unsigned int id) {
     return NULL;
 }
 
-layer_class * fpcLy_Layer(unsigned int id) {
+layer_class* fpcLy_Layer(unsigned int id) {
     if (id == 0 || fpcLy_RootLayer()->mLayerID == id) {
         return fpcLy_RootLayer();
     } else if (id == ~2 || fpcLy_CurrentLayer()->mLayerID == id) {
@@ -103,34 +103,35 @@ layer_class * fpcLy_Layer(unsigned int id) {
     }
 }
 
-void fpcLy_Regist(layer_class *pLayer) {
+void fpcLy_Regist(layer_class* pLayer) {
     cLs_Addition(&lbl_803A39DC, &pLayer->mNode);
 }
 
-int fpcLy_Delete(layer_class *pLayer) {
+int fpcLy_Delete(layer_class* pLayer) {
     if (pLayer->mNodeListTree.mpLists->mSize == 0 && pLayer->mCancelList.mSize == 0) {
         cLs_SingleCut(&pLayer->mNode);
-        *pLayer = lbl_803A39B0; 
+        *pLayer = lbl_803A39B0;
         return 1;
     } else {
         return 0;
     }
 }
 
-void fpcLy_Cancel(layer_class *pLayer) {
+void fpcLy_Cancel(layer_class* pLayer) {
     fpcMtdIt_Method(&pLayer->mCancelList, (cNdIt_MethodFunc)fpcLy_CancelMethod);
 }
 
-void fpcLy_Create(layer_class *pLayer, process_node_class *pPcNode, node_list_class *pLists, int listNum) {
-    void *pvVar1;
+void fpcLy_Create(layer_class* pLayer, process_node_class* pPcNode, node_list_class* pLists,
+                  int listNum) {
+    void* pvVar1;
     int iVar2;
-    
+
     if (lbl_80450D20 == 0) {
-        lbl_80450D1C = 0x1; // IsInitOfLayerList
+        lbl_80450D1C = 0x1;  // IsInitOfLayerList
         lbl_80450D20 = 1;
     }
     if (lbl_80450D28 == 0) {
-        lbl_80450D24 = 0; // layer_id
+        lbl_80450D24 = 0;  // layer_id
         lbl_80450D28 = 1;
     }
     *pLayer = lbl_803A39B0;
@@ -144,9 +145,8 @@ void fpcLy_Create(layer_class *pLayer, process_node_class *pPcNode, node_list_cl
     }
     (pLayer->mNodeListTree).mpLists = pLists;
     (pLayer->mNodeListTree).mNumLists = listNum;
-    cTr_Create(&pLayer->mNodeListTree,(pLayer->mNodeListTree).mpLists,
-                (pLayer->mNodeListTree).mNumLists);
+    cTr_Create(&pLayer->mNodeListTree, (pLayer->mNodeListTree).mpLists,
+               (pLayer->mNodeListTree).mNumLists);
     fpcLy_Regist(pLayer);
 }
-
 }
\ No newline at end of file
diff --git a/src/f/f_pc/f_pc_layer_iter.cpp b/src/f/f_pc/f_pc_layer_iter.cpp
index d050f1faae..34ce256bdf 100644
--- a/src/f/f_pc/f_pc_layer_iter.cpp
+++ b/src/f/f_pc/f_pc_layer_iter.cpp
@@ -1,17 +1,17 @@
 #include "f/f_pc/f_pc_layer_iter.h"
-#include "SComponent/c_tree_iter.h"
 #include "SComponent/c_tag_iter.h"
+#include "SComponent/c_tree_iter.h"
 
 extern "C" {
 
-int fpcLyIt_OnlyHere(layer_class *pLayer, cNdIt_MethodFunc pFunc, void *pUserData) {
+int fpcLyIt_OnlyHere(layer_class* pLayer, cNdIt_MethodFunc pFunc, void* pUserData) {
     layer_iter lIter;
     lIter.mpFunc = pFunc;
     lIter.mpUserData = pUserData;
-    return cTrIt_Method(&pLayer->mNodeListTree,(cNdIt_MethodFunc) cTgIt_MethodCall, &lIter);
+    return cTrIt_Method(&pLayer->mNodeListTree, (cNdIt_MethodFunc)cTgIt_MethodCall, &lIter);
 }
 
-int fpcLyIt_OnlyHereLY(layer_class *pLayer, cNdIt_MethodFunc pFunc, void *pUserData) {
+int fpcLyIt_OnlyHereLY(layer_class* pLayer, cNdIt_MethodFunc pFunc, void* pUserData) {
     int result;
     layer_class* currentLayer = fpcLy_CurrentLayer();
     fpcLy_SetCurrentLayer(pLayer);
@@ -20,21 +20,22 @@ int fpcLyIt_OnlyHereLY(layer_class *pLayer, cNdIt_MethodFunc pFunc, void *pUserD
     return result;
 }
 
-void * fpcLyIt_Judge(layer_class *pLayer, cNdIt_MethodFunc pFunc, void *pUserData) {
+void* fpcLyIt_Judge(layer_class* pLayer, cNdIt_MethodFunc pFunc, void* pUserData) {
     layer_iter lIter;
     lIter.mpFunc = pFunc;
     lIter.mpUserData = pUserData;
-    return cTrIt_Judge(&pLayer->mNodeListTree,(cNdIt_JudgeFunc) cTgIt_JudgeFilter, &lIter);
+    return cTrIt_Judge(&pLayer->mNodeListTree, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &lIter);
 }
 
-void * fpcLyIt_AllJudge(cNdIt_MethodFunc pFunc, void *pUserData) {
+void* fpcLyIt_AllJudge(cNdIt_MethodFunc pFunc, void* pUserData) {
     layer_iter lIter;
     lIter.mpFunc = pFunc;
     lIter.mpUserData = pUserData;
-    
+
     layer_class* current = fpcLy_RootLayer();
     while (current != NULL) {
-        void* result = cTrIt_Judge(&current->mNodeListTree,(cNdIt_JudgeFunc) cTgIt_JudgeFilter, &lIter);
+        void* result =
+            cTrIt_Judge(&current->mNodeListTree, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &lIter);
         if (result != NULL) {
             return result;
         }
@@ -42,5 +43,4 @@ void * fpcLyIt_AllJudge(cNdIt_MethodFunc pFunc, void *pUserData) {
     }
     return NULL;
 }
-
 }
\ No newline at end of file
diff --git a/src/f/f_pc/f_pc_layer_tag.cpp b/src/f/f_pc/f_pc_layer_tag.cpp
index c2e3047dd2..12ab45000c 100644
--- a/src/f/f_pc/f_pc_layer_tag.cpp
+++ b/src/f/f_pc/f_pc_layer_tag.cpp
@@ -1,13 +1,13 @@
-#include "global.h"
 #include "f/f_pc/f_pc_layer_tag.h"
 #include "f/f_pc/f_pc_layer.h"
+#include "global.h"
 
 // f_pc_layer_tag::crear
 extern layer_management_tag_class lbl_803A3A00;
 
 extern "C" {
 
-s32 fpcLyTg_ToQueue(layer_management_tag_class *pTag, u32 layerID, u16 listID, u16 listPrio) {
+s32 fpcLyTg_ToQueue(layer_management_tag_class* pTag, u32 layerID, u16 listID, u16 listPrio) {
     if (pTag->mpLayer == NULL && layerID == -1) {
         return 0;
     } else {
@@ -22,7 +22,7 @@ s32 fpcLyTg_ToQueue(layer_management_tag_class *pTag, u32 layerID, u16 listID, u
                 pTag->mNodeListIdx = tmp - 1;
                 return 1;
             }
-        } else if (fpcLy_IntoQueue(pTag->mpLayer,listID,&pTag->mCreateTag,listPrio) != 0x0) {
+        } else if (fpcLy_IntoQueue(pTag->mpLayer, listID, &pTag->mCreateTag, listPrio) != 0x0) {
             pTag->mNodeListID = listID;
             pTag->mNodeListIdx = listPrio;
             return 1;
@@ -31,8 +31,8 @@ s32 fpcLyTg_ToQueue(layer_management_tag_class *pTag, u32 layerID, u16 listID, u
     }
 }
 
-s32 fpcLyTg_QueueTo(layer_management_tag_class *pTag) {
-    if (fpcLy_QueueTo(pTag->mpLayer,&pTag->mCreateTag) == 1) {
+s32 fpcLyTg_QueueTo(layer_management_tag_class* pTag) {
+    if (fpcLy_QueueTo(pTag->mpLayer, &pTag->mCreateTag) == 1) {
         pTag->mpLayer = NULL;
         pTag->mNodeListID = 0xFFFF;
         pTag->mNodeListIdx = 0xFFFF;
@@ -42,22 +42,21 @@ s32 fpcLyTg_QueueTo(layer_management_tag_class *pTag) {
     }
 }
 
-s32 fpcLyTg_Move(layer_management_tag_class * pTag, u32 layerID, u16 listID, u16 listPrio) {
-    layer_class *layer = fpcLy_Layer(layerID);
+s32 fpcLyTg_Move(layer_management_tag_class* pTag, u32 layerID, u16 listID, u16 listPrio) {
+    layer_class* layer = fpcLy_Layer(layerID);
     if (layer == NULL) {
         return 0;
-    }
-    else if (fpcLyTg_QueueTo(pTag) == 0x1) {
+    } else if (fpcLyTg_QueueTo(pTag) == 0x1) {
         pTag->mpLayer = layer;
-        return fpcLyTg_ToQueue(pTag,layerID,listID,listPrio);
+        return fpcLyTg_ToQueue(pTag, layerID, listID, listPrio);
     } else {
         return 0;
     }
 }
 
-s32 fpcLyTg_Init(layer_management_tag_class * pTag, u32 param2, void * param3) {
+s32 fpcLyTg_Init(layer_management_tag_class* pTag, u32 param2, void* param3) {
     *pTag = lbl_803A3A00;
-    cTg_Create(&pTag->mCreateTag, param3); 
+    cTg_Create(&pTag->mCreateTag, param3);
     layer_class* layer = fpcLy_Layer(param2);
     if (layer != NULL) {
         pTag->mpLayer = layer;
@@ -66,5 +65,4 @@ s32 fpcLyTg_Init(layer_management_tag_class * pTag, u32 param2, void * param3) {
         return 0;
     }
 }
-
 }
\ No newline at end of file
diff --git a/src/f/f_pc/f_pc_leaf.cpp b/src/f/f_pc/f_pc_leaf.cpp
index c3be4a4563..9bd786806d 100644
--- a/src/f/f_pc/f_pc_leaf.cpp
+++ b/src/f/f_pc/f_pc_leaf.cpp
@@ -3,13 +3,11 @@
 
 extern "C" {
 
-int fpcLf_GetPriority(leafdraw_class *pLeaf)
-{
+int fpcLf_GetPriority(leafdraw_class* pLeaf) {
     return fpcDwPi_Get(&pLeaf->mDwPi);
 }
 
-int fpcLf_DrawMethod(leafdraw_method_class *pMthd, void *pUserData)
-{
+int fpcLf_DrawMethod(leafdraw_method_class* pMthd, void* pUserData) {
     return fpcMtd_Method(pMthd->mpDrawFunc, pUserData);
 }
 
@@ -22,5 +20,4 @@ int fpcLf_Draw(leafdraw_class *pLeaf)
     return ret;
 }
 #endif
-
 };
diff --git a/src/f/f_pc/f_pc_line.cpp b/src/f/f_pc/f_pc_line.cpp
index 7771e47516..0ce97aadaa 100644
--- a/src/f/f_pc/f_pc_line.cpp
+++ b/src/f/f_pc/f_pc_line.cpp
@@ -1,18 +1,16 @@
 
-#include "global.h"
 #include "SComponent/c_list.h"
+#include "global.h"
 
 // l_fpcLn_Line
 extern node_list_class lbl_803F4CF0[16];
 
 extern "C" {
 
-void fpcLn_Create(void)
-{
+void fpcLn_Create(void) {
     int i = ARRAY_SIZE(lbl_803F4CF0);
-    node_list_class *pLine = lbl_803F4CF0;
+    node_list_class* pLine = lbl_803F4CF0;
     while (i-- > 0)
         cLs_Create(pLine++);
 }
-
 };
diff --git a/src/f/f_pc/f_pc_line_iter.cpp b/src/f/f_pc/f_pc_line_iter.cpp
index 984ef68179..5df9a3fc85 100644
--- a/src/f/f_pc/f_pc_line_iter.cpp
+++ b/src/f/f_pc/f_pc_line_iter.cpp
@@ -1,18 +1,17 @@
 
-#include "f/f_pc/f_pc_layer.h"
-#include "f/f_pc/f_pc_base.h"
 #include "SComponent/c_tag_iter.h"
 #include "SComponent/c_tree_iter.h"
+#include "f/f_pc/f_pc_base.h"
+#include "f/f_pc/f_pc_layer.h"
 
 // g_fpcLn_Queue
 extern node_lists_tree_class lbl_804505D8;
 
 extern "C" {
 
-static int fpcLnIt_MethodCall(create_tag_class *pTag, method_filter *pFilter)
-{
-    layer_class *pLayer = ((base_process_class *) pTag->mpTagData)->mLyTg.mpLayer;
-    layer_class *pCurLayer = fpcLy_CurrentLayer();
+static int fpcLnIt_MethodCall(create_tag_class* pTag, method_filter* pFilter) {
+    layer_class* pLayer = ((base_process_class*)pTag->mpTagData)->mLyTg.mpLayer;
+    layer_class* pCurLayer = fpcLy_CurrentLayer();
 
     fpcLy_SetCurrentLayer(pLayer);
     int ret = cTgIt_MethodCall(pTag, pFilter);
@@ -21,12 +20,10 @@ static int fpcLnIt_MethodCall(create_tag_class *pTag, method_filter *pFilter)
     return ret;
 }
 
-void fpcLnIt_Queue(cNdIt_MethodFunc pFunc)
-{
+void fpcLnIt_Queue(cNdIt_MethodFunc pFunc) {
     method_filter filter;
     filter.mpMethodFunc = pFunc;
     filter.mpUserData = NULL;
-    cTrIt_Method(&lbl_804505D8, (cNdIt_MethodFunc) fpcLnIt_MethodCall, &filter);
+    cTrIt_Method(&lbl_804505D8, (cNdIt_MethodFunc)fpcLnIt_MethodCall, &filter);
 }
-
 };
diff --git a/src/f/f_pc/f_pc_line_tag.cpp b/src/f/f_pc/f_pc_line_tag.cpp
index f42449ca7b..f4f92bdadd 100644
--- a/src/f/f_pc/f_pc_line_tag.cpp
+++ b/src/f/f_pc/f_pc_line_tag.cpp
@@ -6,8 +6,7 @@ extern node_lists_tree_class lbl_804505D8;
 
 extern "C" {
 
-int fpcLnTg_Move(line_tag *pLineTag, int newLineListID)
-{
+int fpcLnTg_Move(line_tag* pLineTag, int newLineListID) {
     if (pLineTag->mLineListID != newLineListID) {
         fpcLnTg_QueueTo(pLineTag);
         return fpcLnTg_ToQueue(pLineTag, newLineListID);
@@ -16,14 +15,12 @@ int fpcLnTg_Move(line_tag *pLineTag, int newLineListID)
     return 1;
 }
 
-void fpcLnTg_QueueTo(line_tag *pLineTag)
-{
+void fpcLnTg_QueueTo(line_tag* pLineTag) {
     cTg_SingleCutFromTree(pLineTag);
     pLineTag->mLineListID = -1;
 }
 
-int fpcLnTg_ToQueue(line_tag *pLineTag, int lineListID)
-{
+int fpcLnTg_ToQueue(line_tag* pLineTag, int lineListID) {
     int ret = cTg_AdditionToTree(&lbl_804505D8, lineListID, pLineTag);
 
     if (ret) {
@@ -34,11 +31,8 @@ int fpcLnTg_ToQueue(line_tag *pLineTag, int lineListID)
     }
 }
 
-void fpcLnTg_Init(line_tag *pLineTag, void *pData)
-{
+void fpcLnTg_Init(line_tag* pLineTag, void* pData) {
     cTg_Create(pLineTag, pData);
     pLineTag->mLineListID = -1;
 }
-
 };
-
diff --git a/src/f/f_pc/f_pc_load.cpp b/src/f/f_pc/f_pc_load.cpp
index 6afb58e1fb..60fc5640d7 100644
--- a/src/f/f_pc/f_pc_load.cpp
+++ b/src/f/f_pc/f_pc_load.cpp
@@ -1,6 +1,6 @@
 
-#include "SComponent/c_phase.h"
 #include "f/f_pc/f_pc_load.h"
+#include "SComponent/c_phase.h"
 
 extern "C" {
 
@@ -8,25 +8,21 @@ extern int cDyl_IsLinked(short procName);
 extern int cDyl_Unlink(short procName);
 extern int cDyl_LinkASync(short procName);
 
-bool fpcLd_Use(u16 procName)
-{
+bool fpcLd_Use(u16 procName) {
     if (fpcLd_IsLoaded(procName) == true && fpcLd_Load(procName) == cPhs_COMPLEATE_e)
         return true;
     return false;
 }
 
-int fpcLd_IsLoaded(u16 procName)
-{
+int fpcLd_IsLoaded(u16 procName) {
     return cDyl_IsLinked(procName);
 }
 
-void fpcLd_Free(u16 procName)
-{
+void fpcLd_Free(u16 procName) {
     cDyl_Unlink(procName);
 }
 
-int fpcLd_Load(u16 procName)
-{
+int fpcLd_Load(u16 procName) {
     int phase = cDyl_LinkASync(procName);
 
     switch (phase) {
@@ -38,5 +34,4 @@ int fpcLd_Load(u16 procName)
         return cPhs_ERROR_e;
     }
 }
-
 };
diff --git a/src/f/f_pc/f_pc_method.cpp b/src/f/f_pc/f_pc_method.cpp
index 3cf3634f10..cc58c141a5 100644
--- a/src/f/f_pc/f_pc_method.cpp
+++ b/src/f/f_pc/f_pc_method.cpp
@@ -1,35 +1,29 @@
 
-#include "global.h"
 #include "f/f_pc/f_pc_method.h"
+#include "global.h"
 
 extern "C" {
 
-int fpcMtd_Method(process_method_func pFunc, void *pUserData)
-{
+int fpcMtd_Method(process_method_func pFunc, void* pUserData) {
     if (pFunc != NULL)
         return pFunc(pUserData);
     else
         return 1;
 }
 
-int fpcMtd_Execute(process_method_class *pMthd, void *pUserData)
-{
+int fpcMtd_Execute(process_method_class* pMthd, void* pUserData) {
     return fpcMtd_Method(pMthd->mpExecuteFunc, pUserData);
 }
 
-int fpcMtd_IsDelete(process_method_class *pMthd, void *pUserData)
-{
+int fpcMtd_IsDelete(process_method_class* pMthd, void* pUserData) {
     return fpcMtd_Method(pMthd->mpIsDeleteFunc, pUserData);
 }
 
-int fpcMtd_Delete(process_method_class *pMthd, void *pUserData)
-{
+int fpcMtd_Delete(process_method_class* pMthd, void* pUserData) {
     return fpcMtd_Method(pMthd->mpDeleteFunc, pUserData);
 }
 
-int fpcMtd_Create(process_method_class *pMthd, void *pUserData)
-{
+int fpcMtd_Create(process_method_class* pMthd, void* pUserData) {
     return fpcMtd_Method(pMthd->mpCreateFunc, pUserData);
 }
-
 };
diff --git a/src/f/f_pc/f_pc_method_iter.cpp b/src/f/f_pc/f_pc_method_iter.cpp
index 200a67fa45..a848b177c0 100644
--- a/src/f/f_pc/f_pc_method_iter.cpp
+++ b/src/f/f_pc/f_pc_method_iter.cpp
@@ -1,12 +1,10 @@
 
-#include "global.h"
 #include "f/f_pc/f_pc_method_iter.h"
+#include "global.h"
 
 extern "C" {
 
-void fpcMtdIt_Method(node_list_class *pList, cNdIt_MethodFunc pMethod)
-{
+void fpcMtdIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod) {
     cLsIt_Method(pList, pMethod, NULL);
 }
-
 };
diff --git a/src/f/f_pc/f_pc_method_tag.cpp b/src/f/f_pc/f_pc_method_tag.cpp
index 693ab56811..70ef343051 100644
--- a/src/f/f_pc/f_pc_method_tag.cpp
+++ b/src/f/f_pc/f_pc_method_tag.cpp
@@ -6,27 +6,22 @@ extern node_lists_tree_class lbl_804505D8;
 
 extern "C" {
 
-int fpcMtdTg_Do(process_method_tag_class *pMthd)
-{
+int fpcMtdTg_Do(process_method_tag_class* pMthd) {
     return pMthd->mpFunc(pMthd->mpMthdData);
 }
 
-int fpcMtdTg_ToMethodQ(node_list_class *pList, process_method_tag_class *pMthd)
-{
+int fpcMtdTg_ToMethodQ(node_list_class* pList, process_method_tag_class* pMthd) {
     return cTg_Addition(pList, pMthd);
 }
 
-void fpcMtdTg_MethodQTo(process_method_tag_class *pMthd)
-{
+void fpcMtdTg_MethodQTo(process_method_tag_class* pMthd) {
     cTg_SingleCut(pMthd);
 }
 
-int fpcMtdTg_Init(process_method_tag_class *pMthd, process_method_tag_func pFunc, void *pMthdData)
-{
+int fpcMtdTg_Init(process_method_tag_class* pMthd, process_method_tag_func pFunc, void* pMthdData) {
     cTg_Create(pMthd, pMthd);
     pMthd->mpFunc = pFunc;
     pMthd->mpMthdData = pMthdData;
     return 1;
 }
-
 };
diff --git a/src/f/f_pc/f_pc_pause.cpp b/src/f/f_pc/f_pc_pause.cpp
index 0c97d487f2..c880436b4e 100644
--- a/src/f/f_pc/f_pc_pause.cpp
+++ b/src/f/f_pc/f_pc_pause.cpp
@@ -4,65 +4,74 @@
 #include "f/f_pc/f_pc_layer_iter.h"
 #include "f/f_pc/f_pc_node.h"
 
-extern "C"
-{
+extern "C" {
 
 // f_pc_node::g_fpcNd_type
 extern int lbl_80450D40;
 
 #if NON_MATCHING
-bool fpcPause_IsEnable(void *pProcess, u8 flag)
-{
-    base_process_class *pProc = (base_process_class *) pProcess;
+bool fpcPause_IsEnable(void* pProcess, u8 flag) {
+    base_process_class* pProc = (base_process_class*)pProcess;
     // extra addic/subfe?
     return (pProc->mPauseFlag & flag) == flag;
 }
 #else
-asm bool fpcPause_IsEnable(void *pProcess, u8 flag)
-{
+asm bool fpcPause_IsEnable(void* pProcess, u8 flag) {
     nofralloc
-/* 80023844 00020784  54 84 06 3E */	clrlwi r4, r4, 0x18
-/* 80023848 00020788  88 03 00 0B */	lbz r0, 0xb(r3)
-/* 8002384C 0002078C  7C 80 00 38 */	and r0, r4, r0
-/* 80023850 00020790  7C 64 00 50 */	subf r3, r4, r0
-/* 80023854 00020794  30 03 FF FF */	addic r0, r3, -1
-/* 80023858 00020798  7C 00 19 10 */	subfe r0, r0, r3
-/* 8002385C 0002079C  7C 00 00 34 */	cntlzw r0, r0
-/* 80023860 000207A0  54 03 D9 7E */	srwi r3, r0, 5
-/* 80023864 000207A4  4E 80 00 20 */	blr 
+        /* 80023844 00020784  54 84 06 3E */ clrlwi r4,
+        r4,
+        0x18
+        /* 80023848 00020788  88 03 00 0B */ lbz r0,
+        0xb(r3)
+            /* 8002384C 0002078C  7C 80 00 38 */
+            and r0,
+        r4,
+        r0
+            /* 80023850 00020790  7C 64 00 50 */ subf r3,
+        r4,
+        r0
+            /* 80023854 00020794  30 03 FF FF */ addic r0,
+        r3,
+        -1
+        /* 80023858 00020798  7C 00 19 10 */ subfe r0,
+        r0,
+        r3
+            /* 8002385C 0002079C  7C 00 00 34 */ cntlzw r0,
+        r0
+            /* 80023860 000207A0  54 03 D9 7E */ srwi r3,
+        r0,
+        5
+        /* 80023864 000207A4  4E 80 00 20 */ blr
 }
 #endif
 
-int fpcPause_Enable(void *pProcess, u8 flag)
-{
-    base_process_class *pProc = (base_process_class *) pProcess;
+int fpcPause_Enable(void* pProcess, u8 flag) {
+    base_process_class* pProc = (base_process_class*)pProcess;
     pProc->mPauseFlag |= flag;
 
     if (fpcBs_Is_JustOfType(lbl_80450D40, pProc->mSubType)) {
-        process_node_class *pNode = (process_node_class *) pProc;
-        fpcLyIt_OnlyHere(&pNode->mLayer, (cNdIt_MethodFunc)fpcPause_Enable, (void*) (flag & 0xFF));
+        process_node_class* pNode = (process_node_class*)pProc;
+        fpcLyIt_OnlyHere(&pNode->mLayer, (cNdIt_MethodFunc)fpcPause_Enable, (void*)(flag & 0xFF));
     }
     return 1;
 }
 
-// According to symbols, they used u8 instead of u32, but I can't get a match with u8 here. This is the best I got...
-int fpcPause_Disable(void *pProcess, u32 flag)
-{
-    base_process_class *pProc = (base_process_class *) pProcess;
+// According to symbols, they used u8 instead of u32, but I can't get a match with u8 here. This is
+// the best I got...
+int fpcPause_Disable(void* pProcess, u32 flag) {
+    base_process_class* pProc = (base_process_class*)pProcess;
     pProc->mPauseFlag &= (0xFF - flag) & 0xFF;
 
     if (fpcBs_Is_JustOfType(lbl_80450D40, pProc->mSubType)) {
-        process_node_class *pNode = (process_node_class *) pProc;
-        fpcLyIt_OnlyHere(&pNode->mLayer, (cNdIt_MethodFunc)fpcPause_Disable, (void*) (flag & 0xFF));
+        process_node_class* pNode = (process_node_class*)pProc;
+        fpcLyIt_OnlyHere(&pNode->mLayer, (cNdIt_MethodFunc)fpcPause_Disable, (void*)(flag & 0xFF));
     }
 
     return 1;
 }
 
-void fpcPause_Init(void *pProcess)
-{
-    base_process_class *pProc = (base_process_class *) pProcess;
+void fpcPause_Init(void* pProcess) {
+    base_process_class* pProc = (base_process_class*)pProcess;
     pProc->mPauseFlag = 0;
 }
-
 }
diff --git a/src/f/f_pc/f_pc_priority.cpp b/src/f/f_pc/f_pc_priority.cpp
index c1495da27e..11f1674aa6 100644
--- a/src/f/f_pc/f_pc_priority.cpp
+++ b/src/f/f_pc/f_pc_priority.cpp
@@ -1,11 +1,10 @@
 
 #include "f/f_pc/f_pc_priority.h"
+#include "f/f_pc/f_pc_base.h"
 #include "f/f_pc/f_pc_layer.h"
 #include "f/f_pc/f_pc_layer_tag.h"
-#include "f/f_pc/f_pc_base.h"
 
-extern "C"
-{
+extern "C" {
 
 // f_pc_priority::crear$2186
 extern process_priority_queue_info lbl_804505E8;
@@ -13,25 +12,22 @@ extern process_priority_queue_info lbl_804505E8;
 // f_pc_priority::l_fpcPi_Queue
 extern node_list_class lbl_803F4E58;
 
-int fpcPi_IsInQueue(process_priority_class *pPi)
-{
+int fpcPi_IsInQueue(process_priority_class* pPi) {
     return cTg_IsUse(pPi);
 }
 
-int fpcPi_QueueTo(process_priority_class *pPi)
-{
+int fpcPi_QueueTo(process_priority_class* pPi) {
     cTg_SingleCut(pPi);
     fpcLy_CancelQTo(&pPi->mMtdTag);
     return 1;
 }
 
-int fpcPi_ToQueue(process_priority_class *pPi)
-{
+int fpcPi_ToQueue(process_priority_class* pPi) {
     u32 layer = pPi->mInfoQ.mLayer;
 
     if (cTg_Addition(&lbl_803F4E58, pPi)) {
         if (layer != 0xFFFFFFFD) {
-            layer_class *pLayer = fpcLy_Layer(layer);
+            layer_class* pLayer = fpcLy_Layer(layer);
 
             if (!fpcLy_ToCancelQ(pLayer, &pPi->mMtdTag)) {
                 cTg_SingleCut(pPi);
@@ -45,13 +41,12 @@ int fpcPi_ToQueue(process_priority_class *pPi)
     return 0;
 }
 
-process_priority_class * fpcPi_GetFromQueue(void)
-{
-    process_priority_class *pPi = (process_priority_class *) cTg_GetFirst(&lbl_803F4E58);
+process_priority_class* fpcPi_GetFromQueue(void) {
+    process_priority_class* pPi = (process_priority_class*)cTg_GetFirst(&lbl_803F4E58);
 
     if (pPi != NULL) {
-        base_process_class *pProc = (base_process_class *) pPi->mpTagData;
-        process_priority_class *pProcPi = &pProc->mPi;
+        base_process_class* pProc = (base_process_class*)pPi->mpTagData;
+        process_priority_class* pProcPi = &pProc->mPi;
         fpcLy_CancelQTo(&pProcPi->mMtdTag);
         return pProcPi;
     }
@@ -59,24 +54,22 @@ process_priority_class * fpcPi_GetFromQueue(void)
     return NULL;
 }
 
-int fpcPi_Delete(process_priority_class *pPi)
-{
+int fpcPi_Delete(process_priority_class* pPi) {
     fpcPi_QueueTo(pPi);
     pPi->mInfoQ = lbl_804505E8;
     return 1;
 }
 
-int fpcPi_IsNormal(unsigned int layer, unsigned short listID, unsigned short priority)
-{
+int fpcPi_IsNormal(unsigned int layer, unsigned short listID, unsigned short priority) {
     if ((layer < 0xFFFFFFFE) && (listID < 0xFFFE) && (priority < 0xFFFE))
         return 1;
 
     return 0;
 }
 
-int fpcPi_Change(process_priority_class *pPi, unsigned int layer, unsigned short listID, unsigned short priority)
-{
-    base_process_class *pProc = (base_process_class *) pPi->mpTagData;
+int fpcPi_Change(process_priority_class* pPi, unsigned int layer, unsigned short listID,
+                 unsigned short priority) {
+    base_process_class* pProc = (base_process_class*)pPi->mpTagData;
     int changed = 0;
 
     if (pProc->mInitState == 3)
@@ -98,7 +91,7 @@ int fpcPi_Change(process_priority_class *pPi, unsigned int layer, unsigned short
     }
 
     if (priority != 0xFFFD && pPi->mInfoCurr.mListPrio != priority) {
-        pPi->mInfoQ.mListPrio = priority;   
+        pPi->mInfoQ.mListPrio = priority;
         changed = 1;
     }
 
@@ -113,13 +106,13 @@ int fpcPi_Change(process_priority_class *pPi, unsigned int layer, unsigned short
         return 0;
 }
 
-int fpcPi_Handler(void)
-{
-    while (process_priority_class *pPi = fpcPi_GetFromQueue()) {
-        base_process_class *pProc = (base_process_class *) pPi->mpTagData;
-        layer_management_tag_class *pLayerTag = &pProc->mLyTg;
-        line_tag *pLineTag = &pProc->mLnTg;
-        if (fpcLyTg_Move(pLayerTag, pPi->mInfoQ.mLayer, pPi->mInfoQ.mListID, pPi->mInfoQ.mListPrio) == 1) {
+int fpcPi_Handler(void) {
+    while (process_priority_class* pPi = fpcPi_GetFromQueue()) {
+        base_process_class* pProc = (base_process_class*)pPi->mpTagData;
+        layer_management_tag_class* pLayerTag = &pProc->mLyTg;
+        line_tag* pLineTag = &pProc->mLnTg;
+        if (fpcLyTg_Move(pLayerTag, pPi->mInfoQ.mLayer, pPi->mInfoQ.mListID,
+                         pPi->mInfoQ.mListPrio) == 1) {
             fpcLnTg_Move(pLineTag, pPi->mInfoCurr.mListID);
             pPi->mInfoCurr = pPi->mInfoQ;
         } else {
@@ -130,8 +123,8 @@ int fpcPi_Handler(void)
     return 1;
 }
 
-int fpcPi_Init(process_priority_class *pPi, void *pUserData, unsigned int layer, unsigned short listID, unsigned short priority)
-{
+int fpcPi_Init(process_priority_class* pPi, void* pUserData, unsigned int layer,
+               unsigned short listID, unsigned short priority) {
     if (!fpcPi_IsNormal(layer, listID, priority))
         return 0;
 
@@ -140,8 +133,7 @@ int fpcPi_Init(process_priority_class *pPi, void *pUserData, unsigned int layer,
     pPi->mInfoQ.mListPrio = priority;
     pPi->mInfoCurr = pPi->mInfoQ;
     cTg_Create(pPi, pUserData);
-    fpcMtdTg_Init(&pPi->mMtdTag, (process_method_tag_func) fpcPi_Delete, pPi);
+    fpcMtdTg_Init(&pPi->mMtdTag, (process_method_tag_func)fpcPi_Delete, pPi);
     return 1;
 }
-
 };
diff --git a/src/f/f_pc/f_pc_profile.cpp b/src/f/f_pc/f_pc_profile.cpp
index fb3f353342..a9edc3bbc8 100644
--- a/src/f/f_pc/f_pc_profile.cpp
+++ b/src/f/f_pc/f_pc_profile.cpp
@@ -2,13 +2,11 @@
 #include "f/f_pc/f_pc_profile.h"
 
 // g_fpcPf_ProfileList_p
-extern void ** lbl_80450D50;
+extern void** lbl_80450D50;
 
 extern "C" {
 
-void * fpcPf_Get(s16 profileID)
-{
+void* fpcPf_Get(s16 profileID) {
     return lbl_80450D50[profileID];
 }
-
 };
diff --git a/src/f/f_pc/f_pc_searcher.cpp b/src/f/f_pc/f_pc_searcher.cpp
index 4738b299dd..5bf058475d 100644
--- a/src/f/f_pc/f_pc_searcher.cpp
+++ b/src/f/f_pc/f_pc_searcher.cpp
@@ -4,20 +4,17 @@
 
 extern "C" {
 
-void * fpcSch_JudgeForPName(base_process_class *pProc, void *pUserData)
-{
+void* fpcSch_JudgeForPName(base_process_class* pProc, void* pUserData) {
     short pname = *(short*)pUserData;
     if (pProc->mProcName == pname)
         return pProc;
     return NULL;
 }
 
-void * fpcSch_JudgeByID(base_process_class *pProc, void *pUserData)
-{
+void* fpcSch_JudgeByID(base_process_class* pProc, void* pUserData) {
     int id = *(int*)pUserData;
     if (pProc->mBsPcId == id)
         return pProc;
     return NULL;
 }
-
 };
diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp
index 2f3e0718ff..0d22d1c471 100644
--- a/src/m_Do/m_Do_Reset.cpp
+++ b/src/m_Do/m_Do_Reset.cpp
@@ -1,6 +1,6 @@
 #include "m_Do/m_Do_reset/m_Do_reset.h"
-#include "dvd/dvd.h"
 #include "JSystem/JUtility/JUTXfb/JUTXfb.h"
+#include "dvd/dvd.h"
 #include "global.h"
 
 extern "C" {
@@ -20,10 +20,10 @@ void destroyVideo() {
 
 // TODO: cleanup
 void mDoRst::reset(s32 p1, u32 p2, s32 p3) {
-    mDoCPd_c *pmVar1;
+    mDoCPd_c* pmVar1;
     u32 uVar2;
     DVDState DVar3;
-    OSThread *thread;
+    OSThread* thread;
     s32 enable;
     /* sManager */ lbl_80451550->clearIndex();
     mDoDvdErr_ThdCleanup();
@@ -38,7 +38,7 @@ void mDoRst::reset(s32 p1, u32 p2, s32 p3) {
     if ((s32)DVDGetDriveStatus() == (s32)DVD_STATE_BUSY) {
         OSAttention(lbl_80374198);
     }
-    JASTaskThread *task_thread = JASDvd_NS_getThreadPointer();
+    JASTaskThread* task_thread = JASDvd_NS_getThreadPointer();
     if (task_thread != NULL) {
         JASTaskThread_NS_pause(task_thread, true);
         thread = task_thread->thread;
@@ -64,7 +64,7 @@ void mDoRst::reset(s32 p1, u32 p2, s32 p3) {
     GXDrawDone();
 
     OSRestoreInterrupts(enable);
-    
+
     destroyVideo();
 
     // nb: probably fake match (i am not sure that it's actually attached to this label lol)
@@ -75,7 +75,8 @@ void mDoRst::reset(s32 p1, u32 p2, s32 p3) {
     my_OSCancelAlarmAll();
     LCDisable();
     // probably false match; check out 80015728 or thereabouts in Ghidra
-    OSSetSaveRegion(/* mResetData */ m_Do_Reset_NS_mDoRst_NS_mResetData, (u8*)(&getResetData__6mDoRstFv) + 0x18);
+    OSSetSaveRegion(/* mResetData */ m_Do_Reset_NS_mDoRst_NS_mResetData,
+                    (u8*)(&getResetData__6mDoRstFv) + 0x18);
     OSResetSystem(p1, p2, p3);
     do {
         VIWaitForRetrace();
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index bdeab13d78..0966b178ca 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -1,11 +1,12 @@
 #include "m_Do/m_Do_main/m_Do_main.h"
-#include "m_Do/m_Do_reset/m_Do_reset.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "dvd/dvd.h"
 #include "global.h"
+#include "m_Do/m_Do_reset/m_Do_reset.h"
 
 void version_check(void) {
-    if ((!strcmp((char*)lbl_803739A0, (char*)lbl_803739A0)) && (!strcmp(((char*)lbl_803739A0 + 0xA), ((char*)lbl_803739A0 + 0xA)))) {
+    if ((!strcmp((char*)lbl_803739A0, (char*)lbl_803739A0)) &&
+        (!strcmp(((char*)lbl_803739A0 + 0xA), ((char*)lbl_803739A0 + 0xA)))) {
         return;
     }
 
@@ -40,7 +41,8 @@ void CheckHeap(u32 param_1) {
 
     unk = 0;
 
-    if ((((lbl_803DD2E8 + 0x30)[param_1 * 0x10] & 0xffffffef) == 0x60) && (((lbl_803DD2E8 + 0x30)[param_1 * 0x10] & 0x10) != 0)) {
+    if ((((lbl_803DD2E8 + 0x30)[param_1 * 0x10] & 0xffffffef) == 0x60) &&
+        (((lbl_803DD2E8 + 0x30)[param_1 * 0x10] & 0x10) != 0)) {
         unk = 1;
     }
 
@@ -63,8 +65,7 @@ asm void CheckHeap(u32 param_1) {
 }
 #endif
 
-asm int countUsed(JKRExpHeap* heap){
-    nofralloc
+asm int countUsed(JKRExpHeap* heap){nofralloc
 #include "m_Do/m_Do_main/asm/func_80005848.s"
 }
 
@@ -88,11 +89,14 @@ void HeapCheck::heapDisplay(void) const {
     JUTReport__FiiPCce(0x64, 0xfd, lbl_803739A0 + 0x71, heap_total_free_size - heap_size2);
     JUTReport__FiiPCce(0x64, 0x10a, lbl_803739A0 + 0x87, heap_free_size - heap_size2);
     JUTReport__FiiPCce(0x64, 0x117, lbl_803739A0 + 0x9D, heap_total_used_size);
-    JUTReport__FiiPCce(0x64, 0x124, lbl_803739A0 + 0xB3, (int)(heap_total_used_size * 0x64) / (int)this->heap_size);
+    JUTReport__FiiPCce(0x64, 0x124, lbl_803739A0 + 0xB3,
+                       (int)(heap_total_used_size * 0x64) / (int)this->heap_size);
     JUTReport__FiiPCce(0x64, 0x131, lbl_803739A0 + 0xCF, this->max_total_used_size);
-    JUTReport__FiiPCce(0x64, 0x13e, lbl_803739A0 + 0xE5, (this->max_total_used_size * 0x64) / (int)this->heap_size);
+    JUTReport__FiiPCce(0x64, 0x13e, lbl_803739A0 + 0xE5,
+                       (this->max_total_used_size * 0x64) / (int)this->heap_size);
     JUTReport__FiiPCce(0x64, 0x14b, lbl_803739A0 + 0x101, this->max_total_free_size - heap_size2);
-    JUTReport__FiiPCce(0x64, 0x158, lbl_803739A0 + 0x117, ((this->max_total_free_size - heap_size2) * 0x64) / (int)this->heap_size);
+    JUTReport__FiiPCce(0x64, 0x158, lbl_803739A0 + 0x117,
+                       ((this->max_total_free_size - heap_size2) * 0x64) / (int)this->heap_size);
     heap_size2 = countUsed(this->heap);
     JUTReport__FiiPCce(0x64, 0x165, lbl_803739A0 + 0x133, heap_size2);
 }
@@ -142,13 +146,15 @@ void debug(void) {
             CheckHeap(0x2);
         }
 
-        if (((m_gamePad.buttons.button_flags & 0xffffffef) == 0x20) && (m_gamePad.buttons.field_0x4 & 0x10)) {
-            //if (1) {
+        if (((m_gamePad.buttons.button_flags & 0xffffffef) == 0x20) &&
+            (m_gamePad.buttons.field_0x4 & 0x10)) {
+            // if (1) {
             DAT_80450b18 = DAT_80450b18 ^ 0x1;
         }
 
         if (DAT_80450b18) {
-            if (((m_gamePad.buttons.button_flags & 0xffffffef) == 0x40) && (m_gamePad.buttons.field_0x4 & 0x10)) {
+            if (((m_gamePad.buttons.button_flags & 0xffffffef) == 0x40) &&
+                (m_gamePad.buttons.field_0x4 & 0x10)) {
                 if (DAT_80450588 < 0x5) {
                     DAT_80450588 = DAT_80450588 + 0x1;
                 } else {