clang-format and Doxyfile returns

.clang-format

@@ -0,0 +1,20 @@
+BasedOnStyle: LLVM
+Language: Cpp
+IndentWidth: 4
+TabWidth: 4
+UseTab: Never
+ColumnLimit: 0
+PointerAlignment: Left
+BreakBeforeBraces: Attach
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AccessModifierOffset: -4
+SortIncludes: false
+NamespaceIndentation: All
+IndentCaseLabels: false
+SpaceBeforeParens: ControlStatements
+SpacesInParentheses: false
+SpacesInAngles: false
+AlignConsecutiveDeclarations: true
+AlignTrailingComments: true

Doxyfile

@@ -0,0 +1,34 @@
+# Doxyfile 1.9.5
+
+PROJECT_NAME           = SMG-Decomp
+PROJECT_BRIEF          = "A decompilation of Super Mario Galaxy 1"
+OUTPUT_DIRECTORY       = doxygen
+HTML_OUTPUT            = .
+EXTRACT_PRIVATE        = YES
+EXTRACT_PRIV_VIRTUAL   = YES
+EXTRACT_STATIC         = YES
+INPUT                  = src\Game \
+                         include\Game \
+                         README.md
+FILE_PATTERNS          = *.c \
+                         *.cpp \
+                         *.h \
+                         *.hpp \
+                         *.hpp \
+                         *.s
+RECURSIVE              = YES
+USE_MDFILE_AS_MAINPAGE = README.md
+HTML_COLORSTYLE        = TOGGLE
+GENERATE_LATEX         = NO
+HAVE_DOT               = NO
+COLLABORATION_GRAPH    = NO
+DIRECTORY_GRAPH        = NO
+INCLUDE_GRAPH          = NO
+INCLUDED_BY_GRAPH      = NO
+DOT_IMAGE_FORMAT       = svg
+SHOW_INCLUDE_FILES     = NO
+SHOW_USED_FILES        = NO
+SOURCE_BROWSER         = YES
+SOURCE_TOOLTIPS        = YES
+SORT_MEMBER_DOCS       = NO
+CALL_GRAPH             = NO

include/Game/Animation/AnmPlayer.hpp

@@ -9,29 +9,29 @@ class ResourceHolder;
 
 class AnmPlayerBase {
 public:
-    AnmPlayerBase(const ResTable *);
+    AnmPlayerBase(const ResTable*);
 
-    virtual void changeAnimation(J3DAnmBase *);
+    virtual void changeAnimation(J3DAnmBase*);
     virtual void stopAnimation();
 
     void update();
     void reflectFrame();
-    void start(const char *);
+    void start(const char*);
     void stop();
-    bool isPlaying(const char *) const;
+    bool isPlaying(const char*) const;
     bool isStop() const;
 
-    /* 0x4 */ J3DAnmBase* mAnmRes;
+    /* 0x4 */ J3DAnmBase*     mAnmRes;
     /* 0x8 */ const ResTable* mResTable;
-    /* 0xC */ J3DFrameCtrl mFrameCtrl;
+    /* 0xC */ J3DFrameCtrl    mFrameCtrl;
 };
 
 class MaterialAnmPlayerBase : public AnmPlayerBase {
 public:
-    MaterialAnmPlayerBase(const ResTable *, J3DModelData *);
+    MaterialAnmPlayerBase(const ResTable*, J3DModelData*);
 
-    virtual void attach(J3DAnmBase *, J3DModelData *) = 0;
-    virtual void detach(J3DAnmBase *, J3DModelData *) = 0;
+    virtual void attach(J3DAnmBase*, J3DModelData*) = 0;
+    virtual void detach(J3DAnmBase*, J3DModelData*) = 0;
 
     void beginDiff();
     void endDiff();

include/Game/Animation/BckCtrl.hpp

@@ -4,40 +4,40 @@
 
 class XanimePlayer;
 
-class BckCtrlData { 
+class BckCtrlData {
 public:
     // some callers inline this and some do not
-    BckCtrlData() : _0(""), mPlayFrame(-1), mStartFrame(-1), mEndFrame(-1), mRepeatFrame(-1), mInterpole(-1), mLoopMode(0xff) {}
+    BckCtrlData()
+        : _0(""), mPlayFrame(-1), mStartFrame(-1), mEndFrame(-1), mRepeatFrame(-1), mInterpole(-1), mLoopMode(0xff) {}
 
-    void operator=(const BckCtrlData &);
+    void operator=(const BckCtrlData&);
 
     const char* _0;
-    s16 mPlayFrame;     // 0x4
-    s16 mStartFrame;    // 0x6
-    s16 mEndFrame;      // 0x8
-    s16 mRepeatFrame;   // 0xA
-    s16 mInterpole;     // 0xC
-    u8 mLoopMode;       // 0xE
-    u8 _F;
-    u8 _10;
-    u8 _11;
+    s16         mPlayFrame;   // 0x4
+    s16         mStartFrame;  // 0x6
+    s16         mEndFrame;    // 0x8
+    s16         mRepeatFrame; // 0xA
+    s16         mInterpole;   // 0xC
+    u8          mLoopMode;    // 0xE
+    u8          _F;
+    u8          _10;
+    u8          _11;
 };
 
 class BckCtrlFunction {
 public:
-    static void reflectBckCtrlData(const BckCtrlData &, XanimePlayer *);
+    static void reflectBckCtrlData(const BckCtrlData&, XanimePlayer*);
 };
 
 class BckCtrl {
 public:
+    BckCtrlData* find(const char*) const;
+    void         add(const BckCtrlData&);
+    void         overWrite(const BckCtrlData&);
+    void         changeBckSetting(const char*, XanimePlayer*) const;
 
-    BckCtrlData* find(const char *) const;
-    void add(const BckCtrlData &);
-    void overWrite(const BckCtrlData &);
-    void changeBckSetting(const char *, XanimePlayer *) const;
-
-    BckCtrlData mDefaultCtrlData;   // 0x0
+    BckCtrlData  mDefaultCtrlData;  // 0x0
     BckCtrlData* mControlData;      // 0x14
-    u32 mControlDataCount;          // 0x18
-    u32 _1C;
+    u32          mControlDataCount; // 0x18
+    u32          _1C;
 };

include/Game/Animation/BvaPlayer.hpp

@@ -10,7 +10,7 @@ class BvaPlayer : public AnmPlayerBase {
 public:
     BvaPlayer(const ResTable*, J3DModel*);
 
-    void calc();
+    void                  calc();
     J3DAnmVisibilityFull* getAnmVisibility();
 
 private:

include/Game/Animation/LayoutAnmPlayer.hpp

@@ -6,7 +6,7 @@ namespace nw4r {
     namespace lyt {
         class AnimTransform;
     };
-};
+}; // namespace nw4r
 
 class LayoutManager;
 
@@ -21,8 +21,8 @@ public:
 
     bool isStop() const;
 
-    /* 0x04 */ const char* mAnimName;
+    /* 0x04 */ const char*               mAnimName;
     /* 0x08 */ nw4r::lyt::AnimTransform* mAnimTransform;
-    /* 0x0C */ const LayoutManager* mManager;
-    /* 0x10 */ J3DFrameCtrl mFrameCtrl;
+    /* 0x0C */ const LayoutManager*      mManager;
+    /* 0x10 */ J3DFrameCtrl              mFrameCtrl;
 };

include/Game/Animation/XanimeCore.hpp

@@ -9,50 +9,50 @@ class XtransformInfo {
 public:
     XtransformInfo();
 
-    XtransformInfo& operator=(const XtransformInfo &);
+    XtransformInfo& operator=(const XtransformInfo&);
 
     TVec3f _0;
     TVec3f _C;
-    f32 _18;
-    f32 _1C;
-    f32 _20;
-    f32 _24;
+    f32    _18;
+    f32    _1C;
+    f32    _20;
+    f32    _24;
 };
 
 class XjointTransform {
 public:
     XjointTransform();
 
-    u32 _0;
-    s16 _4;
-    f32 _8;
-    f32 _C;
-    f32 _10;
-    f32 _14;
-    f32 _18;
-    f32 _1C;
-    f32 _20;
-    f32 _24;
-    f32 _28;
-    f32 _2C;
-    f32 _30;
-    f32 _34;
-    f32 _38;
-    f32 _3C;
-    f32 _40;
-    f32 _44;
-    f32 _48;
-    f32 _4C;
-    u16 _50;
-    u16 _52;
-    u16 _54;
-    u16 _56;
-    f32 _58;
-    f32 _5C;
-    f32 _60;
+    u32    _0;
+    s16    _4;
+    f32    _8;
+    f32    _C;
+    f32    _10;
+    f32    _14;
+    f32    _18;
+    f32    _1C;
+    f32    _20;
+    f32    _24;
+    f32    _28;
+    f32    _2C;
+    f32    _30;
+    f32    _34;
+    f32    _38;
+    f32    _3C;
+    f32    _40;
+    f32    _44;
+    f32    _48;
+    f32    _4C;
+    u16    _50;
+    u16    _52;
+    u16    _54;
+    u16    _56;
+    f32    _58;
+    f32    _5C;
+    f32    _60;
     MtxPtr _64;
-    u32 _68;
-    u32 _6C;
+    u32    _68;
+    u32    _6C;
 };
 
 class XjointInfo {
@@ -61,9 +61,9 @@ public:
 
     XtransformInfo _0;
     XtransformInfo _28;
-    TVec3f _50;
-    f32 _5C;
-    f32 _60;
+    TVec3f         _50;
+    f32            _5C;
+    f32            _60;
 };
 
 class XanimeTrack {
@@ -71,42 +71,42 @@ public:
     void init();
 
     u32 _0;
-    f32 mWeight;    // 0x4
+    f32 mWeight; // 0x4
     f32 _8;
-    u8 _C;
+    u8  _C;
 };
 
 class XanimeCore : public J3DMtxCalc {
 public:
     XanimeCore(u32, u32, u8);
-    XanimeCore(u32, XanimeCore *);
+    XanimeCore(u32, XanimeCore*);
 
     virtual ~XanimeCore();
     virtual void setWeight(u8, f32);
-    virtual void init(const Vec &, const Mtx &);
+    virtual void init(const Vec&, const Mtx&);
     virtual void calc();
 
-    void shareJointTransform(const XanimeCore *);
+    void shareJointTransform(const XanimeCore*);
     void doFreeze();
-    void setBck(u32, J3DAnmTransform *);
+    void setBck(u32, J3DAnmTransform*);
 
-    void enableJointTransform(J3DModelData *);
+    void enableJointTransform(J3DModelData*);
 
     void initMember(u32);
 
     XjointTransform* getJointTransform(u32);
 
-    u8 _4;
-    u8 mTrackCount;                     // 0x5
-    u8 _6;
-    u32 mJointCount;                    // 0x8
-    u16 _C;
-    XjointInfo* mJointList;             // 0x10
-    XjointTransform* mTransformList;    // 0x14  // this is an array
-    XanimeTrack* mTrackList;            // 0x18
-    f32 _1C;
-    f32 _20;
-    f32 _24;
-    u8 _28;
-    u8 _29;
+    u8               _4;
+    u8               mTrackCount; // 0x5
+    u8               _6;
+    u32              mJointCount; // 0x8
+    u16              _C;
+    XjointInfo*      mJointList;     // 0x10
+    XjointTransform* mTransformList; // 0x14  // this is an array
+    XanimeTrack*     mTrackList;     // 0x18
+    f32              _1C;
+    f32              _20;
+    f32              _24;
+    u8               _28;
+    u8               _29;
 };

include/Game/Animation/XanimePlayer.hpp

@@ -23,72 +23,74 @@ public:
     XanimePlayer(J3DModel*, XanimeResourceTable*);
     XanimePlayer(J3DModel*, XanimeResourceTable*, XanimePlayer*);
 
-    void init();
-    void stopAnimation();
-    void stopAnimation(const char*);
-    void changeTrackAnimation(u8, const char*);
-    void changeTrackAnimation(u8, u32);
-    void changeAnimationBck(const char*);
-    bool changeSimpleBck(const char*);
-    void changeAnimation(const char*);
-    void changeAnimationByHash(u32);
-    void swapFrameCtrl(const XanimeGroupInfo*);
-    void changeAnimation(const XanimeGroupInfo*);
-    void prepareAnimation(const XanimeGroupInfo*);
-    void runNextAnimation();
-    void changeAnimationSimple(J3DAnmTransform*);
-    void changeSpeed(f32);
-    void changeInterpoleFrame(s32);
-    bool changeTrackWeight(u32, f32);
-    void calcAnm(u16);
-    void setModel(J3DModel*);
-    void overWriteMtxCalc(u16);
-    void clearMtxCalc(u16);
-    void clearAnm(u16);
-    void updateBeforeMovement();
-    void updateAfterMovement();
-    void updateInterpoleRatio();
-    void getMainAnimationTrans(u32, TVec3f*) const;
-    bool isRun(const char*) const;
-    bool isTerminate(const char*) const;
-    bool isTerminate() const;
-    void setDefaultAnimation(const char*);
-    void runDefaultAnimation();
-    bool isAnimationRunSimple() const;
-    const char* getCurrentAnimationName() const;
-    const char* getDefaultAnimationName() const;
-    const char* getCurrentBckName() const;
-    const char* getNameStringPointer(const char*) const;
-    bool checkPass(f32) const;
+    void                   init();
+    void                   stopAnimation();
+    void                   stopAnimation(const char*);
+    void                   changeTrackAnimation(u8, const char*);
+    void                   changeTrackAnimation(u8, u32);
+    void                   changeAnimationBck(const char*);
+    bool                   changeSimpleBck(const char*);
+    void                   changeAnimation(const char*);
+    void                   changeAnimationByHash(u32);
+    void                   swapFrameCtrl(const XanimeGroupInfo*);
+    void                   changeAnimation(const XanimeGroupInfo*);
+    void                   prepareAnimation(const XanimeGroupInfo*);
+    void                   runNextAnimation();
+    void                   changeAnimationSimple(J3DAnmTransform*);
+    void                   changeSpeed(f32);
+    void                   changeInterpoleFrame(s32);
+    bool                   changeTrackWeight(u32, f32);
+    void                   calcAnm(u16);
+    void                   setModel(J3DModel*);
+    void                   overWriteMtxCalc(u16);
+    void                   clearMtxCalc(u16);
+    void                   clearAnm(u16);
+    void                   updateBeforeMovement();
+    void                   updateAfterMovement();
+    void                   updateInterpoleRatio();
+    void                   getMainAnimationTrans(u32, TVec3f*) const;
+    bool                   isRun(const char*) const;
+    bool                   isTerminate(const char*) const;
+    bool                   isTerminate() const;
+    void                   setDefaultAnimation(const char*);
+    void                   runDefaultAnimation();
+    bool                   isAnimationRunSimple() const;
+    const char*            getCurrentAnimationName() const;
+    const char*            getDefaultAnimationName() const;
+    const char*            getCurrentBckName() const;
+    const char*            getNameStringPointer(const char*) const;
+    bool                   checkPass(f32) const;
     const XanimeGroupInfo* getSimpleGroup() const;
-    void duplicateSimpleGroup();
-    void changeCurrentAnimation(const XanimeGroupInfo*);
+    void                   duplicateSimpleGroup();
+    void                   changeCurrentAnimation(const XanimeGroupInfo*);
 
-    inline XanimeCore* getCore() { return mCore; }
+    inline XanimeCore* getCore() {
+        return mCore;
+    }
 
-    /* 0x00 */ J3DModel* mModel;
-    /* 0x04 */ J3DModelData* mModelData;
-    /* 0x08 */ f32 _08;
-    /* 0x0C */ f32 _0C;
-    /* 0x10 */ f32 _10[4];
-    /* 0x20 */ XanimeFrameCtrl* _20;
-    /* 0x24 */ XanimeFrameCtrl _24[2];
-    /* 0x54 */ u8 _54;
-    /* 0x55 */ u8 _55;
-    /* 0x58 */ const char* mCurrentBckName;
+    /* 0x00 */ J3DModel*              mModel;
+    /* 0x04 */ J3DModelData*          mModelData;
+    /* 0x08 */ f32                    _08;
+    /* 0x0C */ f32                    _0C;
+    /* 0x10 */ f32                    _10[4];
+    /* 0x20 */ XanimeFrameCtrl*       _20;
+    /* 0x24 */ XanimeFrameCtrl        _24[2];
+    /* 0x54 */ u8                     _54;
+    /* 0x55 */ u8                     _55;
+    /* 0x58 */ const char*            mCurrentBckName;
     /* 0x5C */ const XanimeGroupInfo* mDefaultAnimation;
     /* 0x60 */ const XanimeGroupInfo* mCurrentAnimation;
     /* 0x64 */ const XanimeGroupInfo* mPrevAnimation;
     /* 0x68 */ const XanimeGroupInfo* _68;
-    /* 0x6C */ XanimeCore* mCore;
-    /* 0x70 */ XanimeResourceTable* mResourceTable;
-    /* 0x74 */ XanimeGroupInfo* _74;
-    /* 0x78 */ s32 _78;
-    /* 0x7C */ u8 _7C;
-    /* 0x7D */ u8 _7D;
-    /* 0x7E */ u8 _7E;
-    /* 0x7F */ u8 _7F;
-    /* 0x80 */ u8 _80;
-    /* 0x84 */ f32 _84;
-    /* 0x88 */ u8 _88;
+    /* 0x6C */ XanimeCore*            mCore;
+    /* 0x70 */ XanimeResourceTable*   mResourceTable;
+    /* 0x74 */ XanimeGroupInfo*       _74;
+    /* 0x78 */ s32                    _78;
+    /* 0x7C */ u8                     _7C;
+    /* 0x7D */ u8                     _7D;
+    /* 0x7E */ u8                     _7E;
+    /* 0x7F */ u8                     _7F;
+    /* 0x80 */ u8                     _80;
+    /* 0x84 */ f32                    _84;
+    /* 0x88 */ u8                     _88;
 };

include/Game/Animation/XanimeResource.hpp

