run clang-format

2026-05-23 06:54:28 -04:00 · 2020-12-26 11:31:49 -05:00
parent 64a6a97b7b
commit 4c504d078d
180 changed files with 4083 additions and 4253 deletions
@@ -1,8 +1,6 @@
 #ifndef J2DSCREEN_H_
 #define J2DSCREEN_H_

-class J2DScreen {
-
-};
+class J2DScreen {};

 #endif
@@ -1,8 +1,6 @@
 #ifndef J3DJOINT_H_
 #define J3DJOINT_H_

-struct J3DJoint{
-
-};
+struct J3DJoint {};

 #endif
@@ -1,8 +1,6 @@
 #ifndef J3DMODEL_H_
 #define J3DMODEL_H_

-struct J3DModel{
-
-};
+struct J3DModel {};

 #endif
@@ -1,8 +1,6 @@
 #ifndef J3DMODELDATA_H_
 #define J3DMODELDATA_H_

-struct J3DModelData{
-
-};
+struct J3DModelData {};

 #endif
@@ -1,8 +1,6 @@
 #ifndef J3DMODELLOADER_H_
 #define J3DMODELLOADER_H_

-struct J3DMaterial{
-
-};
+struct J3DMaterial {};

 #endif
@@ -3,9 +3,9 @@

 #include "global.h"

-struct  JAISoundID{
+struct JAISoundID {
    u32 soundId;
-    JAISoundID(JAISoundID const &soundIdToSet);
+    JAISoundID(JAISoundID const& soundIdToSet);
 };

 #endif
@@ -3,8 +3,6 @@

 #include "global.h"

-struct JAISoundHandle{
-
-};
+struct JAISoundHandle {};

 #endif
@@ -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*);
@@ -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**);
 };
@@ -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;
@@ -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;
@@ -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*);

@@ -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);
@@ -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);
@@ -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*);
 };

@@ -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
@@ -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*);
@@ -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;
 };
@@ -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*);
@@ -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**);
 };
@@ -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
@@ -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);
 };
@@ -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);
@@ -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];
 };
@@ -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*);
 };

@@ -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];
@@ -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*);
@@ -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);
@@ -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);
 };

@@ -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);
 };

@@ -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];
@@ -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
@@ -4,9 +4,8 @@
 #include "dolphin/types.h"

 class JSUFileInputStream {
-  public:
+public:
    virtual ~JSUFileInputStream();
-
 };

 #endif
@@ -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;
 };

@@ -4,9 +4,8 @@
 #include "dolphin/types.h"

 class JSURandomInputStream {
-  public:
+public:
    void getAvailable(void) const;
 };

-
 #endif
@@ -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;
@@ -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
@@ -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;
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
-}
+}  // namespace Z2Calc
@@ -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);
 };
@@ -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;
@@ -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
@@ -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
@@ -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;

@@ -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
@@ -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;
 };
@@ -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;
 };
@@ -1,8 +1,6 @@
 #ifndef D_A_PLAYER_H_
 #define D_A_PLAYER_H_

-class daPy_anmHeap_c{
-
-};
+class daPy_anmHeap_c {};

 #endif
@@ -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;
@@ -1,8 +1,6 @@
 #ifndef D_CC_D_H_
 #define D_CC_D_H_

-struct dCcD_GObjInf{
-
-};
+struct dCcD_GObjInf {};

 #endif
@@ -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;
@@ -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];
 };

@@ -4,8 +4,8 @@
 #include "dolphin/types.h"

 class dEvt_control_c {
-    public:
-     u8 unk[0x130];
+public:
+    u8 unk[0x130];
 };

 #endif
@@ -4,8 +4,8 @@
 #include "dolphin/types.h"

 class dEvent_manager_c {
-    public:
-     u8 unk[0x6C8];
+public:
+    u8 unk[0x6C8];
 };

 #endif
@@ -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;
@@ -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);
@@ -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;
@@ -1,8 +1,6 @@
 #ifndef D_PANE_CLASS_ALPHA_H_
 #define D_PANE_CLASS_ALPHA_H_

-class CPaneMgrAlpha {
-
-};
+class CPaneMgrAlpha {};

 #endif
@@ -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
@@ -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;
@@ -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
@@ -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
@@ -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
@@ -1,8 +1,6 @@
 #ifndef F_OP_ACTOR_H_
 #define F_OP_ACTOR_H_

-class fopAc_ac_c{
-
-};
+class fopAc_ac_c {};

 #endif
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,6 @@
 extern "C" {

 void fpcLnIt_Queue(cNdIt_MethodFunc pFunc);
-
 };

 #endif
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6,8 +6,7 @@

 extern "C" {

-void * fpcPf_Get(s16 profileID);
-
+void* fpcPf_Get(s16 profileID);
 };

 #endif
@@ -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
--- a/Show More
+++ b/Show More