@@ -6,90 +6,90 @@ class ResourceHolder;
 
 class XanimeSwapTable {
 public:
-    const char *original;
-    const char *swapped;
+    const char* original;
+    const char* swapped;
 };
 
 class XanimeBckTable {
 public:
-    const char *animationName;
+    const char* animationName;
 };
 
 class XanimeGroupInfo {
 public:
-    XanimeBckTable mParent;    // 0x0
-    f32 _4;
-    u32 _8;
-    f32 _C;
-    f32 _10;
-    f32 _14;
-    u32 _18;
-    u8 _1C;
-    u8 _1D;
-    u32 _20[4];
-    f32 _30[4];
-    u32 _40;
-    u32 _44;
-    const char *_48;
+    XanimeBckTable mParent; // 0x0
+    f32            _4;
+    u32            _8;
+    f32            _C;
+    f32            _10;
+    f32            _14;
+    u32            _18;
+    u8             _1C;
+    u8             _1D;
+    u32            _20[4];
+    f32            _30[4];
+    u32            _40;
+    u32            _44;
+    const char*    _48;
 
     void init();
 };
 
 class XanimeSingleBckTable {
 public:
-    XanimeBckTable parent;    // 0x0
+    XanimeBckTable parent; // 0x0
 
-    const char *fileName;    // 0x4
-    u32 animationHash;       // 0x8
-    u32 fileHash;            // 0xC
+    const char* fileName;      // 0x4
+    u32         animationHash; // 0x8
+    u32         fileHash;      // 0xC
 };
 
 class XanimeDoubleBckTable {
 public:
-    XanimeBckTable parent;    // 0x0
+    XanimeBckTable parent; // 0x0
 
-    const char *fileName1;    // 0x4
-    f32 _8;
+    const char* fileName1; // 0x4
+    f32         _8;
 
-    const char *fileName2;    // 0xC
-    f32 _10;
+    const char* fileName2; // 0xC
+    f32         _10;
 };
 
 class XanimeTripleBckTable {
 public:
-    XanimeBckTable parent;    // 0x0
+    XanimeBckTable parent; // 0x0
 
-    const char *fileName1;    // 0x4
-    f32 _8;
+    const char* fileName1; // 0x4
+    f32         _8;
 
-    const char *fileName2;    // 0xC
-    f32 _10;
+    const char* fileName2; // 0xC
+    f32         _10;
 
-    const char *fileName3;    // 0x14;
-    f32 _18;
+    const char* fileName3; // 0x14;
+    f32         _18;
 };
 
 class XanimeQuadBckTable {
 public:
-    XanimeBckTable parent;    // 0x0
+    XanimeBckTable parent; // 0x0
 
-    const char *fileName1;    // 0x4
-    f32 _8;
+    const char* fileName1; // 0x4
+    f32         _8;
 
-    const char *fileName2;    // 0xC
-    f32 _10;
+    const char* fileName2; // 0xC
+    f32         _10;
 
-    const char *fileName3;    // 0x14;
-    f32 _18;
+    const char* fileName3; // 0x14;
+    f32         _18;
 
-    const char *fileName4;    // 0x1C;
-    f32 _20;
+    const char* fileName4; // 0x1C;
+    f32         _20;
 };
 
 // Size is 0x14
 class XanimeOfsInfo {
 public:
-    XanimeBckTable parent;    // 0x0
+    XanimeBckTable parent; // 0x0
 
     f32 _4;
     f32 _8;
@@ -100,9 +100,9 @@ public:
 // size is 0x18
 class XanimeAuxInfo {
 public:
-    XanimeBckTable parent;    // 0x0
+    XanimeBckTable parent; // 0x0
 
-    u8 _4;
+    u8  _4;
     u32 _8;
 
     // Unreferenced members
@@ -113,17 +113,17 @@ class XanimeResourceTable {
 public:
     XanimeResourceTable(
 
-        ResourceHolder *,
+        ResourceHolder*,
 
-        XanimeGroupInfo *, XanimeAuxInfo *, XanimeOfsInfo *,
+        XanimeGroupInfo*, XanimeAuxInfo*, XanimeOfsInfo*,
 
-        XanimeBckTable *, XanimeBckTable *, XanimeBckTable *, XanimeBckTable *,
+        XanimeBckTable*, XanimeBckTable*, XanimeBckTable*, XanimeBckTable*,
 
-        XanimeSwapTable *);
+        XanimeSwapTable*);
 
-    XanimeResourceTable(ResourceHolder *);
+    XanimeResourceTable(ResourceHolder*);
 
-    const XanimeGroupInfo *getGroupInfo(const char *) const;
+    const XanimeGroupInfo* getGroupInfo(const char*) const;
 
     u8 _0[0x78];
 };

include/Game/AreaObj/AreaForm.hpp

@@ -6,8 +6,8 @@
 
 class AreaForm {
 public:
-    virtual void init(const JMapInfoIter &);
-    virtual bool isInVolume(const TVec3f &) const;
+    virtual void init(const JMapInfoIter&);
+    virtual bool isInVolume(const TVec3f&) const;
 
     TPos3f* _4;
 };
@@ -16,67 +16,67 @@ class AreaFormCube : public AreaForm {
 public:
     AreaFormCube(int);
 
-    virtual void init(const JMapInfoIter &);
-    virtual bool isInVolume(const TVec3f &) const;
+    virtual void init(const JMapInfoIter&);
+    virtual bool isInVolume(const TVec3f&) const;
 
-    void calcWorldPos(TVec3f *) const;
-    void calcWorldBox(TDirBox3f *) const;
-    void calcLocalPos(TVec3f *, const TVec3f &) const;
-    f32 getBaseSize();
+    void calcWorldPos(TVec3f*) const;
+    void calcWorldBox(TDirBox3f*) const;
+    void calcLocalPos(TVec3f*, const TVec3f&) const;
+    f32  getBaseSize();
     void updateBoxParam();
-    void calcWorldMtx(TPos3f *) const;
+    void calcWorldMtx(TPos3f*) const;
 
-    int _8;
-    TVec3f mTranslation;            // 0xC
-    TVec3f mRotation;               // 0x18
-    TVec3f mScale;                  // 0x24
-    TBox3f mBounding;               // 0x30
-    Mtx _48;
+    int    _8;
+    TVec3f mTranslation; // 0xC
+    TVec3f mRotation;    // 0x18
+    TVec3f mScale;       // 0x24
+    TBox3f mBounding;    // 0x30
+    Mtx    _48;
 };
 
 class AreaFormSphere : public AreaForm {
 public:
     AreaFormSphere();
 
-    virtual void init(const JMapInfoIter &);
-    virtual bool isInVolume(const TVec3f &) const;
+    virtual void init(const JMapInfoIter&);
+    virtual bool isInVolume(const TVec3f&) const;
 
-    void calcUpVec(TVec3f *) const;
-    void calcPos(TVec3f *) const;
+    void calcUpVec(TVec3f*) const;
+    void calcPos(TVec3f*) const;
 
-    TVec3f mTranslation;    // 0x8
-    f32 _14;
-    TVec3f mUp;             // 0x18
+    TVec3f mTranslation; // 0x8
+    f32    _14;
+    TVec3f mUp; // 0x18
 };
 
 class AreaFormBowl : public AreaForm {
 public:
     AreaFormBowl();
 
-    virtual void init(const JMapInfoIter &);
-    virtual bool isInVolume(const TVec3f &) const;
+    virtual void init(const JMapInfoIter&);
+    virtual bool isInVolume(const TVec3f&) const;
 
-    void calcUpVec(const TVec3f &);
+    void calcUpVec(const TVec3f&);
 
-    TVec3f mTranslation;    // 0x8
-    TVec3f mUp;             // 0x14
-    f32 _20;
+    TVec3f mTranslation; // 0x8
+    TVec3f mUp;          // 0x14
+    f32    _20;
 };
 
 class AreaFormCylinder : public AreaForm {
 public:
     AreaFormCylinder();
 
-    virtual void init(const JMapInfoIter &);
-    virtual bool isInVolume(const TVec3f &) const;
+    virtual void init(const JMapInfoIter&);
+    virtual bool isInVolume(const TVec3f&) const;
 
-    void calcPos(TVec3f *) const;
-    void calcCenterPos(TVec3f *) const;
-    void calcUpVec(TVec3f *) const;
-    void calcDir(const TVec3f &);
+    void calcPos(TVec3f*) const;
+    void calcCenterPos(TVec3f*) const;
+    void calcUpVec(TVec3f*) const;
+    void calcDir(const TVec3f&);
 
-    TVec3f mTranslation;    // 0x8
-    TVec3f mRotation;       // 0x14
-    f32 _20;
-    f32 _24;
+    TVec3f mTranslation; // 0x8
+    TVec3f mRotation;    // 0x14
+    f32    _20;
+    f32    _24;
 };

include/Game/AreaObj/AreaObj.hpp

@@ -11,24 +11,23 @@ class StageSwitchCtrl;
 
 class AreaObj : public NameObj {
 public:
-    AreaObj(int, const char *);
+    AreaObj(int, const char*);
 
     virtual ~AreaObj() {
-
     }
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
 
-    virtual bool isInVolume(const TVec3f &) const;
+    virtual bool        isInVolume(const TVec3f&) const;
     virtual const char* getManagerName() const;
 
-    void onSwitchA();
-    void offSwitchA();
-    bool isOnSwitchA() const;
-    bool isOnSwitchB() const;
-    bool isValidSwitchA() const;
-    bool isValidSwitchB() const;
-    void setFollowMtx(const TPos3f *);
+    void    onSwitchA();
+    void    offSwitchA();
+    bool    isOnSwitchA() const;
+    bool    isOnSwitchB() const;
+    bool    isValidSwitchA() const;
+    bool    isValidSwitchB() const;
+    void    setFollowMtx(const TPos3f*);
     TPos3f* getFollowMtx() const;
 
     void validate();
@@ -39,31 +38,31 @@ public:
     void awake();
     void sleep();
 
-    AreaForm* mForm;              // 0xC
-    int mType;                    // 0x10
-    bool mIsValid;                // 0x14
-    bool _15;
-    bool mIsAwake;                // 0x16
-    s32 mObjArg0;                 // 0x18
-    s32 mObjArg1;                 // 0x1C
-    s32 mObjArg2;                 // 0x20
-    s32 mObjArg3;                 // 0x24
-    s32 mObjArg4;                 // 0x28
-    s32 mObjArg5;                 // 0x2C
-    s32 mObjArg6;                 // 0x30
-    s32 mObjArg7;                 // 0x34
+    AreaForm*        mForm;    // 0xC
+    int              mType;    // 0x10
+    bool             mIsValid; // 0x14
+    bool             _15;
+    bool             mIsAwake;    // 0x16
+    s32              mObjArg0;    // 0x18
+    s32              mObjArg1;    // 0x1C
+    s32              mObjArg2;    // 0x20
+    s32              mObjArg3;    // 0x24
+    s32              mObjArg4;    // 0x28
+    s32              mObjArg5;    // 0x2C
+    s32              mObjArg6;    // 0x30
+    s32              mObjArg7;    // 0x34
     StageSwitchCtrl* mSwitchCtrl; // 0x38
 };
 
 class AreaObjMgr : public NameObj {
 public:
-    AreaObjMgr(s32, const char *);
+    AreaObjMgr(s32, const char*);
 
     virtual ~AreaObjMgr();
 
-    void entry(AreaObj *);
-    AreaObj* find_in(const TVec3f &) const;
+    void     entry(AreaObj*);
+    AreaObj* find_in(const TVec3f&) const;
 
-    MR::Vector<MR::AssignableArray<AreaObj*> > mArray; // 0xC
-    s32 _18;
+    MR::Vector<MR::AssignableArray<AreaObj*>> mArray; // 0xC
+    s32                                       _18;
 };

include/Game/AreaObj/AreaObjContainer.hpp

@@ -6,11 +6,11 @@
 class AreaObj;
 class AreaObjMgr;
 
-typedef AreaObjMgr* (*ManagerCreatorFuncPtr)(s32, const char *);
+typedef AreaObjMgr* (*ManagerCreatorFuncPtr)(s32, const char*);
 
 struct Name2CreateManagerFunc {
-    /* 0x0 */ const char* mName;
-    /* 0x4 */ s32 _4;
+    /* 0x0 */ const char*           mName;
+    /* 0x4 */ s32                   _4;
     /* 0x8 */ ManagerCreatorFuncPtr mCreateFunc;
 };
 
@@ -27,12 +27,12 @@ public:
     /// @param rIter The reference to an iterator over a `JMapInfo`.
     virtual void init(const JMapInfoIter& rIter);
 
-    AreaObjMgr* getManager(const char *) const;
-    AreaObj* getAreaObj(const char *, const TVec3f &) const;
+    AreaObjMgr* getManager(const char*) const;
+    AreaObj*    getAreaObj(const char*, const TVec3f&) const;
 
 private:
     /* 0x00C */ AreaObjMgr* mManagerArray[0x50];
-    /* 0x14C */ u32 mNumManagers;
+    /* 0x14C */ u32         mNumManagers;
 };
 
 namespace MR {

include/Game/AreaObj/AreaObjFollower.hpp

@@ -6,14 +6,14 @@
 
 class AreaObjFollower : public BaseMatrixFollower {
 public:
-    AreaObjFollower(AreaObj *, const JMapInfoIter &);
+    AreaObjFollower(AreaObj*, const JMapInfoIter&);
 
     virtual void update();
 
-    TPos3f mFollowMtx;      // 0x14
-    AreaObj* mObj;          // 0x44
+    TPos3f   mFollowMtx; // 0x14
+    AreaObj* mObj;       // 0x44
 };
 
 namespace MR {
-    bool addBaseMatrixFollowerAreaObj(AreaObj *, const JMapInfoIter &);
+    bool addBaseMatrixFollowerAreaObj(AreaObj*, const JMapInfoIter&);
 };

include/Game/AreaObj/AstroChangeStageCube.hpp

@@ -4,15 +4,14 @@
 
 class AstroChangeStageCube : public AreaObj {
 public:
-    AstroChangeStageCube(int, const char *);
+    AstroChangeStageCube(int, const char*);
 
     virtual ~AstroChangeStageCube() {
-
     }
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void movement();
-    virtual bool isInVolume(const TVec3f &) const;
+    virtual bool isInVolume(const TVec3f&) const;
 
     u32 _3C;
     u32 _40;

include/Game/AreaObj/AudioEffectArea.hpp

@@ -4,14 +4,13 @@
 
 class AudioEffectArea : public AreaObj {
 public:
-    AudioEffectArea(int, const char *);
+    AudioEffectArea(int, const char*);
 
     virtual ~AudioEffectArea() {
-
     }
 
-    virtual void init(const JMapInfoIter &);
-    virtual void movement();
+    virtual void        init(const JMapInfoIter&);
+    virtual void        movement();
     virtual const char* getManagerName() const;
 
     s32 _3C;

include/Game/AreaObj/BgmProhibitArea.hpp

@@ -5,29 +5,28 @@
 
 struct BgmMuteSet {
     const char* mGalaxyName;
-    u32 _4;
-    u32 _8;
+    u32         _4;
+    u32         _8;
 };
 
 namespace {
     static BgmMuteSet sBgmMuteSet[2] = {
-        { "OceanPhantomCaveGalaxy", 7, 1 },
-        { "SoundMapCodeTest", 7, 1 }
-    };
+        {"OceanPhantomCaveGalaxy", 7, 1},
+        {"SoundMapCodeTest", 7, 1}};
 
-    BgmMuteSet* findDataElement(const char *);
-};
+    BgmMuteSet* findDataElement(const char*);
+}; // namespace
 
 class BgmProhibitArea : public AreaObj {
 public:
-    BgmProhibitArea(int, const char *);
+    BgmProhibitArea(int, const char*);
 
     virtual ~BgmProhibitArea();
-    virtual void init(const JMapInfoIter &);
-    virtual void movement();
+    virtual void        init(const JMapInfoIter&);
+    virtual void        movement();
     virtual const char* getManagerName() const;
 
-    u8 _3C;
-    u8 _3D;
+    u8     _3C;
+    u8     _3D;
     TVec3f _40;
 };

include/Game/AreaObj/BigBubbleCameraArea.hpp

@@ -5,19 +5,19 @@
 
 class BigBubbleSwitchArea : public SwitchArea {
 public:
-    BigBubbleSwitchArea(int, const char *);
+    BigBubbleSwitchArea(int, const char*);
     virtual ~BigBubbleSwitchArea();
 
-    virtual bool isInVolume(const TVec3f &) const;
-    virtual const char *getManagerName() const;
+    virtual bool        isInVolume(const TVec3f&) const;
+    virtual const char* getManagerName() const;
 };
 
 class BigBubbleCameraArea : public CubeCameraArea {
 public:
-    BigBubbleCameraArea(int, const char *);
+    BigBubbleCameraArea(int, const char*);
 
     virtual ~BigBubbleCameraArea();
 
-    virtual bool isInVolume(const TVec3f &) const;
+    virtual bool        isInVolume(const TVec3f&) const;
     virtual const char* getManagerName() const;
 };

include/Game/AreaObj/BigBubbleGoalArea.hpp

@@ -6,18 +6,18 @@ class BigBubble;
 
 class BigBubbleGoalArea : public AreaObj {
 public:
-    BigBubbleGoalArea(int, const char *);
+    BigBubbleGoalArea(int, const char*);
     virtual ~BigBubbleGoalArea();
 
-    virtual void init(const JMapInfoIter &);
-    virtual void movement();
-    virtual void draw() const;
-    virtual const char *getManagerName() const;
+    virtual void        init(const JMapInfoIter&);
+    virtual void        movement();
+    virtual void        draw() const;
+    virtual const char* getManagerName() const;
 
-    void addBubble(BigBubble *);
+    void addBubble(BigBubble*);
 
-    TVec3f mTranslation;    // 0x3C
-    f32 _48;
-    f32 _4C;
-    f32 _50;
+    TVec3f mTranslation; // 0x3C
+    f32    _48;
+    f32    _4C;
+    f32    _50;
 };

include/Game/AreaObj/BloomArea.hpp

@@ -4,15 +4,15 @@
 
 class BloomArea : public ImageEffectArea {
 public:
-    BloomArea(int, const char *);
+    BloomArea(int, const char*);
     virtual ~BloomArea();
 
-    virtual void init(const JMapInfoIter &);
-    virtual const char *getManagerName() const;
+    virtual void        init(const JMapInfoIter&);
+    virtual const char* getManagerName() const;
 
-    u8 _40;
-    u8 _41;
-    u8 _42[2];
+    u8  _40;
+    u8  _41;
+    u8  _42[2];
     s32 _44;
     s32 _48;
 };

include/Game/AreaObj/CameraRepulsiveArea.hpp

@@ -4,35 +4,35 @@
 
 class CameraRepulsiveArea : public AreaObj {
 public:
-    inline CameraRepulsiveArea(int type, const char *pName) : AreaObj(type, pName) {
-
+    inline CameraRepulsiveArea(int type, const char* pName)
+        : AreaObj(type, pName) {
     }
 
     virtual ~CameraRepulsiveArea();
 
     virtual const char* getManagerName() const;
 
-    virtual TVec3f getRepulsion(const TVec3f &) = 0;
+    virtual TVec3f getRepulsion(const TVec3f&) = 0;
 };
 
 class CameraRepulsiveSphere : public CameraRepulsiveArea {
 public:
-    inline CameraRepulsiveSphere(const char *pName) : CameraRepulsiveArea(2, pName) {
-
+    inline CameraRepulsiveSphere(const char* pName)
+        : CameraRepulsiveArea(2, pName) {
     }
 
     virtual ~CameraRepulsiveSphere();
 
-    virtual TVec3f getRepulsion(const TVec3f &);
+    virtual TVec3f getRepulsion(const TVec3f&);
 };
 
 class CameraRepulsiveCylinder : public CameraRepulsiveArea {
 public:
-    inline CameraRepulsiveCylinder(const char *pName) : CameraRepulsiveArea(3, pName) {
-
+    inline CameraRepulsiveCylinder(const char* pName)
+        : CameraRepulsiveArea(3, pName) {
     }
 
     virtual ~CameraRepulsiveCylinder();
 
-    virtual TVec3f getRepulsion(const TVec3f &);
+    virtual TVec3f getRepulsion(const TVec3f&);
 };

include/Game/AreaObj/ChangeBgmCube.hpp

@@ -4,10 +4,10 @@
 
 class ChangeBgmCube : public AreaObj {
 public:
-    ChangeBgmCube(int, const char *);
+    ChangeBgmCube(int, const char*);
 
     virtual ~ChangeBgmCube();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void movement();
 
     u8 _3C;

include/Game/AreaObj/CollisionArea.hpp

@@ -8,41 +8,41 @@ public:
     AreaPolygon();
     virtual ~AreaPolygon();
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
 
-    void setMtx(MtxPtr, const TVec3f &, f32 a3);
+    void setMtx(MtxPtr, const TVec3f&, f32 a3);
     void setSurfaceAndSync(s32);
     void setSurface(s32);
     void invalidate();
     void validate();
 
-    u8 _120[4];
-    AreaForm *mForm;    // 0x124
-    MtxPtr _128;
-    TVec3f _12C;
-    f32 _138;
+    u8        _120[4];
+    AreaForm* mForm; // 0x124
+    MtxPtr    _128;
+    TVec3f    _12C;
+    f32       _138;
 };
 
 class CollisionArea : public AreaObj {
 public:
-    CollisionArea(int, const char *);
+    CollisionArea(int, const char*);
     virtual ~CollisionArea();
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void movement();
-    
-    bool hitCheck(const TVec3f &, f32, TVec3f *, TVec3f *);
 
-    u32 _3C;
-    f32 _40;
-    TVec3f _44;
-    s32 _50;
-    s32 _54;
-    bool _58;
-    u8 _59[3];
-    s32 _5C;
-    s32 _60;
-    AreaPolygon *mPolygon;  // 0x64
-    bool mIsValid;          // 0x68
-    u8 _69[3];
+    bool hitCheck(const TVec3f&, f32, TVec3f*, TVec3f*);
+
+    u32          _3C;
+    f32          _40;
+    TVec3f       _44;
+    s32          _50;
+    s32          _54;
+    bool         _58;
+    u8           _59[3];
+    s32          _5C;
+    s32          _60;
+    AreaPolygon* mPolygon; // 0x64
+    bool         mIsValid; // 0x68
+    u8           _69[3];
 };

include/Game/AreaObj/CubeCamera.hpp

@@ -11,20 +11,19 @@ public:
         CATEGORY_UNKNOWN_3 = 3,
         CATEGORY_UNKNOWN_4 = 4
     };
-    
-    CubeCameraArea(int, const char *);
+
+    CubeCameraArea(int, const char*);
 
     virtual ~CubeCameraArea() {
-
     }
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void movement();
-    virtual bool isInVolume(const TVec3f &) const;
-    virtual s32 getCategoryArg() const;
+    virtual bool isInVolume(const TVec3f&) const;
+    virtual s32  getCategoryArg() const;
 
     bool isValidCameraID() const;
-    u16 getCameraID() const;
+    u16  getCameraID() const;
 
     static void setCurrentCategory(s32);
 
@@ -36,7 +35,7 @@ public:
 
 class CubeCameraMgr : public AreaObjMgr {
 public:
-    CubeCameraMgr(s32, const char *);
+    CubeCameraMgr(s32, const char*);
 
     virtual ~CubeCameraMgr();
 

include/Game/AreaObj/DeathArea.hpp

@@ -5,12 +5,12 @@
 
 class DeathArea : public AreaObj {
 public:
-    DeathArea(int, const char *);
+    DeathArea(int, const char*);
 
     virtual ~DeathArea();
-    virtual void init(const JMapInfoIter &);
-    virtual void movement();
-    virtual bool isInVolume(const TVec3f &) const;
+    virtual void        init(const JMapInfoIter&);
+    virtual void        movement();
+    virtual bool        isInVolume(const TVec3f&) const;
     virtual const char* getManagerName() const;
 
     s32 getDeathType() const NO_INLINE;

include/Game/AreaObj/DepthOfFieldArea.hpp

@@ -4,11 +4,11 @@
 
 class DepthOfFieldArea : public ImageEffectArea {
 public:
-    DepthOfFieldArea(int, const char *);
+    DepthOfFieldArea(int, const char*);
     virtual ~DepthOfFieldArea();
 
-    virtual void init(const JMapInfoIter &);
-    virtual const char *getManagerName() const;
+    virtual void        init(const JMapInfoIter&);
+    virtual const char* getManagerName() const;
 
     virtual bool isSyncWithPlayer() const;
 
@@ -17,5 +17,5 @@ public:
     s32 getBlurMinDist() const;
 
     bool mIsPlayerSync; // 0x40
-    u8 _41[3];
+    u8   _41[3];
 };

include/Game/AreaObj/FollowCollisionArea.hpp

@@ -7,22 +7,22 @@ class AreaPolygon;
 
 class FollowCollisionArea : public NameObj {
 public:
-    FollowCollisionArea(const TVec3f &, MtxPtr, f32);
+    FollowCollisionArea(const TVec3f&, MtxPtr, f32);
 
     virtual ~FollowCollisionArea();
     virtual void movement();
 
-    u32 _C;
-    f32 _10;
-    u32 _14;
-    u32 _18;
-    u32 _1C;
-    s32 _20;
-    s32 _24;
-    u8 _28;
-    u32 _2C;
+    u32          _C;
+    f32          _10;
+    u32          _14;
+    u32          _18;
+    u32          _1C;
+    s32          _20;
+    s32          _24;
+    u8           _28;
+    u32          _2C;
     AreaPolygon* _30;
-    MtxPtr _34;
-    TVec3f _38;
-    f32 _44;
+    MtxPtr       _34;
+    TVec3f       _38;
+    f32          _44;
 };

include/Game/AreaObj/GlaringLightArea.hpp

@@ -6,21 +6,21 @@ class AudSoundObject;
 
 class GlaringLightArea : public AreaObj {
 public:
-    GlaringLightArea(int, const char *);
+    GlaringLightArea(int, const char*);
     virtual ~GlaringLightArea();
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void movement();
 
-    virtual const char *getManagerName() const;
+    virtual const char* getManagerName() const;
 
-    AudSoundObject *mSound; // 0x3C
-    TVec3f mPos;            // 0x40
+    AudSoundObject* mSound; // 0x3C
+    TVec3f          mPos;   // 0x40
 };
 
 class GlaringLightAreaMgr : public AreaObjMgr {
 public:
-    GlaringLightAreaMgr(s32, const char *);
+    GlaringLightAreaMgr(s32, const char*);
 
     virtual ~GlaringLightAreaMgr();
 };

include/Game/AreaObj/HazeCube.hpp

@@ -4,11 +4,11 @@
 
 class HazeCube : public AreaObj {
 public:
-    HazeCube(int, const char *);
+    HazeCube(int, const char*);
     virtual ~HazeCube();
 
-    virtual void init(const JMapInfoIter &);
-    virtual const char *getManagerName() const;
+    virtual void        init(const JMapInfoIter&);
+    virtual const char* getManagerName() const;
 
     f32 _3C;
 };

include/Game/AreaObj/ImageEffectArea.hpp

@@ -11,23 +11,21 @@ public:
         IMAGE_EFFECT_TYPE_DOF = 3
     };
 
-    ImageEffectArea(EImageEffectType, int, const char *);
+    ImageEffectArea(EImageEffectType, int, const char*);
 
     virtual ~ImageEffectArea() {
-
     }
 
-
     virtual bool isSyncWithPlayer() const {
         return false;
     }
 
-    s32 mEffectType;    // 0x3C
+    s32 mEffectType; // 0x3C
 };
 
 class ImageEffectAreaMgr : public AreaObjMgr {
 public:
-    ImageEffectAreaMgr(s32, const char *);
+    ImageEffectAreaMgr(s32, const char*);
 
     virtual ~ImageEffectAreaMgr();
     virtual void initAfterPlacement();

include/Game/AreaObj/LightArea.hpp

@@ -4,12 +4,12 @@
 
 class LightArea : public AreaObj {
 public:
-    LightArea(int, const char *);
+    LightArea(int, const char*);
 
     virtual ~LightArea();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
 
     virtual const char* getManagerName() const;
 
-    s32 mPlacedZoneID;  // 0x3C
+    s32 mPlacedZoneID; // 0x3C
 };

include/Game/AreaObj/LightAreaHolder.hpp

@@ -7,11 +7,11 @@ class ZoneLightID;
 
 class LightAreaHolder : public AreaObjMgr {
 public:
-    LightAreaHolder(s32, const char *);
+    LightAreaHolder(s32, const char*);
 
     virtual ~LightAreaHolder();
     virtual void initAfterPlacement();
 
-    bool tryFindLightID(const TVec3f &, ZoneLightID *) const;
+    bool tryFindLightID(const TVec3f&, ZoneLightID*) const;
     void sort();
 };

include/Game/AreaObj/MercatorTransformCube.hpp

@@ -5,23 +5,23 @@
 
 class MercatorTransformCube : public AreaObj {
 public:
-    MercatorTransformCube(int, const char *);
+    MercatorTransformCube(int, const char*);
     virtual ~MercatorTransformCube();
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
 
-    void convertTransAndRotate(TVec3f *, TPos3f *, const TVec3f &, bool) const;
-    f32 getSphereRadius() const;
-    void calcUV(TVec2f *, const TVec3f &) const;
-    void calcLocalBoxSize(TVec3f *) const;
+    void convertTransAndRotate(TVec3f*, TPos3f*, const TVec3f&, bool) const;
+    f32  getSphereRadius() const;
+    void calcUV(TVec2f*, const TVec3f&) const;
+    void calcLocalBoxSize(TVec3f*) const;
 
     TMtx34f _3C;
 };
 
 namespace MR {
-    void initDefaultPosForMercator(LiveActor *, const JMapInfoIter &, bool);
+    void initDefaultPosForMercator(LiveActor*, const JMapInfoIter&, bool);
 
-    void convertMercatorPlaneToSphereTransAndRotate(TVec3f *, TPos3f *, const TVec3f &, bool);
+    void convertMercatorPlaneToSphereTransAndRotate(TVec3f*, TPos3f*, const TVec3f&, bool);
 
-    MapPartsRailMover* createMapPartsRailMoverForMercator(LiveActor *, const JMapInfoIter &, bool);
-};
+    MapPartsRailMover* createMapPartsRailMoverForMercator(LiveActor*, const JMapInfoIter&, bool);
+}; // namespace MR

include/Game/AreaObj/MessageArea.hpp

@@ -4,10 +4,10 @@
 
 class MessageArea : public AreaObj {
 public:
-    MessageArea(int, const char *);
+    MessageArea(int, const char*);
     ~MessageArea();
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
 
-    s32 mZoneID;    // 0x3C
+    s32 mZoneID; // 0x3C
 };

include/Game/AreaObj/PlayerSeArea.hpp

@@ -4,12 +4,12 @@
 
 class PlayerSeArea : public AreaObj {
 public:
-    PlayerSeArea(int, const char *);
+    PlayerSeArea(int, const char*);
     virtual ~PlayerSeArea();
 
-    virtual void init(const JMapInfoIter &);
-    virtual void movement();
-    virtual const char *getManagerName() const;
+    virtual void        init(const JMapInfoIter&);
+    virtual void        movement();
+    virtual const char* getManagerName() const;
 
     s32 _3C;
 };

include/Game/AreaObj/QuakeEffectArea.hpp

@@ -4,6 +4,6 @@
 
 class QuakeEffectArea : public AreaObj {
 public:
-    QuakeEffectArea(int, const char *);
+    QuakeEffectArea(int, const char*);
     virtual ~QuakeEffectArea();
 };

include/Game/AreaObj/RestartCube.hpp

@@ -6,17 +6,17 @@ class JMapIdInfo;
 
 class RestartCube : public AreaObj {
 public:
-    RestartCube(int, const char *);
+    RestartCube(int, const char*);
     virtual ~RestartCube();
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
 
     void updatePlayerRestartIdInfo();
     void changeBgm();
 
-    JMapIdInfo *mIdInfo;    // 0x3C
-    s32 _40;
-    s32 _44;
-    bool _48;
-    u8 _49[3];
+    JMapIdInfo* mIdInfo; // 0x3C
+    s32         _40;
+    s32         _44;
+    bool        _48;
+    u8          _49[3];
 };

include/Game/AreaObj/ScreenBlurArea.hpp

@@ -4,15 +4,15 @@
 
 class ScreenBlurArea : public ImageEffectArea {
 public:
-    ScreenBlurArea(int, const char *);
+    ScreenBlurArea(int, const char*);
     virtual ~ScreenBlurArea();
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
 
-    virtual const char *getManagerName() const;
+    virtual const char* getManagerName() const;
 
     virtual bool isSyncWithPlayer() const;
 
     bool mIsPlayerSync;
-    u8 _41[3];
+    u8   _41[3];
 };

include/Game/AreaObj/SimpleBloomArea.hpp

@@ -4,15 +4,15 @@
 
 class SimpleBloomArea : public ImageEffectArea {
 public:
-    SimpleBloomArea(int, const char *);
+    SimpleBloomArea(int, const char*);
     virtual ~SimpleBloomArea();
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
 
-    virtual const char *getManagerName() const;
+    virtual const char* getManagerName() const;
 
     u32 _40;
-    u8 _44;
-    u8 _45;
-    u8 _46[2];
+    u8  _44;
+    u8  _45;
+    u8  _46[2];
 };

include/Game/AreaObj/SoundEmitterCube.hpp

@@ -6,13 +6,13 @@ class AudAnmSoundObject;
 
 class SoundEmitterCube : public AreaObj {
 public:
-    SoundEmitterCube(int, const char *);
+    SoundEmitterCube(int, const char*);
     virtual ~SoundEmitterCube();
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void movement();
 
-    AudAnmSoundObject *mSoundObj;   // 0x3C
-    TVec3f _40;
-    const char *mSoundName;         // 0x4C
+    AudAnmSoundObject* mSoundObj; // 0x3C
+    TVec3f             _40;
+    const char*        mSoundName; // 0x4C
 };

include/Game/AreaObj/SoundEmitterSphere.hpp

@@ -6,14 +6,14 @@ class AudAnmSoundObject;
 
 class SoundEmitterSphere : public AreaObj {
 public:
-    SoundEmitterSphere(int, const char *);
+    SoundEmitterSphere(int, const char*);
     virtual ~SoundEmitterSphere();
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void movement();
 
-    AudAnmSoundObject *mSoundObj;   // 0x3C
-    TVec3f _40;
-    const char *mSoundName;         // 0x4C
-    s32 mSoundIndex;                // 0x50
+    AudAnmSoundObject* mSoundObj; // 0x3C
+    TVec3f             _40;
+    const char*        mSoundName;  // 0x4C
+    s32                mSoundIndex; // 0x50
 };

include/Game/AreaObj/SpinGuidanceArea.hpp

@@ -4,8 +4,8 @@
 
 class SpinGuidanceArea : public AreaObj {
 public:
-    SpinGuidanceArea(int, const char *);
+    SpinGuidanceArea(int, const char*);
     virtual ~SpinGuidanceArea();
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
 };

include/Game/AreaObj/SunLightArea.hpp

@@ -4,8 +4,8 @@
 
 class SunLightArea : public AreaObj {
 public:
-    SunLightArea(int, const char *);
+    SunLightArea(int, const char*);
     virtual ~SunLightArea();
 
-    virtual const char *getManagerName() const;
+    virtual const char* getManagerName() const;
 };

include/Game/AreaObj/SwitchArea.hpp

@@ -4,11 +4,11 @@
 
 class SwitchArea : public AreaObj {
 public:
-    SwitchArea(int, const char *);
+    SwitchArea(int, const char*);
+
+    virtual void        init(const JMapInfoIter&);
+    virtual void        movement();
+    virtual const char* getManagerName() const;
 
-    virtual void init(const JMapInfoIter &);
-    virtual void movement();
-    virtual const char *getManagerName() const;
-            
     bool isUpdate() const;
 };

include/Game/AreaObj/WarpCube.hpp

@@ -7,36 +7,37 @@ class JMapIdInfo;
 
 class WarpCube : public AreaObj {
 public:
-    inline WarpCube(int type, const char *pName) : AreaObj(type, pName) {
+    inline WarpCube(int type, const char* pName)
+        : AreaObj(type, pName) {
         mMapIdInfo = nullptr;
     }
 
     virtual ~WarpCube();
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void movement();
     virtual void draw() const;
 
-    JMapIdInfo *mMapIdInfo;         // 0x3C
-    ActorCameraInfo *mCameraInfo;   // 0x40
-    char *mEventName;               // 0x44
-    u16 _48;
-    u8 _4A[2];
+    JMapIdInfo*      mMapIdInfo;  // 0x3C
+    ActorCameraInfo* mCameraInfo; // 0x40
+    char*            mEventName;  // 0x44
+    u16              _48;
+    u8               _4A[2];
 };
 
 class WarpCubeMgr : public AreaObjMgr {
 public:
-    inline WarpCubeMgr(s32 type, const char *pName) : AreaObjMgr(type, pName) {
+    inline WarpCubeMgr(s32 type, const char* pName)
+        : AreaObjMgr(type, pName) {
         mWarpCube = 0;
     }
 
     virtual ~WarpCubeMgr() {
-        
     }
 
-    void setInvalidateTimer(AreaObj *, u16);
-    void startEventCamera(const AreaObj *);
+    void setInvalidateTimer(AreaObj*, u16);
+    void startEventCamera(const AreaObj*);
     void endEventCamera();
 
-    const WarpCube* mWarpCube;      // 0x1C
+    const WarpCube* mWarpCube; // 0x1C
 };

include/Game/AreaObj/WaterArea.hpp

@@ -4,17 +4,17 @@
 
 class WaterArea : public AreaObj {
 public:
-    WaterArea(int, const char *);
+    WaterArea(int, const char*);
     virtual ~WaterArea();
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
 
     s32 _3C;
 };
 
 class WaterAreaMgr : public AreaObjMgr {
 public:
-    WaterAreaMgr(s32, const char *);
+    WaterAreaMgr(s32, const char*);
 
     virtual ~WaterAreaMgr();
 };

include/Game/AudioLib/AudAnmSoundObject.hpp

@@ -9,16 +9,16 @@ class JAUSoundAnimationSound;
 
 class AudAnmSoundObject : public AudSoundObject, JAUSoundAnimator {
 public:
-    AudAnmSoundObject(TVec3f *, u8, JKRHeap *);
+    AudAnmSoundObject(TVec3f*, u8, JKRHeap*);
 
     void update(f32);
-    void modifySoundParams(JASSoundParams *, const JAUSoundAnimationSound *, f32);
-    void playsSound(const JAUSoundAnimationSound *, const TVec3f &, f32);
-    s32 getSoundID(const JAUSoundAnimationSound *, const TVec3f &, f32);
-    u32* getFreeHandle(const JAUSoundAnimationSound *);
+    void modifySoundParams(JASSoundParams*, const JAUSoundAnimationSound*, f32);
+    void playsSound(const JAUSoundAnimationSound*, const TVec3f&, f32);
+    s32  getSoundID(const JAUSoundAnimationSound*, const TVec3f&, f32);
+    u32* getFreeHandle(const JAUSoundAnimationSound*);
     void skip(f32);
     void setStartPos(f32);
-    void updateAnimSound(f32, const TVec3f &, JAISoundStarter *);
-    void startAnimSound(const TVec3f &, f32, JAISoundStarter *);
-    void releaseHandleIfNecessary(JAISoundHandle *, u32);
+    void updateAnimSound(f32, const TVec3f&, JAISoundStarter*);
+    void startAnimSound(const TVec3f&, f32, JAISoundStarter*);
+    void releaseHandleIfNecessary(JAISoundHandle*, u32);
 };

include/Game/AudioLib/AudEffector.hpp

@@ -7,7 +7,7 @@ class AudEffector {
 public:
     AudEffector();
 
-    void initFxLine(JKRHeap *);
+    void initFxLine(JKRHeap*);
     void setFxSend(f32);
     void setCutoff(s32);
     void setSpecialFx(s32);

include/Game/AudioLib/AudRemixMgr.hpp

@@ -5,29 +5,29 @@
 
 class JKRHeap;
 struct RemixTrack {
-    s32 _0;
-    u32 *_4;
+    s32  _0;
+    u32* _4;
 };
 
 struct RemixNoteGroupData {
-    /* 0x0  */ s32 mIndex;
-    /* 0x4  */ s32 mTrackCount;
-    /* 0x8  */ u32 mNoteCount;
-    u32 *_C;
-    /* 0x10 */ RemixTrack *mRemixTracks;
+    /* 0x0  */ s32         mIndex;
+    /* 0x4  */ s32         mTrackCount;
+    /* 0x8  */ u32         mNoteCount;
+    u32*                   _C;
+    /* 0x10 */ RemixTrack* mRemixTracks;
 };
 
 class AudRemixMgr {
 public:
-    AudRemixMgr(JKRHeap *pHeap);
-    void init();
-    void update();
-    void setRemixSeqResource(void *ptr);
-    RemixNoteGroupData *getRemixNoteGroupDataFromMelodyNo(s32 melodyNo) const;
+    AudRemixMgr(JKRHeap* pHeap);
+    void                init();
+    void                update();
+    void                setRemixSeqResource(void* ptr);
+    RemixNoteGroupData* getRemixNoteGroupDataFromMelodyNo(s32 melodyNo) const;
 
-    /* 0x0  */ JKRHeap *mHeap;
-    /* 0x4  */ RemixNoteGroupData *mGroups;
-    /* 0x8  */ s32 mGroupCount;
-    /* 0xC  */ AudSoundObject *mSoundObj;
-    /* 0x10 */ AudRemixSequencer *mRemixSeq;
+    /* 0x0  */ JKRHeap*            mHeap;
+    /* 0x4  */ RemixNoteGroupData* mGroups;
+    /* 0x8  */ s32                 mGroupCount;
+    /* 0xC  */ AudSoundObject*     mSoundObj;
+    /* 0x10 */ AudRemixSequencer*  mRemixSeq;
 };

include/Game/AudioLib/AudRemixSequencer.hpp

@@ -16,25 +16,25 @@ struct RemixNoteData {
 class AudRmxSeqNoteOnTimer {
 public:
     AudRmxSeqNoteOnTimer();
-    void initData();
-    void setData(const RemixNoteTrackData*, const RemixNoteData*);
-    bool update(f32);
-    JAISoundID getFreeSeID();
-    f32 _0;
-    f32 _4;
-    const RemixNoteData *_8;
-    const RemixNoteTrackData *_C;
+    void                      initData();
+    void                      setData(const RemixNoteTrackData*, const RemixNoteData*);
+    bool                      update(f32);
+    JAISoundID                getFreeSeID();
+    f32                       _0;
+    f32                       _4;
+    const RemixNoteData*      _8;
+    const RemixNoteTrackData* _C;
 };
 
 class AudRemixSequencer {
 public:
     AudRemixSequencer();
-    void initNoteOnBuff();
-    void update();
-    void setTempo(f32) NO_INLINE;
-    AudRmxSeqNoteOnTimer *newNoteOnTimer();
-    void addNoteData(const RemixNoteTrackData*, const RemixNoteData*);
-    AudRmxSeqNoteOnTimer _0[0x20];
-    f32 _200;
-    f32 _204;
+    void                  initNoteOnBuff();
+    void                  update();
+    void                  setTempo(f32) NO_INLINE;
+    AudRmxSeqNoteOnTimer* newNoteOnTimer();
+    void                  addNoteData(const RemixNoteTrackData*, const RemixNoteData*);
+    AudRmxSeqNoteOnTimer  _0[0x20];
+    f32                   _200;
+    f32                   _204;
 };

include/Game/AudioLib/AudSoundNameConverter.hpp

@@ -4,9 +4,8 @@
 
 class JAISoundID;
 
-class AudSoundNameConverter
-{
+class AudSoundNameConverter {
 public:
-    JAISoundID getSoundID(const char *) const;
-    JAISoundID getSoundID(const char *, u32) const;
+    JAISoundID getSoundID(const char*) const;
+    JAISoundID getSoundID(const char*, u32) const;
 };

include/Game/AudioLib/AudSoundObject.hpp

@@ -8,20 +8,20 @@ class JKRHeap;
 
 class AudSoundObject : public JAUSoundObject, JKRDisposer {
 public:
-    AudSoundObject(TVec3f *, u8, JKRHeap *);
+    AudSoundObject(TVec3f*, u8, JKRHeap*);
     virtual ~AudSoundObject();
 
-    virtual JAISoundHandle *startSound(JAISoundID);
-    virtual JAISoundHandle *startLevelSound(JAISoundID);
+    virtual JAISoundHandle* startSound(JAISoundID);
+    virtual JAISoundHandle* startLevelSound(JAISoundID);
 
     void addToSoundObjHolder();
-    void setTrans(TVec3f *);
-    void writePort(JAISoundHandle *, u32, u16);
+    void setTrans(TVec3f*);
+    void writePort(JAISoundHandle*, u32, u16);
     void isLimitedSound(JAISoundID);
-    void startLevelSound(const char *);
+    void startLevelSound(const char*);
     void startSoundParam(JAISoundID, s32, s32);
     void startLevelSoundParam(JAISoundID, s32, s32);
-    void startLevelSoundParam(const char *, s32, s32);
+    void startLevelSoundParam(const char*, s32, s32);
     void modifyLimitedSound(JAISoundID);
     void isPlayingID(JAISoundID);
     void releaseHandle(JAISoundID);
@@ -29,22 +29,22 @@ public:
     void setMapCodeExtra(s32);
     void getMapCode() const;
     void clearMapCode();
-    void convertNameToLevelSEID(const char *);
+    void convertNameToLevelSEID(const char*);
     void limitVoiceOne(JAISoundID);
     void stopCategorySound(u32, u32);
-    void setMapCodeToPort(JAISoundHandle *, JAISoundID);
-    void setCutoffToPort(JAISoundHandle *, JAISoundID);
+    void setMapCodeToPort(JAISoundHandle*, JAISoundID);
+    void setCutoffToPort(JAISoundHandle*, JAISoundID);
     void convertSoundIdFromSeVersion(JAISoundID) const;
-    void modifySe_Kawamura(JAISoundHandle *, s32);
+    void modifySe_Kawamura(JAISoundHandle*, s32);
     void modifyLimitedSound_Kawamura(JAISoundID);
-    void modifySe_Takezawa(JAISoundHandle *, s32, s32);
+    void modifySe_Takezawa(JAISoundHandle*, s32, s32);
     void modifyLimitedSound_Takezawa(JAISoundID);
-    void modifySe_Gohara(JAISoundHandle *, s32, s32);
+    void modifySe_Gohara(JAISoundHandle*, s32, s32);
 
-    u32 _30;
-    u32 _34;
-    u32 _38;
-    void *mHashDatas;   // 0x3C
-    JKRHeap *mHeap;     // 0x40
-    u32 _44;
+    u32      _30;
+    u32      _34;
+    u32      _38;
+    void*    mHashDatas; // 0x3C
+    JKRHeap* mHeap;      // 0x40
+    u32      _44;
 };

include/Game/AudioLib/AudSpeakerWrap.hpp

@@ -4,6 +4,6 @@
 
 class AudSpeakerWrap {
 public:
-    static u32 getRequiredHeapSize();
+    static u32         getRequiredHeapSize();
     static const char* getResName();
 };

include/Game/AudioLib/AudSystem.hpp

@@ -9,7 +9,6 @@ class JKRArchive;
 
 class AudSystem : public JAUSoundMgr {
 public:
-
     inline void setVar(u32 var) {
         _830 = var;
     }
@@ -21,19 +20,19 @@ public:
         return mAudEffector;
     }
 
-    u8 _814;
-    u8 _815;
-    u8 _816;
-    JASAudioReseter mReseter;       // 0x818
-    u8 _828;
-    u8 _829;
-    u8 _82A;
-    u8 _82B;
-    u8 _82C;
-    u32 _830;
-    u32 _834;
-    u32 _838;
-    u32 _83C;
-    u8 _840[0xAC8];
-    AudEffector* mAudEffector;      // 0x1308
+    u8              _814;
+    u8              _815;
+    u8              _816;
+    JASAudioReseter mReseter; // 0x818
+    u8              _828;
+    u8              _829;
+    u8              _82A;
+    u8              _82B;
+    u8              _82C;
+    u32             _830;
+    u32             _834;
+    u32             _838;
+    u32             _83C;
+    u8              _840[0xAC8];
+    AudEffector*    mAudEffector; // 0x1308
 };

include/Game/AudioLib/AudSystemWrapper.hpp

@@ -10,7 +10,7 @@ class AudSystem;
 
 class AudSystemWrapper {
 public:
-    AudSystemWrapper(JKRSolidHeap *, JKRHeap *);
+    AudSystemWrapper(JKRSolidHeap*, JKRHeap*);
 
     void createAudioSystem();
     bool isResetDone();
@@ -21,17 +21,17 @@ public:
 
     void updateAudioSystem();
 
-    AudSystem* mSystem;                 // 0x0
+    AudSystem*    mSystem; // 0x0
     JKRSolidHeap* _4;
-    JKRHeap* _8;
-    void* mSMRData;                     // 0xC
-    JKRArchive* mJaiSeqArchive;         // 0x10
-    JKRArchive* mJaiCordArchive;        // 0x14
-    JKRArchive* mJaiMeArchive;          // 0x18
-    JKRArchive* mJaiRemixSeqArchive;    // 0x1C
-    JKRExpHeap* _20;
-    void* mSpeakerData;                 // 0x24
-    u8 _28;
-    u8 _29;
-    u8 _2A;
+    JKRHeap*      _8;
+    void*         mSMRData;            // 0xC
+    JKRArchive*   mJaiSeqArchive;      // 0x10
+    JKRArchive*   mJaiCordArchive;     // 0x14
+    JKRArchive*   mJaiMeArchive;       // 0x18
+    JKRArchive*   mJaiRemixSeqArchive; // 0x1C
+    JKRExpHeap*   _20;
+    void*         mSpeakerData; // 0x24
+    u8            _28;
+    u8            _29;
+    u8            _2A;
 };

include/Game/AudioLib/AudWrap.hpp

@@ -9,7 +9,7 @@
 // temp
 class AudBgmMgr {
 public:
-    u8 _0[0x10];
+    u8  _0[0x10];
     u32 _10;
 };
 
@@ -18,7 +18,7 @@ class AudSceneMgr;
 class AudWrap {
 public:
     static AudBgmMgr* getBgmMgr();
-    static AudBgm* getStageBgm();
+    static AudBgm*    getStageBgm();
 
     static AudSystem* getSystem();
 
@@ -28,7 +28,7 @@ public:
 
     static void startStageBgm(u32, bool);
 
-    static AudRemixSequencer *getRemixSequencer();
-    static AudSoundObject *getRemixSeqObject();
-    static AudSoundObject *getSystemSeObject();
+    static AudRemixSequencer* getRemixSequencer();
+    static AudSoundObject*    getRemixSeqObject();
+    static AudSoundObject*    getSystemSeObject();
 };

include/Game/Boss/BossAccessor.hpp

@@ -28,5 +28,5 @@ private:
 
 namespace BossAccess {
     Koopa* getBossAccessorKoopa();
-    void setBossAccessorKoopa(Koopa* pKoopa);
-};
+    void   setBossAccessorKoopa(Koopa* pKoopa);
+}; // namespace BossAccess

include/Game/Boss/BossBegomanHead.hpp

@@ -2,16 +2,16 @@
 
 #include "Game/LiveActor/PartsModel.hpp"
 
-template<typename T>
+template <typename T>
 class JointControlDelegator;
 class JointControllerInfo;
 
 class BossBegomanHead : public PartsModel {
 public:
-    BossBegomanHead(LiveActor *, MtxPtr);
+    BossBegomanHead(LiveActor*, MtxPtr);
 
     virtual ~BossBegomanHead();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void calcAndSetBaseMtx();
 
     bool isSwitchOn();
@@ -29,9 +29,9 @@ public:
     void exeSwitchOff();
     void exeTurn();
     void exeTurnEnd();
-    bool calcJointEdge(TPos3f *, const JointControllerInfo &);
+    bool calcJointEdge(TPos3f*, const JointControllerInfo&);
 
 private:
-    /* 0x9C */ f32 _9C;
+    /* 0x9C */ f32                                     _9C;
     /* 0xA0 */ JointControlDelegator<BossBegomanHead>* mJointDelegator;
 };

include/Game/Boss/BossKameck.hpp

@@ -14,51 +14,52 @@ class BossKameckBeamEventListener;
 
 class BossKameck : public LiveActor {
 public:
-    BossKameck(const char *, const char *);
+    BossKameck(const char*, const char*);
 
     virtual ~BossKameck();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void makeActorDead();
     virtual void control();
     virtual void calcAndSetBaseMtx();
-    virtual void attackSensor(HitSensor *, HitSensor *);
-    virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *);
+    virtual void attackSensor(HitSensor*, HitSensor*);
+    virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*);
 
     BossKameckMoveRail* getMoveRail(s32);
-    void startSequence();
-    void startDemoAppearKameck();
-    void endDemoAppearKameck();
-    void appearKameck();
-    void deadKameck();
-    s32 getLivingKameckNum() const;
-    void appearStarPieceToPlayer(s32);
-    void endDemo();
-    void setPose(MtxPtr);
-    void killAllBeam();
-    void updatePose();
-    void initKameckHolder(const JMapInfoIter &);
-    void initMoveRail(const JMapInfoIter &);
-    void appearStarPieceToUp(s32);
-    void startDemo();
-    void hitBeam(s32);
+    void                startSequence();
+    void                startDemoAppearKameck();
+    void                endDemoAppearKameck();
+    void                appearKameck();
+    void                deadKameck();
+    s32                 getLivingKameckNum() const;
+    void                appearStarPieceToPlayer(s32);
+    void                endDemo();
+    void                setPose(MtxPtr);
+    void                killAllBeam();
+    void                updatePose();
+    void                initKameckHolder(const JMapInfoIter&);
+    void                initMoveRail(const JMapInfoIter&);
+    void                appearStarPieceToUp(s32);
+    void                startDemo();
+    void                hitBeam(s32);
 
-    const char* _8C;
-    TQuat4f _90;
-    TVec3f _A0;
-    BossKameckSequencer* mSequencer;                // 0xAC
-    KameckHolder* mKameckHolder;                    // 0xB0
-    ActorJointCtrl* mJointCtrl;                     // 0xB4
-    ActiveActorList* mActorList;                    // 0xB8
-    BossKameckBeamEventListener* mBeamListener;     // 0xBC
-    BossKameckMoveRail** mMoveRail;                 // 0xC0
-    s32 _C4;
-    TVec3f _C8;
-    s32 _D4;
+    const char*                  _8C;
+    TQuat4f                      _90;
+    TVec3f                       _A0;
+    BossKameckSequencer*         mSequencer;    // 0xAC
+    KameckHolder*                mKameckHolder; // 0xB0
+    ActorJointCtrl*              mJointCtrl;    // 0xB4
+    ActiveActorList*             mActorList;    // 0xB8
+    BossKameckBeamEventListener* mBeamListener; // 0xBC
+    BossKameckMoveRail**         mMoveRail;     // 0xC0
+    s32                          _C4;
+    TVec3f                       _C8;
+    s32                          _D4;
 };
 
 class BossKameckBeamEventListener : public KameckBeamEventListener {
 public:
-    inline BossKameckBeamEventListener(BossKameck *pBoss) : KameckBeamEventListener() {
+    inline BossKameckBeamEventListener(BossKameck* pBoss)
+        : KameckBeamEventListener() {
         mBossKameck = pBoss;
     }
 
@@ -66,10 +67,10 @@ public:
         mBossKameck->hitBeam(type);
     }
 
-    BossKameck* mBossKameck;        // 0x4
+    BossKameck* mBossKameck; // 0x4
 };
 
 namespace MR {
-    NameObj* createBossKameck1(const char *);
-    NameObj* createBossKameck2(const char *);
-};
+    NameObj* createBossKameck1(const char*);
+    NameObj* createBossKameck2(const char*);
+}; // namespace MR

include/Game/Boss/BossKameckAction.hpp

@@ -7,14 +7,14 @@ class BossKameck;
 
 class BossKameckAction : public ActorStateBase<BossKameck> {
 public:
-    BossKameckAction(const char *, BossKameck *);
+    BossKameckAction(const char*, BossKameck*);
 
     virtual ~BossKameckAction();
-    virtual void attackSensor(HitSensor *, HitSensor *);
-    virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *);
-    virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *);
-    virtual bool receiveMsgPush(HitSensor *, HitSensor *);
-    virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *);
+    virtual void attackSensor(HitSensor*, HitSensor*);
+    virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*);
+    virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*);
+    virtual bool receiveMsgPush(HitSensor*, HitSensor*);
+    virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*);
 
-    BossKameck* mBossKameck;            // 0xC
+    BossKameck* mBossKameck; // 0xC
 };

include/Game/Boss/BossKameckBarrier.hpp

@@ -4,13 +4,13 @@
 
 class BossKameckBarrier : public LiveActor {
 public:
-    BossKameckBarrier(const char *, const char *);
+    BossKameckBarrier(const char*, const char*);
 
     virtual ~BossKameckBarrier();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void control();
 
     void exeWait();
 
-    const char* mBossName;          // 0x8C
+    const char* mBossName; // 0x8C
 };

include/Game/Boss/BossKameckBattleDemo.hpp

@@ -11,21 +11,21 @@ public:
     BossKameckDemoPosition();
 
     virtual ~BossKameckDemoPosition();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
 
-    ActorCameraInfo* mCameraInfo;           // 0x8C
+    ActorCameraInfo* mCameraInfo; // 0x8C
 };
 
 class BossKameckBattleDemo : public BossKameckAction {
 public:
-    BossKameckBattleDemo(BossKameck *, const JMapInfoIter &);
+    BossKameckBattleDemo(BossKameck*, const JMapInfoIter&);
 
     virtual ~BossKameckBattleDemo();
     virtual void init();
     virtual void appear();
     virtual void kill();
 
-    void startTryDemo(const char *, const Nerve *);
+    void startTryDemo(const char*, const Nerve*);
     void exeTryStartDemo();
     void startDemoAppearVs1();
     void startDemoAppearVs2();
@@ -43,7 +43,7 @@ public:
     void exeDownVs2();
     void updateCastPose();
 
-    BossKameckDemoPosition* mDemoPos;           // 0x10
-    const Nerve* mDemoNerve;                    // 0x14
-    const char* mCurDemoName;                   // 0x18
+    BossKameckDemoPosition* mDemoPos;     // 0x10
+    const Nerve*            mDemoNerve;   // 0x14
+    const char*             mCurDemoName; // 0x18
 };

include/Game/Boss/BossKameckBattlePattarn.hpp

@@ -4,14 +4,14 @@
 
 class BossKameckBattlePattarn {
 public:
-    BossKameckBattlePattarn(s32 *, bool);
+    BossKameckBattlePattarn(s32*, bool);
 
-    void initPattarn(s32 *);
-    s32 goNextPattarn();
+    void initPattarn(s32*);
+    s32  goNextPattarn();
 
     s32* _0;
-    s32 _4;
-    u32 _8;
-    s32 _C;
+    s32  _4;
+    u32  _8;
+    s32  _C;
     bool _10;
 };

include/Game/Boss/BossKameckMoveRail.hpp

@@ -4,16 +4,16 @@
 
 class BossKameckMoveRail : public LiveActor {
 public:
-    BossKameckMoveRail(const char *);
+    BossKameckMoveRail(const char*);
 
     virtual ~BossKameckMoveRail();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
 
     inline s32 getIdx(s32) const;
 
-    void calcMovePosition(TVec3f *, s32) const;
-    s32 calcRandomIndex(s32) const;
-    s32 calcRandomStoppableIndex(s32) const;
+    void calcMovePosition(TVec3f*, s32) const;
+    s32  calcRandomIndex(s32) const;
+    s32  calcRandomStoppableIndex(s32) const;
 
     s32 _8C;
     s32 _90;

include/Game/Boss/BossKameckSequencer.hpp

@@ -9,25 +9,23 @@ class BossKameckBattleDemo;
 
 class BossKameckSequencer : public NerveExecutor {
 public:
-    BossKameckSequencer(const char *);
+    BossKameckSequencer(const char*);
 
     inline virtual ~BossKameckSequencer() {
-        
     }
 
     virtual void start() {
-
     }
 
-    virtual void init(BossKameck *, const JMapInfoIter &);
+    virtual void init(BossKameck*, const JMapInfoIter&);
     virtual void update();
-    virtual void attackSensor(HitSensor *, HitSensor *);
-    virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *);
-    virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *);
-    virtual bool receiveMsgPush(HitSensor *, HitSensor *);
-    virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *);
+    virtual void attackSensor(HitSensor*, HitSensor*);
+    virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*);
+    virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*);
+    virtual bool receiveMsgPush(HitSensor*, HitSensor*);
+    virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*);
 
-    BossKameck* mBossKameck;                    // 0x8
-    BossKameckAction* _C; // not really sure what this is.
-    BossKameckBattleDemo* mBattleDemo;          // 0x10
+    BossKameck*           mBossKameck; // 0x8
+    BossKameckAction*     _C;          // not really sure what this is.
+    BossKameckBattleDemo* mBattleDemo; // 0x10
 };

include/Game/Boss/BossKameckStateBattle.hpp

@@ -12,19 +12,19 @@ class KameckBeam;
 
 class BossKameckStateBattle : public ActorStateBase<BossKameck> {
 public:
-    BossKameckStateBattle(BossKameck *);
+    BossKameckStateBattle(BossKameck*);
 
     virtual ~BossKameckStateBattle();
     virtual void init();
     virtual void appear();
     virtual void control();
-    virtual void attackSensor(HitSensor *, HitSensor *);
-    virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *);
+    virtual void attackSensor(HitSensor*, HitSensor*);
+    virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*);
 
-    void setMoveRail(BossKameckMoveRail *);
-    void setBattlePattarn(BossKameckBattlePattarn *);
-    bool requestDamage(HitSensor *, HitSensor *);
-    bool requestGuard(HitSensor *, HitSensor *);
+    void setMoveRail(BossKameckMoveRail*);
+    void setBattlePattarn(BossKameckBattlePattarn*);
+    bool requestDamage(HitSensor*, HitSensor*);
+    bool requestGuard(HitSensor*, HitSensor*);
     bool tryAttackWait();
     bool trySummonKameck();
     bool tryChargeBram();
@@ -46,16 +46,16 @@ public:
     bool isEnableDamage() const;
     bool isEnableGuard() const;
 
-    BossKameck* mBossKameck;                      // 0xC
-    BossKameckMoveRail* mMoveRail;                  // 0x10
-    BossKameckBattlePattarn* mBattlePattarn;        // 0x14
-    KameckBeam* mBeam;                              // 0x18
-    KameckBeamEventListener* mBeamListener;         // 0x1C
-    TVec3f _20;
-    s32 _2C;
-    s32 _30;
-    s32 _34;
-    s32 _38;
-    u8 _3C;
-    u8 _3D;
+    BossKameck*              mBossKameck;    // 0xC
+    BossKameckMoveRail*      mMoveRail;      // 0x10
+    BossKameckBattlePattarn* mBattlePattarn; // 0x14
+    KameckBeam*              mBeam;          // 0x18
+    KameckBeamEventListener* mBeamListener;  // 0x1C
+    TVec3f                   _20;
+    s32                      _2C;
+    s32                      _30;
+    s32                      _34;
+    s32                      _38;
+    u8                       _3C;
+    u8                       _3D;
 };

include/Game/Boss/BossKameckVs1.hpp

@@ -10,9 +10,9 @@ public:
 
     virtual ~BossKameckVs1();
     virtual void start();
-    virtual void init(BossKameck *, const JMapInfoIter &);
-    virtual void attackSensor(HitSensor *, HitSensor *);
-    virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *);
+    virtual void init(BossKameck*, const JMapInfoIter&);
+    virtual void attackSensor(HitSensor*, HitSensor*);
+    virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*);
 
     void exeOpeningDemo();
     void exeBattleLv1();
@@ -22,5 +22,5 @@ public:
     void exeEndDemo();
     bool isBattle() const;
 
-    BossKameckStateBattle* mStateBattle;            // 0x14
+    BossKameckStateBattle* mStateBattle; // 0x14
 };

include/Game/Boss/BossKameckVs2.hpp

@@ -11,9 +11,9 @@ public:
 
     virtual ~BossKameckVs2();
     virtual void start();
-    virtual void init(BossKameck *, const JMapInfoIter &);
-    virtual void attackSensor(HitSensor *, HitSensor *);
-    virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *);
+    virtual void init(BossKameck*, const JMapInfoIter&);
+    virtual void attackSensor(HitSensor*, HitSensor*);
+    virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*);
 
     void exeOpeningDemo();
     void exeBattleLv1();
@@ -24,6 +24,6 @@ public:
     void exeEndDemo();
     bool isBattle() const;
 
-    BossKameckStateBattle* mStateBattle;            // 0x14
-    BossKameckBarrier* mBarrier;                    // 0x18
+    BossKameckStateBattle* mStateBattle; // 0x14
+    BossKameckBarrier*     mBarrier;     // 0x18
 };

include/Game/Boss/BossStinkBug.hpp

@@ -1,5 +1,5 @@
 #pragma once
 
 namespace JMath {
-    void gekko_ps_copy12(void *, const void *);
+    void gekko_ps_copy12(void*, const void*);
 };

include/Game/Boss/Koopa.hpp

@@ -23,9 +23,9 @@ public:
     virtual bool receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver);
 
 private:
-    /* 0x8C */ TVec3f _8C;
-    /* 0x98 */ KoopaSequencer* mSequencer;
+    /* 0x8C */ TVec3f           _8C;
+    /* 0x98 */ KoopaSequencer*  mSequencer;
     /* 0x9C */ KoopaSensorCtrl* mSensorCtrl;
-    /* 0xA0 */ KoopaParts* mParts;
-    /* 0xA4 */ ActorJointCtrl* mJointCtrl;
+    /* 0xA0 */ KoopaParts*      mParts;
+    /* 0xA4 */ ActorJointCtrl*  mJointCtrl;
 };

include/Game/Boss/KoopaFunction.hpp

@@ -3,5 +3,5 @@
 #include "Game/Map/KoopaBattleMapStair.hpp"
 
 namespace KoopaFunction {
-    s32 registerBattleMapStair(KoopaBattleMapStair *);
+    s32 registerBattleMapStair(KoopaBattleMapStair*);
 };

include/Game/Boss/SkeletalFishBaby.hpp

@@ -9,41 +9,41 @@ class SkeletalFishRailControl;
 
 class SkeletalFishBaby : public LiveActor {
 public:
-    SkeletalFishBaby(const char *);
+    SkeletalFishBaby(const char*);
 
     virtual ~SkeletalFishBaby();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void calcAnim();
     virtual void appear();
     virtual void makeActorAppeared();
     virtual void kill();
     virtual void control();
     virtual void calcAndSetBaseMtx();
-    virtual void attackSensor(HitSensor *, HitSensor *);
-    virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *);
-    virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *);
-    virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *);
+    virtual void attackSensor(HitSensor*, HitSensor*);
+    virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*);
+    virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*);
+    virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*);
 
     void exeSwim();
     void exeBind();
     void endBind();
     void exeBreak();
     void exeDead();
-    bool calcJoint(TPos3f *, const JointControllerInfo &);
-    bool damage(const TVec3f &, bool);
-    void initRail(const JMapInfoIter &);
+    bool calcJoint(TPos3f*, const JointControllerInfo&);
+    bool damage(const TVec3f&, bool);
+    void initRail(const JMapInfoIter&);
     void initJoint();
     void initSensor();
     bool isAttackable() const;
     bool isStarPointerPointing() const;
 
-    JointController* mControllers[4];               // 0x8C
-    s32* mJointIndicies;                            // 0x9C
-    f32 _A0;
-    f32 _A4;
-    SkeletalFishRailControl* mRailControl;          // 0xA8
-    TPos3f _AC;
-    f32 _DC;
-    AnimScaleController* mScaleController;          // 0xE0 
-    LiveActor* mStarPieceTargets[4];                // 0xE4
+    JointController*         mControllers[4]; // 0x8C
+    s32*                     mJointIndicies;  // 0x9C
+    f32                      _A0;
+    f32                      _A4;
+    SkeletalFishRailControl* mRailControl; // 0xA8
+    TPos3f                   _AC;
+    f32                      _DC;
+    AnimScaleController*     mScaleController;     // 0xE0
+    LiveActor*               mStarPieceTargets[4]; // 0xE4
 };

include/Game/Boss/SkeletalFishBabyRail.hpp

@@ -6,10 +6,10 @@ class SkeletalFishBabyRailHolder;
 
 class SkeletalFishBabyRail : public LiveActor {
 public:
-    SkeletalFishBabyRail(const char *);
-    
+    SkeletalFishBabyRail(const char*);
+
     virtual ~SkeletalFishBabyRail();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
 
     s32 _8C;
 };

include/Game/Boss/SkeletalFishBabyRailHolder.hpp

@@ -8,9 +8,9 @@ class SkeletalFishBabyRailSetLinkNode {
 public:
     SkeletalFishBabyRailSetLinkNode();
 
-    SkeletalFishBabyRail* _0;
-    SkeletalFishBabyRail* _4;
-    u8 _8;
+    SkeletalFishBabyRail*            _0;
+    SkeletalFishBabyRail*            _4;
+    u8                               _8;
     SkeletalFishBabyRailSetLinkNode* _C;
     SkeletalFishBabyRailSetLinkNode* _10;
 };
@@ -19,17 +19,17 @@ class SkeletalFishBabyRailGroupNode {
 public:
     SkeletalFishBabyRailGroupNode(s32);
 
-    void addChild(SkeletalFishBabyRail *);
+    void addChild(SkeletalFishBabyRail*);
 
     void createChild();
     void tidy();
 
-    s32 _0;
-    u32 mNumNodes;                              // 0x4
-    u32 _8;
-    u32 _C;
-    SkeletalFishBabyRailGroupNode* _10;
-    SkeletalFishBabyRailGroupNode* _14;
+    s32                              _0;
+    u32                              mNumNodes; // 0x4
+    u32                              _8;
+    u32                              _C;
+    SkeletalFishBabyRailGroupNode*   _10;
+    SkeletalFishBabyRailGroupNode*   _14;
     SkeletalFishBabyRailSetLinkNode* _18;
     SkeletalFishBabyRailSetLinkNode* _1C;
     SkeletalFishBabyRailSetLinkNode* _20;
@@ -38,18 +38,18 @@ public:
 
 class SkeletalFishBabyRailHolder : public NameObj {
 public:
-    SkeletalFishBabyRailHolder(const char *);
+    SkeletalFishBabyRailHolder(const char*);
 
     virtual ~SkeletalFishBabyRailHolder();
     virtual void initAfterPlacement();
 
-    void add(SkeletalFishBabyRail *);
+    void                           add(SkeletalFishBabyRail*);
     SkeletalFishBabyRailGroupNode* createGroup(s32);
 
-    SkeletalFishBabyRailGroupNode* mNodes;      // 0xC
+    SkeletalFishBabyRailGroupNode* mNodes; // 0xC
 };
 
 namespace MR {
-    void createSkeletalFishBabyRailHolder();
+    void                        createSkeletalFishBabyRailHolder();
     SkeletalFishBabyRailHolder* getSkeletalFishBabyRailHolder();
-};
+}; // namespace MR

include/Game/Boss/SkeletalFishBoss.hpp

@@ -17,7 +17,6 @@ class SkeletalFishBossRail;
 
 class SkeletalFishBoss : public LiveActor {
 public:
-
     struct SensorToCollider {
         const char* mJointName;
         const char* mColliderName;
@@ -32,15 +31,15 @@ public:
     struct HitPos {
         const char* mName;
         const char* mSensorName;
-        Vec mOffset;
+        Vec         mOffset;
     };
 
     typedef void (SkeletalFishBoss::*SceneFunc)(void);
 
-    SkeletalFishBoss(const char *);
+    SkeletalFishBoss(const char*);
 
     virtual ~SkeletalFishBoss();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void initAfterPlacement();
     virtual void calcAnim();
     virtual void appear();
@@ -49,120 +48,120 @@ public:
     virtual void control();
     virtual void calcAndSetBaseMtx();
 
-    bool calcJoint(TPos3f *, const JointControllerInfo &);
-    void damage(const HitSensor *, const TVec3f &);
-    void exeSwim();
-    void exeOpen();
-    void exeOpenWait();
-    void exeClose();
-    void exeBite();
-    void exeDamage();
-    void exeDown();
-    void exeDeadDamage();
-    void exeDead();
-    void exeAppearWait();
-    void exeAppearDemo();
-    void exePowerUpDemo();
-    void exeDeadDemo();
-    void exeBreakDemo();
-    void exeDemoWait();
-    void notifyAttack(SkeletalFishGuard *);
-    LiveActor* getCurrentRail();
-    f32 getBodyThickness() const;
+    bool                  calcJoint(TPos3f*, const JointControllerInfo&);
+    void                  damage(const HitSensor*, const TVec3f&);
+    void                  exeSwim();
+    void                  exeOpen();
+    void                  exeOpenWait();
+    void                  exeClose();
+    void                  exeBite();
+    void                  exeDamage();
+    void                  exeDown();
+    void                  exeDeadDamage();
+    void                  exeDead();
+    void                  exeAppearWait();
+    void                  exeAppearDemo();
+    void                  exePowerUpDemo();
+    void                  exeDeadDemo();
+    void                  exeBreakDemo();
+    void                  exeDemoWait();
+    void                  notifyAttack(SkeletalFishGuard*);
+    LiveActor*            getCurrentRail();
+    f32                   getBodyThickness() const;
     SkeletalFishBossHead* getHeadActor() const;
-    void initLevelStatus();
-    void initJoint();
-    void initCollision();
-    void initHead();
-    void initScarFlash();
-    void initBreakModel();
-    void initSwitch(const JMapInfoIter &);
-    void createGuards();
-    void initShadow();
-    void initCamera();
-    void validateCollision();
-    void invalidateCollision();
-    void getMouthSensorCenterPos(TVec3f &, f32) const;
-    void updateCollision();
-    void powerUp();
-    void startDamageAnim();
-    void calcPlanetCenterPosition();
-    bool calcGravityCenter(TVec3f *, const TVec3f &, const TVec3f &);
-    void resetRail();
-    void updateBgm();
-    LiveActor* getCurrentBossRail();
-    void stopScene(const char *, const Nerve *, SceneFunc);
-    void startCamera(const char *);
-    void resetCamera();
-    void playDamageBrk();
-    void startAppearDemo();
-    void endAppearDemo();
-    void startPowerUpDemo();
-    void endPowerUpDemo();
-    void startDeadDemo();
-    void endBreakDemo();
-    bool isEnableToBeDamaged() const;
+    void                  initLevelStatus();
+    void                  initJoint();
+    void                  initCollision();
+    void                  initHead();
+    void                  initScarFlash();
+    void                  initBreakModel();
+    void                  initSwitch(const JMapInfoIter&);
+    void                  createGuards();
+    void                  initShadow();
+    void                  initCamera();
+    void                  validateCollision();
+    void                  invalidateCollision();
+    void                  getMouthSensorCenterPos(TVec3f&, f32) const;
+    void                  updateCollision();
+    void                  powerUp();
+    void                  startDamageAnim();
+    void                  calcPlanetCenterPosition();
+    bool                  calcGravityCenter(TVec3f*, const TVec3f&, const TVec3f&);
+    void                  resetRail();
+    void                  updateBgm();
+    LiveActor*            getCurrentBossRail();
+    void                  stopScene(const char*, const Nerve*, SceneFunc);
+    void                  startCamera(const char*);
+    void                  resetCamera();
+    void                  playDamageBrk();
+    void                  startAppearDemo();
+    void                  endAppearDemo();
+    void                  startPowerUpDemo();
+    void                  endPowerUpDemo();
+    void                  startDeadDemo();
+    void                  endBreakDemo();
+    bool                  isEnableToBeDamaged() const;
 
     SkeletalFishBossInfo::LevelStatus* getLevelStatus() const {
         return mBossInfo->getLevelStatus(_110);
     }
 
-    JointController* mControllers[0xD];
-    s32* mJointIndicies;                            // 0xC0
-    CollisionParts** mPartsArray;                   // 0xC4
-    SkeletalFishBossHead* mBossHead;                // 0xC8
-    SkeletalFishBossScarFlash* mScarFlash;              // 0xCC
-    ModelObj* mBreakModel;                          // 0xD0
-    const HitSensor* _D4;
-    TPos3f _D8;
-    SkeletalFishRailControl* mRailControl;          // 0x108
-    SkeletalFishBossBattleDirector* mBossDirector;  // 0x10C
-    s32 _110;
-    s32 _114;
-    u32 _118;
-    CameraTargetMtx* mCameraTargetMtx;              // 0x11C
-    TPos3f _120;
-    TPos3f _150;
-    TVec3f _180;
-    SceneFunc mSceneFunc;                           // 0x18C
-    const char* mCurScene;                          // 0x198
-    const Nerve* mSceneNerve;                             // 0x19C
-    s32 _1A0;
-    s32 _1A4;
-    SkeletalFishBossInfo* mBossInfo;                // 0x1A8
-    SkeletalFishGuardHolder* mGuardHolder;          // 0x1AC
-    u32 _1B0;
-    s32 _1B4;
+    JointController*                mControllers[0xD];
+    s32*                            mJointIndicies; // 0xC0
+    CollisionParts**                mPartsArray;    // 0xC4
+    SkeletalFishBossHead*           mBossHead;      // 0xC8
+    SkeletalFishBossScarFlash*      mScarFlash;     // 0xCC
+    ModelObj*                       mBreakModel;    // 0xD0
+    const HitSensor*                _D4;
+    TPos3f                          _D8;
+    SkeletalFishRailControl*        mRailControl;  // 0x108
+    SkeletalFishBossBattleDirector* mBossDirector; // 0x10C
+    s32                             _110;
+    s32                             _114;
+    u32                             _118;
+    CameraTargetMtx*                mCameraTargetMtx; // 0x11C
+    TPos3f                          _120;
+    TPos3f                          _150;
+    TVec3f                          _180;
+    SceneFunc                       mSceneFunc;  // 0x18C
+    const char*                     mCurScene;   // 0x198
+    const Nerve*                    mSceneNerve; // 0x19C
+    s32                             _1A0;
+    s32                             _1A4;
+    SkeletalFishBossInfo*           mBossInfo;    // 0x1A8
+    SkeletalFishGuardHolder*        mGuardHolder; // 0x1AC
+    u32                             _1B0;
+    s32                             _1B4;
 };
 
 class SkeletalFishBossScarFlash : public PartsModel {
 public:
-    SkeletalFishBossScarFlash(LiveActor *);
+    SkeletalFishBossScarFlash(LiveActor*);
 
     virtual ~SkeletalFishBossScarFlash();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void appear();
     virtual void control();
 };
 
 class SkeletalFishBossHead : public PartsModel {
 public:
-    SkeletalFishBossHead(LiveActor *);
+    SkeletalFishBossHead(LiveActor*);
 
     virtual ~SkeletalFishBossHead();
     virtual void movement();
     virtual void calcAnim();
-    virtual void attackSensor(HitSensor *, HitSensor *);
-    virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *);
-    
+    virtual void attackSensor(HitSensor*, HitSensor*);
+    virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*);
+
     void updateCollisionMtx();
     void createSubModel();
 
-    TMtx34f _9C;
+    TMtx34f         _9C;
     CollisionParts* _CC;
-    TMtx34f _D0;
+    TMtx34f         _D0;
     CollisionParts* _100;
-    ModelObj* mLightModels[2];              // 0x104
-    ModelObj* mBloomModels[2];              // 0x10C
-    u8 _114;
+    ModelObj*       mLightModels[2]; // 0x104
+    ModelObj*       mBloomModels[2]; // 0x10C
+    u8              _114;
 };

include/Game/Boss/SkeletalFishBossBattleDirector.hpp

@@ -8,16 +8,16 @@ class SubmarineVolcanoBigColumn;
 
 class SkeletalFishBossBattleDirector : public NameObj {
 public:
-    SkeletalFishBossBattleDirector(SkeletalFishBoss *);
+    SkeletalFishBossBattleDirector(SkeletalFishBoss*);
 
     virtual ~SkeletalFishBossBattleDirector();
     virtual void movement();
-    
+
     void initiate();
     void startPowerUpDemo1();
     void startPowerUpDemo2();
-    void playGuardAnim(const char *, s32);
-    void tryColumnCollision(HitSensor *);
+    void playGuardAnim(const char*, s32);
+    void tryColumnCollision(HitSensor*);
     void pauseOffCast();
     void endPowerUpDemo1();
     void endPowerUpDemo2();
@@ -25,10 +25,10 @@ public:
     void appearBirdLouse();
     void killBirdLouse();
 
-    SkeletalFishBoss* mFishBoss;                    // 0xC
-    SubmarineVolcanoBigColumn* mColumns[0x20];      // 0x10
-    s32 _90;
-    LiveActor* _94[0x10];
-    s32 _D4;
-    ModelObj* mGuardModels[4];                      // 0xD8
+    SkeletalFishBoss*          mFishBoss;      // 0xC
+    SubmarineVolcanoBigColumn* mColumns[0x20]; // 0x10
+    s32                        _90;
+    LiveActor*                 _94[0x10];
+    s32                        _D4;
+    ModelObj*                  mGuardModels[4]; // 0xD8
 };

include/Game/Boss/SkeletalFishBossFunc.hpp

@@ -5,6 +5,6 @@
 
 class SkeletalFishBossFunc {
 public:
-    static s32 getNearestGuardPosID(const TVec3f &);
-    static bool copyGuardPos(TVec3f *, s32);
+    static s32  getNearestGuardPosID(const TVec3f&);
+    static bool copyGuardPos(TVec3f*, s32);
 };

include/Game/Boss/SkeletalFishBossInfo.hpp

@@ -7,13 +7,12 @@ class SkeletalFishBoss;
 
 class SkeletalFishBossInfo : public NameObj {
 public:
-
     class GuardStatus {
     public:
         GuardStatus();
 
-        TVec3f mGuardPosLevel;      // 0x0
-        s32 mGuardWaitLevelID;      // 0xC
+        TVec3f mGuardPosLevel;    // 0x0
+        s32    mGuardWaitLevelID; // 0xC
     };
 
     struct LevelStatus {
@@ -22,26 +21,26 @@ public:
             return &mStatusArray[idx];
         }
 
-        s32 mEnergyLevel;                                   // 0x0
-        f32 mSpeedLevel;                                    // 0x4
-        s32 mRailIDLevel;                                   // 0x8
-        f32 mGuardOffsLevel;                                // 0xC
-        s32 mGuardAppearNumLevel;                           // 0x10
-        SkeletalFishBossInfo::GuardStatus* mStatusArray;    // 0x14
+        s32                                mEnergyLevel;         // 0x0
+        f32                                mSpeedLevel;          // 0x4
+        s32                                mRailIDLevel;         // 0x8
+        f32                                mGuardOffsLevel;      // 0xC
+        s32                                mGuardAppearNumLevel; // 0x10
+        SkeletalFishBossInfo::GuardStatus* mStatusArray;         // 0x14
     };
 
-    SkeletalFishBossInfo(SkeletalFishBoss *, s32, s32, const char *);
+    SkeletalFishBossInfo(SkeletalFishBoss*, s32, s32, const char*);
 
     virtual ~SkeletalFishBossInfo();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
 
     LevelStatus* getLevelStatus(s32) const;
-    void createLevelStatus();
-    void loadLevelStatus(const JMapInfoIter &);
-    void loadGuardStatus(const JMapInfoIter &, s32, s32);
+    void         createLevelStatus();
+    void         loadLevelStatus(const JMapInfoIter&);
+    void         loadGuardStatus(const JMapInfoIter&, s32, s32);
 
-    SkeletalFishBoss* mFishBoss;                        // 0xC
-    s32 mLevelNum;                                      // 0x10
-    s32 mGuardNum;                                      // 0x14
-    LevelStatus* mLevelStatusArray;                     // 0x18
+    SkeletalFishBoss* mFishBoss;         // 0xC
+    s32               mLevelNum;         // 0x10
+    s32               mGuardNum;         // 0x14
+    LevelStatus*      mLevelStatusArray; // 0x18
 };

include/Game/Boss/SkeletalFishBossRail.hpp

@@ -4,20 +4,20 @@
 
 class SkeletalFishBossRail : public LiveActor {
 public:
-    SkeletalFishBossRail(const char *);
+    SkeletalFishBossRail(const char*);
 
     virtual ~SkeletalFishBossRail();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void initAfterPlacement();
 
     bool isFillUpPoint(s32) const;
-    s32 getFillUpNamePos(s32) const;
+    s32  getFillUpNamePos(s32) const;
     void createFillUpFlag();
     void createFillUpNamePosID();
     void linkFillUpNamePosID();
 
-    s32 _8C;
-    bool* mFillUpFlags;          // 0x90
-    s32* mNamePosIDs;           // 0x94
-    f32 _98;
+    s32   _8C;
+    bool* mFillUpFlags; // 0x90
+    s32*  mNamePosIDs;  // 0x94
+    f32   _98;
 };

include/Game/Boss/SkeletalFishBossRailHolder.hpp

@@ -6,19 +6,19 @@ class SkeletalFishBossRail;
 
 class SkeletalFishBossRailHolder : public NameObj {
 public:
-    SkeletalFishBossRailHolder(const char *);
+    SkeletalFishBossRailHolder(const char*);
 
     virtual ~SkeletalFishBossRailHolder();
 
-    void add(SkeletalFishBossRail *);
+    void                  add(SkeletalFishBossRail*);
     SkeletalFishBossRail* getInOrder(s32) const;
     SkeletalFishBossRail* getByID(s32) const;
 
-    s32 mNumRails;                          // 0xC
-    SkeletalFishBossRail* mRails[3];        // 0x10
+    s32                   mNumRails; // 0xC
+    SkeletalFishBossRail* mRails[3]; // 0x10
 };
 
 namespace MR {
     SkeletalFishBossRailHolder* getSkeletalFishBossRailHolder();
-    void createSkeletalFishBossRailHolder();
-};
+    void                        createSkeletalFishBossRailHolder();
+}; // namespace MR

include/Game/Boss/SkeletalFishGuard.hpp

@@ -7,16 +7,16 @@ class SkeletalFishBoss;
 
 class SkeletalFishGuard : public LiveActor {
 public:
-    SkeletalFishGuard(SkeletalFishBoss *, const char *);
+    SkeletalFishGuard(SkeletalFishBoss*, const char*);
 
     virtual ~SkeletalFishGuard();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void initAfterPlacement();
     virtual void appear();
     virtual void control();
     virtual void calcAndSetBaseMtx();
-    virtual void attackSensor(HitSensor *, HitSensor *);
-    virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *);
+    virtual void attackSensor(HitSensor*, HitSensor*);
+    virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*);
 
     void exeWait();
     void exeAppear();
@@ -35,37 +35,37 @@ public:
     void waitAttack(s32);
     void initSensor();
     void calcTransAndFront();
-    void rotateHorizontal(const TVec3f &, f32);
-    void rotateVertical(const TVec3f &, f32);
+    void rotateHorizontal(const TVec3f&, f32);
+    void rotateVertical(const TVec3f&, f32);
     bool tryShiftApart();
     bool tryShiftStraight();
     bool tryShiftKill();
-    void turn(TVec3f *, const TVec3f &, const TVec3f &, f32);
+    void turn(TVec3f*, const TVec3f&, const TVec3f&, f32);
     void lookToPlayer(f32, f32);
-    void calcTarget(TVec3f *, TVec3f *, TVec3f *, s32);
+    void calcTarget(TVec3f*, TVec3f*, TVec3f*, s32);
     bool isInScreen() const;
     bool isPlayerInAttackRange() const;
     bool isLineOfSightClear() const;
-    bool tryShiftNumb(const Nerve *);
+    bool tryShiftNumb(const Nerve*);
 
-    u32 _8C;
-    SkeletalFishBoss* mFishBoss;                    // 0x90
-    TVec3f _94;
-    u32 _A0;
-    TVec3f _A4;
-    f32 _B0;
-    f32 _B4;
-    f32 _B8;
-    f32 _BC;
-    s32 mAttackDelay;                               // 0xC0
-    f32 _C4;
-    f32 _C8;
-    const Nerve* _CC;
-    TVec3f _D0;
-    TVec3f _DC;
-    TVec3f _E8;
-    TVec3f _F4;
-    TVec3f _100;
-    TVec3f _10C;
-    AnimScaleController* mScaleController;          // 0x118
+    u32                  _8C;
+    SkeletalFishBoss*    mFishBoss; // 0x90
+    TVec3f               _94;
+    u32                  _A0;
+    TVec3f               _A4;
+    f32                  _B0;
+    f32                  _B4;
+    f32                  _B8;
+    f32                  _BC;
+    s32                  mAttackDelay; // 0xC0
+    f32                  _C4;
+    f32                  _C8;
+    const Nerve*         _CC;
+    TVec3f               _D0;
+    TVec3f               _DC;
+    TVec3f               _E8;
+    TVec3f               _F4;
+    TVec3f               _100;
+    TVec3f               _10C;
+    AnimScaleController* mScaleController; // 0x118
 };

include/Game/Boss/SkeletalFishGuardHolder.hpp

@@ -8,7 +8,7 @@ class SkeletalFishBossRail;
 
 class SkeletalFishGuardHolder : public NameObj {
 public:
-    SkeletalFishGuardHolder(SkeletalFishBoss *, s32, const char *);
+    SkeletalFishGuardHolder(SkeletalFishBoss*, s32, const char*);
 
     virtual ~SkeletalFishGuardHolder();
     virtual void movement();
@@ -16,20 +16,20 @@ public:
     void forceAppearAll();
     void forceKillAll();
     void killAll();
-    void notifyAttack(SkeletalFishGuard *);
+    void notifyAttack(SkeletalFishGuard*);
     void invalidate();
     void validate();
     void checkRailChangedAndReset();
-    s32 countAppearableGuard() const;
-    s32 countGuardAlive() const;
+    s32  countAppearableGuard() const;
+    s32  countGuardAlive() const;
     void checkDistanceAndAppear(s32);
     void appearGuard(s32, s32);
     void createAndInitGuard();
 
-    SkeletalFishBoss* mFishBoss;            // 0xC
-    SkeletalFishBossRail* mBossRail;        // 0x10
-    s32 mNumGuards;                         // 0x14
-    SkeletalFishGuard** mGuards;            // 0x18
-    f32 _1C;
-    u8 _20;
+    SkeletalFishBoss*     mFishBoss;  // 0xC
+    SkeletalFishBossRail* mBossRail;  // 0x10
+    s32                   mNumGuards; // 0x14
+    SkeletalFishGuard**   mGuards;    // 0x18
+    f32                   _1C;
+    u8                    _20;
 };

include/Game/Boss/SkeletalFishJointCalc.hpp

@@ -5,5 +5,5 @@
 
 class SkeletalFishJointCalc {
 public:
-    static void calcJoint(TPos3f *, const TPos3f *, SkeletalFishRailControl *, const JointControllerInfo &);
+    static void calcJoint(TPos3f*, const TPos3f*, SkeletalFishRailControl*, const JointControllerInfo&);
 };

include/Game/Boss/SkeletalFishRailControl.hpp

@@ -4,24 +4,24 @@
 
 struct SkeletalFishRailInfo {
     LiveActor* _0;
-    f32 _4;
+    f32        _4;
 };
 
 class SkeletalFishRailControl {
 public:
     SkeletalFishRailControl();
 
-    void setRailActor(LiveActor *, LiveActor *, bool);
+    void setRailActor(LiveActor*, LiveActor*, bool);
     void update();
-    void getRailInfo(SkeletalFishRailInfo *, f32);
-    void getPos(TVec3f *, f32);
-    void getMtx(TPos3f *, f32);
+    void getRailInfo(SkeletalFishRailInfo*, f32);
+    void getPos(TVec3f*, f32);
+    void getMtx(TPos3f*, f32);
 
-    u32 _0;
+    u32        _0;
     LiveActor* _4;
     LiveActor* _8;
-    f32 _C;
-    f32 _10;
-    f32 _14;
-    bool _18;
+    f32        _C;
+    f32        _10;
+    f32        _14;
+    bool       _18;
 };

include/Game/Boss/TripodBoss.hpp

@@ -17,9 +17,9 @@ public:
         _0.identity();
     }
 
-    void setAttachBaseMatrix(const TPos3f &);
+    void setAttachBaseMatrix(const TPos3f&);
 
-    TMtx34f _0;
+    TMtx34f       _0;
     const TPos3f* _30;
 };
 
@@ -41,84 +41,84 @@ public:
         Part_EndJoint = 6
     };
 
-    TripodBoss(const char *);
+    TripodBoss(const char*);
 
     virtual ~TripodBoss();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void initAfterPlacement();
     virtual void kill();
     virtual void control();
     virtual void calcAndSetBaseMtx();
 
-    void initEventCamera(const JMapInfoIter &);
-    void initLeg(const JMapInfoIter &);
-    void initLegIKPlacement();
-    void initMovableArea(const TPos3f &);
-    void initBodyPosition();
-    void initBoneInfo();
-    void initPose();
-    bool tryStartStep();
-    bool tryChangeSequence();
-    bool tryEndSequence();
-    bool tryNextSequence();
-    bool tryDamage();
-    bool tryWaitStep();
-    bool tryNextStep();
-    bool tryLeaveLegOutOfPlayer();
-    bool tryEndLeaveLegOutOfPlayer();
-    bool tryEndDamage();
-    bool tryBreak();
-    void requestOpeningDemo();
-    bool tryDamageDemo();
-    void requestEndDamageDemo();
-    void exeWait();
-    void exeStep();
-    void exeWaitStep();
-    void exeChangeSequence();
-    void exeLeaveLegOutOfPlayer();
-    void exeDamage();
-    void exeStartDemo();
-    void exeDamageDemo();
-    void exePainDemo();
-    void exeBreakDownDemo();
-    void exeExplosionDemo();
-    inline void exeNonActive();
-    inline void exeTryStartDemo();
-    bool isStopLeg(s32) const;
-    bool isStopAllLeg() const;
-    bool isStarted() const;
-    bool isDemo() const;
-    bool isStartDemo() const NO_INLINE;
-    bool isDamageDemo() const NO_INLINE;
-    bool isEndDemo() const;
-    bool isEndPainDemo() const NO_INLINE;
-    bool isEndBreakDownDemo() const NO_INLINE;
-    bool isEndExplosionDemo() const NO_INLINE; 
-    bool isBroken() const;
-    bool isRideMario() const;
-    bool isLeaveMarioNow() const;
-    void setJointAttachBaseMatrix(const TPos3f &, s32);
-    void addStepPoint(TripodBossStepPoint *);
-    void getBodyMatrix(TPos3f *) const;
-    void getJointMatrix(TPos3f *, s32) const;
-    void getJointAttachMatrix(TPos3f *, s32) const;
-    void requestStartStepSequence(s32);
+    void                    initEventCamera(const JMapInfoIter&);
+    void                    initLeg(const JMapInfoIter&);
+    void                    initLegIKPlacement();
+    void                    initMovableArea(const TPos3f&);
+    void                    initBodyPosition();
+    void                    initBoneInfo();
+    void                    initPose();
+    bool                    tryStartStep();
+    bool                    tryChangeSequence();
+    bool                    tryEndSequence();
+    bool                    tryNextSequence();
+    bool                    tryDamage();
+    bool                    tryWaitStep();
+    bool                    tryNextStep();
+    bool                    tryLeaveLegOutOfPlayer();
+    bool                    tryEndLeaveLegOutOfPlayer();
+    bool                    tryEndDamage();
+    bool                    tryBreak();
+    void                    requestOpeningDemo();
+    bool                    tryDamageDemo();
+    void                    requestEndDamageDemo();
+    void                    exeWait();
+    void                    exeStep();
+    void                    exeWaitStep();
+    void                    exeChangeSequence();
+    void                    exeLeaveLegOutOfPlayer();
+    void                    exeDamage();
+    void                    exeStartDemo();
+    void                    exeDamageDemo();
+    void                    exePainDemo();
+    void                    exeBreakDownDemo();
+    void                    exeExplosionDemo();
+    inline void             exeNonActive();
+    inline void             exeTryStartDemo();
+    bool                    isStopLeg(s32) const;
+    bool                    isStopAllLeg() const;
+    bool                    isStarted() const;
+    bool                    isDemo() const;
+    bool                    isStartDemo() const NO_INLINE;
+    bool                    isDamageDemo() const NO_INLINE;
+    bool                    isEndDemo() const;
+    bool                    isEndPainDemo() const NO_INLINE;
+    bool                    isEndBreakDownDemo() const NO_INLINE;
+    bool                    isEndExplosionDemo() const NO_INLINE;
+    bool                    isBroken() const;
+    bool                    isRideMario() const;
+    bool                    isLeaveMarioNow() const;
+    void                    setJointAttachBaseMatrix(const TPos3f&, s32);
+    void                    addStepPoint(TripodBossStepPoint*);
+    void                    getBodyMatrix(TPos3f*) const;
+    void                    getJointMatrix(TPos3f*, s32) const;
+    void                    getJointAttachMatrix(TPos3f*, s32) const;
+    void                    requestStartStepSequence(s32);
     TripodBossStepSequence* getCurrentStepSequence();
     TripodBossStepSequence* getNextStepSequence();
-    void calcLegUpVector(TVec3f *, const TVec3f &);
-    void calcDemoMovement();
-    void calcBodyMovement();
-    void calcLegMovement();
-    void addAccelToWeightPosition();
-    void calcClippingSphere();
-    void clippingModel();
-    void startDemo();
-    void endDemo(const char *);
-    void checkRideMario();
-    const TPos3f* getLegMatrixPtr(PART_ID, SUB_PART_ID) const;
-    void changeBgmState();
-    static s32 getPartIDFromBoneID(s32);
-    void setAttachBaseMatrix(const TPos3f &);
+    void                    calcLegUpVector(TVec3f*, const TVec3f&);
+    void                    calcDemoMovement();
+    void                    calcBodyMovement();
+    void                    calcLegMovement();
+    void                    addAccelToWeightPosition();
+    void                    calcClippingSphere();
+    void                    clippingModel();
+    void                    startDemo();
+    void                    endDemo(const char*);
+    void                    checkRideMario();
+    const TPos3f*           getLegMatrixPtr(PART_ID, SUB_PART_ID) const;
+    void                    changeBgmState();
+    static s32              getPartIDFromBoneID(s32);
+    void                    setAttachBaseMatrix(const TPos3f&);
 
     inline TripodBossLeg* getLeg(s32 idx) const {
         return mLegs[idx];
@@ -132,44 +132,44 @@ public:
         return (_634 == 0) || (_634 == 1);
     }
 
-    TPos3f mBodyMtx;                            // 0x8C
-    TPos3f _BC;
-    TPos3f _EC;
-    ModelObj* mLowModel;                        // 0x11C
-    TripodBossBone mBossBones[0x16];            // 0x120
-    TripodBossLeg* mLegs[3];                    // 0x598
-    TripodBossStepPoint* mStepPoints[3];        // 0x5A4
-    TripodBossMovableArea* mMovableArea;        // 0x5B0
-    TripodBossStepSequence* mStepSequence;      // 0x5B4
-    DummyDisplayModel* mDummyModel;             // 0x5B8
-    TVec3f _5BC;
-    TVec3f _5C8;
-    TVec3f _5D4;
-    TVec3f _5E0;
-    TVec3f _5EC;
-    f32 _5F8;
-    f32 _5FC;
-    f32 _600;
-    f32 _604;
-    f32 _608;
-    f32 _60C;
-    f32 _610;
-    f32 _614;
-    f32 _618;
-    f32 _61C;
-    f32 _620;
-    s32 mCurrentStepSeq;                        // 0x624
-    s32 mNextStepSeq;                           // 0x628
-    s32 _62C;
-    s32 _630;
-    s32 _634;
-    u8 _638;
-    s32 _63C;
-    u8 _640;
-    ActorCameraInfo* mEventCamera;              // 0x644
+    TPos3f                  mBodyMtx; // 0x8C
+    TPos3f                  _BC;
+    TPos3f                  _EC;
+    ModelObj*               mLowModel;        // 0x11C
+    TripodBossBone          mBossBones[0x16]; // 0x120
+    TripodBossLeg*          mLegs[3];         // 0x598
+    TripodBossStepPoint*    mStepPoints[3];   // 0x5A4
+    TripodBossMovableArea*  mMovableArea;     // 0x5B0
+    TripodBossStepSequence* mStepSequence;    // 0x5B4
+    DummyDisplayModel*      mDummyModel;      // 0x5B8
+    TVec3f                  _5BC;
+    TVec3f                  _5C8;
+    TVec3f                  _5D4;
+    TVec3f                  _5E0;
+    TVec3f                  _5EC;
+    f32                     _5F8;
+    f32                     _5FC;
+    f32                     _600;
+    f32                     _604;
+    f32                     _608;
+    f32                     _60C;
+    f32                     _610;
+    f32                     _614;
+    f32                     _618;
+    f32                     _61C;
+    f32                     _620;
+    s32                     mCurrentStepSeq; // 0x624
+    s32                     mNextStepSeq;    // 0x628
+    s32                     _62C;
+    s32                     _630;
+    s32                     _634;
+    u8                      _638;
+    s32                     _63C;
+    u8                      _640;
+    ActorCameraInfo*        mEventCamera; // 0x644
 };
 
 namespace MR {
-    NameObj* createTripodBoss(const char *);
-    NameObj* createTripod2Boss(const char *);
-};
+    NameObj* createTripodBoss(const char*);
+    NameObj* createTripod2Boss(const char*);
+}; // namespace MR

include/Game/Boss/TripodBossAccesser.hpp

@@ -4,27 +4,27 @@
 
 class TripodBossAccesser : public NameObj {
 public:
-    TripodBossAccesser(const char *);
+    TripodBossAccesser(const char*);
 
     virtual ~TripodBossAccesser();
 
-    void setTriPodBoss(TripodBoss *);
-    void addTripodBossParts(LiveActor *);
-    void showTripodBossParts();
-    void hideTripodBossParts();
-    void activeTripodBossParts();
-    bool isTripoddBossParts(const NameObj *) const;
+    void                       setTriPodBoss(TripodBoss*);
+    void                       addTripodBossParts(LiveActor*);
+    void                       showTripodBossParts();
+    void                       hideTripodBossParts();
+    void                       activeTripodBossParts();
+    bool                       isTripoddBossParts(const NameObj*) const;
     static TripodBossAccesser* createSceneObj();
 
-    TripodBoss* mBoss;                  // 0xC
-    LiveActor* mParts[0x100];           // 0x10
-    s32 mNumParts;                      // 0x410
+    TripodBoss* mBoss;         // 0xC
+    LiveActor*  mParts[0x100]; // 0x10
+    s32         mNumParts;     // 0x410
 };
 
 namespace MR {
-    void addTripodBossParts(LiveActor *);
-    void addTripodBossPartsMovement(NameObj *);
-    bool isTripoddBossParts(const NameObj *);
+    void addTripodBossParts(LiveActor*);
+    void addTripodBossPartsMovement(NameObj*);
+    bool isTripoddBossParts(const NameObj*);
     void showTripodBossParts();
     void hideTripodBossParts();
     void activeTripodBossParts();
@@ -40,13 +40,13 @@ namespace MR {
     bool isRideMarioTripodBoss();
     bool tryDamageDemoTripodBoss();
     void requestEndDamageDemoTripodBoss();
-    u32 getTripodBossGravityHostID();
-    void setTripodBossJointAttachBaseMatrix(const TPos3f &, s32);
+    u32  getTripodBossGravityHostID();
+    void setTripodBossJointAttachBaseMatrix(const TPos3f&, s32);
     void requestStartTripodBossStepSequence(s32);
-    void addTripodBossStepPoint(TripodBossStepPoint *);
-    void getTripodBossJointMatrix(TPos3f *, s32);
-    void getTripodBossAttachJointMatrix(TPos3f *, s32) NO_INLINE;
-    void concatTripodBossAttachJointMatrix(TPos3f *, s32);
+    void addTripodBossStepPoint(TripodBossStepPoint*);
+    void getTripodBossJointMatrix(TPos3f*, s32);
+    void getTripodBossAttachJointMatrix(TPos3f*, s32) NO_INLINE;
+    void concatTripodBossAttachJointMatrix(TPos3f*, s32);
     bool isSteppingTripodBossLegID(s32) NO_INLINE;
     bool isSteppingTripodBossJointID(s32);
-};
+}; // namespace MR

include/Game/Boss/TripodBossBaseJointPosition.hpp

@@ -6,14 +6,14 @@
 
 class TripodBossBaseJointPosition : public LiveActor {
 public:
-    TripodBossBaseJointPosition(const char *);
+    TripodBossBaseJointPosition(const char*);
 
     virtual ~TripodBossBaseJointPosition();
-    virtual void init(const JMapInfoIter &);
-    virtual void initAfterPlacement();
+    virtual void   init(const JMapInfoIter&);
+    virtual void   initAfterPlacement();
     virtual MtxPtr getBaseMtx() const;
-    virtual void control();
+    virtual void   control();
 
-    s32 _8C;
+    s32    _8C;
     TPos3f _90;
 };

include/Game/Boss/TripodBossBreakMovement.hpp

@@ -5,27 +5,27 @@
 
 class TripodBossBreakMovement : public LiveActor {
 public:
-    TripodBossBreakMovement(const char *);
+    TripodBossBreakMovement(const char*);
 
     virtual ~TripodBossBreakMovement();
     virtual void movement();
 
-    void start(const TPos3f &, s32);
+    void start(const TPos3f&, s32);
     void setBreakDownLevel(s32);
     void exeStartBreak();
     void exeBreak();
-    void exeWait() { }
+    void exeWait() {}
 
-    TPos3f _8C;
-    SpringValue* mSpring;           // 0xBC
-    TVec3f _C0;
-    TVec3f _CC;
-    TVec3f _D8;
-    TVec3f _E4;
-    f32 _F0;
-    f32 _F4;
-    f32 _F8;
-    u32 _FC;
-    s32 _100;
-    u32 _104;
+    TPos3f       _8C;
+    SpringValue* mSpring; // 0xBC
+    TVec3f       _C0;
+    TVec3f       _CC;
+    TVec3f       _D8;
+    TVec3f       _E4;
+    f32          _F0;
+    f32          _F4;
+    f32          _F8;
+    u32          _FC;
+    s32          _100;
+    u32          _104;
 };

include/Game/Boss/TripodBossCoin.hpp

@@ -8,17 +8,17 @@ class Spine;
 
 class TripodBossCoin : public NameObj {
 public:
-    TripodBossCoin(const char *);
+    TripodBossCoin(const char*);
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void movement();
 
     void exeNonActive();
     void exeActive();
     void exeEnd();
 
-    /* 0x0C */ Coin* mCoin;
+    /* 0x0C */ Coin*  mCoin;
     /* 0x10 */ Spine* mSpine;
     /* 0x14 */ TPos3f _14;
-    /* 0x44 */ s32 _44;
+    /* 0x44 */ s32    _44;
 };

include/Game/Boss/TripodBossCore.hpp

@@ -5,20 +5,20 @@
 
 class TripodBossCore : public TripodBossFixPartsBase {
 public:
-    TripodBossCore(const char *);
+    TripodBossCore(const char*);
 
     virtual ~TripodBossCore();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void kill();
-    virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *);
+    virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*);
     virtual void activateTripodBoss();
 
-    void exeWait();
-    void exeDamageDemo();
-    void exeWarning();
-    void exeBreak();
+    void        exeWait();
+    void        exeDamageDemo();
+    void        exeWarning();
+    void        exeBreak();
     inline void exeNonActive();
 
-    ModelObj* mBreakModel;          // 0xE4
-    ModelObj* mBloomModel;          // 0xE8
+    ModelObj* mBreakModel; // 0xE4
+    ModelObj* mBloomModel; // 0xE8
 };

include/Game/Boss/TripodBossFixParts.hpp

@@ -5,24 +5,24 @@
 
 class TripodBossFixParts : public TripodBossFixPartsBase {
 public:
-    TripodBossFixParts(const char *);
+    TripodBossFixParts(const char*);
 
     virtual ~TripodBossFixParts();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void kill();
     virtual void activateTripodBoss();
     virtual void exeWaitOwn();
 
-    void initSensor(const JMapInfoIter &);
-    void exeStartDemo();
-    void exeWait();
-    void exeBreak();
+    void        initSensor(const JMapInfoIter&);
+    void        exeStartDemo();
+    void        exeWait();
+    void        exeBreak();
     inline void exeNonActive();
 
-    s32 _E4;
-    s32 _E8;
-    bool mHasCollision;             // 0xEC
+    s32  _E4;
+    s32  _E8;
+    bool mHasCollision; // 0xEC
     bool _ED;
-    u8 _EE;
-    bool mIsPlayingWarning;         // 0xEF
+    u8   _EE;
+    bool mIsPlayingWarning; // 0xEF
 };

include/Game/Boss/TripodBossFixPartsBase.hpp

@@ -7,30 +7,30 @@
 
 class TripodBossFixPartsBase : public LiveActor {
 public:
-    TripodBossFixPartsBase(const char *);
+    TripodBossFixPartsBase(const char*);
 
     virtual ~TripodBossFixPartsBase();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void initAfterPlacement();
     virtual void makeActorDead();
     virtual void calcAndSetBaseMtx();
-    virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *);
-    virtual void calcTripodLocalMatrix(TPos3f *);
+    virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*);
+    virtual void calcTripodLocalMatrix(TPos3f*);
     virtual void activateTripodBoss();
 
     void initClippingSphere();
-    void setClippingSphere(const TVec3f &, f32);
+    void setClippingSphere(const TVec3f&, f32);
     void startBreakMovement();
     void updateBreakMovementMatrix();
     void updateTripodMatrix();
     void initBreakMovement(s32);
 
-    TPos3f _8C;
-    TVec3f _BC;
-    TripodBossBreakMovement* mBreakMovement;        // 0xC8
-    s32 _CC;
-    TVec3f _D0;
-    f32 mClippingDistance;                          // 0xDC
-    u8 _E0;
-    u8 _E1;
+    TPos3f                   _8C;
+    TVec3f                   _BC;
+    TripodBossBreakMovement* mBreakMovement; // 0xC8
+    s32                      _CC;
+    TVec3f                   _D0;
+    f32                      mClippingDistance; // 0xDC
+    u8                       _E0;
+    u8                       _E1;
 };

include/Game/Boss/TripodBossGuardWall.hpp

@@ -4,32 +4,32 @@
 #include "Game/LiveActor/HitSensor.hpp"
 #include "Game/LiveActor/LiveActor.hpp"
 
-class TripodBossGuardWall :public LiveActor {
+class TripodBossGuardWall : public LiveActor {
 public:
-    TripodBossGuardWall(const char *);
+    TripodBossGuardWall(const char*);
 
-    virtual void init(const JMapInfoIter &);
-    virtual void makeActorAppeared();
-    virtual void kill();
-    virtual void makeActorDead();
+    virtual void   init(const JMapInfoIter&);
+    virtual void   makeActorAppeared();
+    virtual void   kill();
+    virtual void   makeActorDead();
     virtual MtxPtr getBaseMtx() const;
-    virtual void control();
-    virtual void calcAndSetBaseMtx();
-    virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *);
+    virtual void   control();
+    virtual void   calcAndSetBaseMtx();
+    virtual bool   receiveOtherMsg(u32, HitSensor*, HitSensor*);
 
-    void initParts();
-    void requestStart();
-    void exeRotate();
-    void updateMatrix();
-    void updateCameraTarget();
-    void exeDemo();
+    void        initParts();
+    void        requestStart();
+    void        exeRotate();
+    void        updateMatrix();
+    void        updateCameraTarget();
+    void        exeDemo();
     inline void exeTryDemo();
-    void exeWait() { }
+    void        exeWait() {}
 
-    CameraTargetMtx* mCameraTargetMtx;          // 0x8C
-    TripodBossGuardWallPart mWallParts[8];      // 0x90
-    TPos3f mBaseMtx;                            // 0x550
-    TVec3f _580;
-    s32 _58C;
-    ActorCameraInfo* mCameraInfo;               // 0x590
+    CameraTargetMtx*        mCameraTargetMtx; // 0x8C
+    TripodBossGuardWallPart mWallParts[8];    // 0x90
+    TPos3f                  mBaseMtx;         // 0x550
+    TVec3f                  _580;
+    s32                     _58C;
+    ActorCameraInfo*        mCameraInfo; // 0x590
 };

include/Game/Boss/TripodBossGuardWallPart.hpp

@@ -5,28 +5,28 @@
 
 class TripodBossGuardWallPart : public LiveActor {
 public:
-    TripodBossGuardWallPart(const char *pName = "三脚ボスコア防壁部品");
+    TripodBossGuardWallPart(const char* pName = "三脚ボスコア防壁部品");
 
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void makeActorAppeared();
     virtual void kill();
     virtual void control();
     virtual void calcAndSetBaseMtx();
-    virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *);
-    
-    void requestStartDemo();
-    bool requestBreak();
-    bool isEndDemo() const;
-    void exeBreak();
-    void exeRepair();
+    virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*);
+
+    void        requestStartDemo();
+    bool        requestBreak();
+    bool        isEndDemo() const;
+    void        exeBreak();
+    void        exeRepair();
     inline void exeActive();
     inline void exeDemo();
     inline void exeNonActive();
-    void setHostMatrix(const TPos3f *);
-    void setPlacementAngle(f32);
-    void setStartTiming(s32);
+    void        setHostMatrix(const TPos3f*);
+    void        setPlacementAngle(f32);
+    void        setStartTiming(s32);
 
-    const TPos3f* mHostMtx;     // 0x8C
-    f32 mPlacementAngle;        // 0x90
-    s32 mStartTiming;           // 0x94
+    const TPos3f* mHostMtx;        // 0x8C
+    f32           mPlacementAngle; // 0x90
+    s32           mStartTiming;    // 0x94
 };

include/Game/Boss/TripodBossKillerGeneraterCircle.hpp

@@ -5,21 +5,21 @@
 
 class TripodBossKillerGeneraterCircle : public NameObj {
 public:
-    TripodBossKillerGeneraterCircle(const char *);
+    TripodBossKillerGeneraterCircle(const char*);
 
     virtual ~TripodBossKillerGeneraterCircle();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
 
     void placementGenerater();
 
-    TripodBossKillerGenerater* mGenerators;         // 0xC
-    TVec3f mPosition;                               // 0x10
-    TVec3f mRotation;                               // 0x1C
-    const f32* mAngleTable;                         // 0x28
-    s32 mNumAngles;                                 // 0x2C
-    f32 _30;
-    f32 _34;
-    f32 _38;
-    f32 _3C;
-    u32 _40;
+    TripodBossKillerGenerater* mGenerators; // 0xC
+    TVec3f                     mPosition;   // 0x10
+    TVec3f                     mRotation;   // 0x1C
+    const f32*                 mAngleTable; // 0x28
+    s32                        mNumAngles;  // 0x2C
+    f32                        _30;
+    f32                        _34;
+    f32                        _38;
+    f32                        _3C;
+    u32                        _40;
 };

include/Game/Boss/TripodBossKillerGenerator.hpp

@@ -7,40 +7,40 @@ class HomingKiller;
 
 class TripodBossKillerGenerater : public TripodBossFixPartsBase {
 public:
-    TripodBossKillerGenerater(const char *pName = "三脚ボスキラー発生源");
+    TripodBossKillerGenerater(const char* pName = "三脚ボスキラー発生源");
 
     virtual ~TripodBossKillerGenerater();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void kill();
-    virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *);
-    virtual void calcTripodLocalMatrix(TPos3f *);
+    virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*);
+    virtual void calcTripodLocalMatrix(TPos3f*);
     virtual void activateTripodBoss();
 
-    void setLocalMatrix(const TPos3f &);
-    void setActiveLebel(s32);
-    void setHasCollision(bool);
-    bool tryShootSetting();
-    bool tryShoot();
-    bool tryCoolDown();
-    bool tryReady();
-    bool tryBreak();
-    bool tryAbort();
-    bool requestBreak();
-    void exeShowDemo();
-    void exeReady();
-    void exeShootSetting();
-    void exeShoot();
-    void exeCoolDown();
-    void exeStop();
-    void exeRestart();
-    void exeBreak();
+    void        setLocalMatrix(const TPos3f&);
+    void        setActiveLebel(s32);
+    void        setHasCollision(bool);
+    bool        tryShootSetting();
+    bool        tryShoot();
+    bool        tryCoolDown();
+    bool        tryReady();
+    bool        tryBreak();
+    bool        tryAbort();
+    bool        requestBreak();
+    void        exeShowDemo();
+    void        exeReady();
+    void        exeShootSetting();
+    void        exeShoot();
+    void        exeCoolDown();
+    void        exeStop();
+    void        exeRestart();
+    void        exeBreak();
     inline void exeHide();
     inline void exeNonActive();
 
-    TPos3f _E4;
-    HomingKiller* mKiller;          // 0x114
-    f32 _118;
-    s32 mActiveLabel;               // 0x11C
-    bool mHasCollision;             // 0x120
-    u8 _121;
+    TPos3f        _E4;
+    HomingKiller* mKiller; // 0x114
+    f32           _118;
+    s32           mActiveLabel;  // 0x11C
+    bool          mHasCollision; // 0x120
+    u8            _121;
 };

include/Game/Boss/TripodBossKinokoOneUp.hpp

@@ -6,18 +6,18 @@ class BenefitItemOneUp;
 
 class TripodBossKinokoOneUp : public LiveActor {
 public:
-    TripodBossKinokoOneUp(const char *);
+    TripodBossKinokoOneUp(const char*);
 
     virtual ~TripodBossKinokoOneUp();
-    virtual void init(const JMapInfoIter &);
+    virtual void   init(const JMapInfoIter&);
     virtual MtxPtr getBaseMtx() const;
-    virtual void control();
+    virtual void   control();
 
     void exeActive();
     void exeEnd();
-    
-    TPos3f _8C;
-    TPos3f _BC;
-    BenefitItemOneUp* mOneUp;           // 0xEC
-    s32 _F0;
+
+    TPos3f            _8C;
+    TPos3f            _BC;
+    BenefitItemOneUp* mOneUp; // 0xEC
+    s32               _F0;
 };

include/Game/Boss/TripodBossLeg.hpp

@@ -12,23 +12,23 @@ class TripodBossStepPoint;
 
 class TripodBossLeg : public LiveActor {
 public:
-    TripodBossLeg(const char *);
+    TripodBossLeg(const char*);
 
     virtual ~TripodBossLeg();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void makeActorAppeared();
     virtual void makeActorDead();
     virtual void control();
-    virtual void attackSensor(HitSensor *, HitSensor *);
+    virtual void attackSensor(HitSensor*, HitSensor*);
 
-    void initShadow(const char *);
-    void setBody(TripodBoss *);
-    void setMovableArea(TripodBossMovableArea *);
-    void setIKParam(f32, f32, const TVec3f &, const TVec3f &, const TVec3f &);
-    void setStepTarget(TripodBossStepPoint *);
-    void setWait();
-    void setForceEndPoint(const TVec3f &);
-    void setDemoEffectTiming(bool);
+    void          initShadow(const char*);
+    void          setBody(TripodBoss*);
+    void          setMovableArea(TripodBossMovableArea*);
+    void          setIKParam(f32, f32, const TVec3f&, const TVec3f&, const TVec3f&);
+    void          setStepTarget(TripodBossStepPoint*);
+    void          setWait();
+    void          setForceEndPoint(const TVec3f&);
+    void          setDemoEffectTiming(bool);
     const TPos3f& getRootJointMatrix() const;
     const TPos3f& getMiddleJointMatrix() const;
     const TPos3f& getEndJointMatrix() const;
@@ -36,74 +36,74 @@ public:
     const TPos3f& getRootLocalYZMatrix() const;
     const TPos3f& getAnkleLocalXMatrix() const;
     const TPos3f& getAnkleLocalXZMatrix() const;
-    void requestStepTarget(TripodBossStepPoint *);
-    void requestLeaveOut();
-    void requestBreak();
-    void requestStartDemo();
-    void requestEndDemo();
-    bool isLanding() const;
-    bool isDamage() const;
-    bool isStop() const;
-    bool isBroken() const;
-    bool isPressPlayer() const;
-    bool canStep() const;
-    bool canCancelStep() const;
-    bool canWeighting() const;
-    void exeDemo();
-    void exeUp();
-    void exeLeaveOut();
-    void exeMove();
-    void exeMoveToLandingPos();
-    void exeStampSign();
-    void exeLanding();
-    void exeDamageVibration();
-    void exeBreak();
-    inline void exeDamage();
-    inline void exeHold();
-    void addToTargetPower(const TVec3f &, f32);
-    void addIKLimitPower();
-    void addAccelUpLeg(TripodBossStepPoint *, f32);
-    f32 calcLegHeight(TripodBossStepPoint *) const NO_INLINE;
-    void updatePose();
-    void updateIKPose();
-    bool bindEndPosition();
-    void separateLocalAxisRootJoint(const TPos3f &);
-    void separateAnkleJointLocalAxis();
-    void updateAnkleUp(f32);
-    void updateAnkleSlerpToBasePose();
-    void updateAnkleLanding();
-    void updateAnkleShadowMatrix();
+    void          requestStepTarget(TripodBossStepPoint*);
+    void          requestLeaveOut();
+    void          requestBreak();
+    void          requestStartDemo();
+    void          requestEndDemo();
+    bool          isLanding() const;
+    bool          isDamage() const;
+    bool          isStop() const;
+    bool          isBroken() const;
+    bool          isPressPlayer() const;
+    bool          canStep() const;
+    bool          canCancelStep() const;
+    bool          canWeighting() const;
+    void          exeDemo();
+    void          exeUp();
+    void          exeLeaveOut();
+    void          exeMove();
+    void          exeMoveToLandingPos();
+    void          exeStampSign();
+    void          exeLanding();
+    void          exeDamageVibration();
+    void          exeBreak();
+    inline void   exeDamage();
+    inline void   exeHold();
+    void          addToTargetPower(const TVec3f&, f32);
+    void          addIKLimitPower();
+    void          addAccelUpLeg(TripodBossStepPoint*, f32);
+    f32           calcLegHeight(TripodBossStepPoint*) const NO_INLINE;
+    void          updatePose();
+    void          updateIKPose();
+    bool          bindEndPosition();
+    void          separateLocalAxisRootJoint(const TPos3f&);
+    void          separateAnkleJointLocalAxis();
+    void          updateAnkleUp(f32);
+    void          updateAnkleSlerpToBasePose();
+    void          updateAnkleLanding();
+    void          updateAnkleShadowMatrix();
 
-    TripodBoss* mBoss;                      // 0x8C
-    TripodBossMovableArea* mMoveArea;       // 0x90
-    TripodBossStepPoint* _94;
-    TripodBossStepPoint* _98;
-    IKJoint* mJoint;                        // 0x9C
-    TPos3f _A0;
-    TPos3f mRootLocalYMtx;                 // 0xD0
-    TPos3f mRootLocalYZMtx;                // 0x100
-    TPos3f mAnkleLocalXMtx;                // 0x130
-    TPos3f mAnkleLocalXZMtx;               // 0x160
-    TPos3f mEndJointMtx;                   // 0x190
-    TPos3f _1C0;
-    TQuat4f _1F0;
-    TQuat4f _200;
-    TVec3f _210;
-    TVec3f _21C;
-    TVec3f mForceEndPoint;                  // 0x228
-    TVec3f _234;
-    TVec3f _240;
-    u32 _24C;
-    f32 _250;
-    u8 _254;
-    bool mIsPressPlayer;                    // 0x255
-    u8 _256;
-    u8 _257;
-    s32 mDemoTiming;                        // 0x258
-    AudAnmSoundObject* _25C;
-    AudAnmSoundObject* _260;
+    TripodBoss*            mBoss;     // 0x8C
+    TripodBossMovableArea* mMoveArea; // 0x90
+    TripodBossStepPoint*   _94;
+    TripodBossStepPoint*   _98;
+    IKJoint*               mJoint; // 0x9C
+    TPos3f                 _A0;
+    TPos3f                 mRootLocalYMtx;   // 0xD0
+    TPos3f                 mRootLocalYZMtx;  // 0x100
+    TPos3f                 mAnkleLocalXMtx;  // 0x130
+    TPos3f                 mAnkleLocalXZMtx; // 0x160
+    TPos3f                 mEndJointMtx;     // 0x190
+    TPos3f                 _1C0;
+    TQuat4f                _1F0;
+    TQuat4f                _200;
+    TVec3f                 _210;
+    TVec3f                 _21C;
+    TVec3f                 mForceEndPoint; // 0x228
+    TVec3f                 _234;
+    TVec3f                 _240;
+    u32                    _24C;
+    f32                    _250;
+    u8                     _254;
+    bool                   mIsPressPlayer; // 0x255
+    u8                     _256;
+    u8                     _257;
+    s32                    mDemoTiming; // 0x258
+    AudAnmSoundObject*     _25C;
+    AudAnmSoundObject*     _260;
 };
 
 namespace MR {
-    void separateMatrixRotateYZX(TPos3f *, TPos3f *, const TPos3f &, const TPos3f &);
+    void separateMatrixRotateYZX(TPos3f*, TPos3f*, const TPos3f&, const TPos3f&);
 };

include/Game/Boss/TripodBossMovableArea.hpp

@@ -16,21 +16,20 @@ class TripodBossMovableArea {
 public:
     TripodBossMovableArea();
 
-    virtual bool collideSphere(HitResult *, const TVec3f &, f32, const TVec3f &) const;
-    virtual void calcNearLandingPosition(TVec3f *, const TVec3f &) const;
-    virtual void calcLandingNormal(TVec3f *, const TVec3f &) const;
-    virtual void calcLandingFront(TVec3f *, const TVec3f &) const;
+    virtual bool collideSphere(HitResult*, const TVec3f&, f32, const TVec3f&) const;
+    virtual void calcNearLandingPosition(TVec3f*, const TVec3f&) const;
+    virtual void calcLandingNormal(TVec3f*, const TVec3f&) const;
+    virtual void calcLandingFront(TVec3f*, const TVec3f&) const;
 
-    void setCenter(const TVec3f &);
-    void setBaseAxis(const TVec3f &);
-    void setFrontVector(const TVec3f &);
+    void setCenter(const TVec3f&);
+    void setBaseAxis(const TVec3f&);
+    void setFrontVector(const TVec3f&);
     void setRadius(f32);
-    
 
-    TVec3f mCenter;         // 0x04
-    TVec3f mBaseAxis;       // 0x10
-    TVec3f mFront;          // 0x1C
-    f32 mRadius;            // 0x28
-    f32 _2C;
-    f32 _30;
+    TVec3f mCenter;   // 0x04
+    TVec3f mBaseAxis; // 0x10
+    TVec3f mFront;    // 0x1C
+    f32    mRadius;   // 0x28
+    f32    _2C;
+    f32    _30;
 };

include/Game/Boss/TripodBossRailMoveParts.hpp

@@ -6,14 +6,14 @@ class MapPartsRailMover;
 
 class TripodBossRailMoveParts : public TripodBossFixParts {
 public:
-    TripodBossRailMoveParts(const char *);
+    TripodBossRailMoveParts(const char*);
 
     virtual ~TripodBossRailMoveParts();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void makeActorDead();
-    virtual void calcTripodLocalMatrix(TPos3f *);
+    virtual void calcTripodLocalMatrix(TPos3f*);
     virtual void activateTripodBoss();
     virtual void exeWaitOwn();
 
-    MapPartsRailMover* mRailMover;          // 0xF0
+    MapPartsRailMover* mRailMover; // 0xF0
 };

include/Game/Boss/TripodBossRotateParts.hpp

@@ -6,14 +6,14 @@ class MapPartsRotator;
 
 class TripodBossRotateParts : public TripodBossFixParts {
 public:
-    TripodBossRotateParts(const char *);
+    TripodBossRotateParts(const char*);
 
     virtual ~TripodBossRotateParts();
-    virtual void init(const JMapInfoIter &);
+    virtual void init(const JMapInfoIter&);
     virtual void makeActorDead();
-    virtual void calcTripodLocalMatrix(TPos3f *);
+    virtual void calcTripodLocalMatrix(TPos3f*);
     virtual void activateTripodBoss();
     virtual void exeWaitOwn();
 
-    MapPartsRotator* mRotator;          // 0xF0
+    MapPartsRotator* mRotator; // 0xF0
 };