Format!

include/BaseParm.h

@@ -45,9 +45,9 @@ struct ParmEnum : public BaseParm {
 	virtual void write(Stream&);
 	virtual void read(Stream&);
 
-	ulong  m_value; // _18
-	int    _1C;     // _1C
-	char** _20;     // _20
+	ulong m_value; // _18
+	int _1C;       // _1C
+	char** _20;    // _20
 };
 
 #endif

include/Container.h

@@ -14,7 +14,8 @@ template <typename T> struct Container : public CNode {
 	virtual int getEnd();
 	// Gets the object at the given slot index (or null if not occupied).
 	virtual T* get(int);
-	// Gets the object at the given slot index (or null if not occupied) (actually constrained to taking an int argument, instead of void*).
+	// Gets the object at the given slot index (or null if not occupied)
+	// (actually constrained to taking an int argument, instead of void*).
 	virtual T* getAt(void*);
 	// Gets the slot count.
 	virtual int getTo();

include/DvdThreadCommand.h

@@ -24,4 +24,4 @@ struct DvdThreadCommand {
 	JSUPtrLink m_link;            // _5C
 };
 
-#endif
+#endif

include/Game/Cave/Info.h

@@ -14,176 +14,172 @@
 namespace Game {
 namespace Cave {
 
-struct BaseGen : public CNode {
+	struct BaseGen : public CNode {
 #pragma enumsalwaysint on
-	/**
-	 * Spawn type used by BaseGen (caves).
-	 * UNUSED_3 is player 1 spawn in vs mode? (see Game::Cave::RandMapMgr::getStartPosition)
-	 */
-	enum Type {
-		TekiA__Easy = 0,
-		TekiB__Hard,
-		Treasure__Item,
-		Unused3,
-		HoleOrGeyser,
-		Seam__Door,
-		Plant,
-		Start,
-		TekiF__Special,
-		Alcove
-	};
+		/**
+		 * Spawn type used by BaseGen (caves).
+		 * UNUSED_3 is player 1 spawn in vs mode? (see
+		 * Game::Cave::RandMapMgr::getStartPosition)
+		 */
+		enum Type {
+			TekiA__Easy = 0,
+			TekiB__Hard,
+			Treasure__Item,
+			Unused3,
+			HoleOrGeyser,
+			Seam__Door,
+			Plant,
+			Start,
+			TekiF__Special,
+			Alcove
+		};
 #pragma enumsalwaysint reset
-	BaseGen();
-	virtual ~BaseGen();
-	virtual void read(Stream&);
-	void draw(Graphics&, Matrixf*);
+		BaseGen();
+		virtual ~BaseGen();
+		virtual void read(Stream&);
+		void draw(Graphics&, Matrixf*);
 
-
-	Type m_spawnType;    // _18
-	Vector3f m_position; // _1C
-	float m_angle;       // _28
-	float m_radius;      // _2C
-	int m_minimum;       // _30
-	int m_maximum;       // _34
-};
-
-struct TekiInfo : CNode {
-	enum DropMode {
-		NoDrop = 0,
-		DropOnPikminOrLeader,
-		DropOnPikmin,
-		DropOnLeader,
-		DropOnCarryingPikmin,
-		DropFromPurpleEarthquake
-	};
-	virtual ~TekiInfo();
-	virtual void read(Stream&);
-
-	EEnemyTypeID m_enemyID;  // _18
-	int m_weight;            // _1C
-	BaseGen::Type m_type;    // _20
-	DropMode m_dropMode;     // _24
-	u8 _25;                  // _25
-	Game::PelletMgr::OtakaraItemCode m_otakaraItemCode; // _26
-};
-
-struct ItemInfo : CNode {
-	virtual ~ItemInfo();
-	virtual void read(Stream&);
-
-	int m_caveID; // _18
-	int m_weight; // _1C
-};
-
-struct GateInfo : CNode {
-	virtual ~GateInfo();
-	virtual void read(Stream&);
-
-	int   m_caveID;  // _18
-	float m_life;    // _1C
-	int   m_weight;  // _20
-};
-
-struct CapInfo : CNode {
-	TekiInfo* getTekiInfo();
-	virtual ~CapInfo();
-	virtual void read(Stream&);
-
-
-	bool      m_doesNotHaveTeki; // _18  /* Always false? */
-	u8        _19[3];            // _19
-	TekiInfo* m_tekiInfo;        // _1C
-};
-
-struct FloorInfo : CNode {
-	struct Parms : Parameters {
-		Parms();
-
-		Parm<int>   m_floorIndex1;       // _00C  /* f000 */
-		Parm<int>   m_floorIndex2;       // _034  /* f001 */
-		Parm<int>   m_tekiMax;           // _05C  /* f002 */
-		Parm<int>   m_itemMax;           // _084  /* f003 */
-		Parm<int>   m_gateMax;           // _0AC  /* f004 */
-		Parm<int>   m_capMax;            // _0D4  /* f014 */
-		Parm<int>   m_roomCount;         // _0FC  /* f005 */
-		Parm<float> m_routeRatio;        // _124  /* f006 */
-		Parm<int>   m_hasEscapeFountain; // _14C  /* f007 */
-		ParmString  m_caveUnitFile;      // _174  /* f008 */
-		ParmString  m_lightingFile;      // _194  /* f009 */
-		ParmString  m_vrBox;             // _1B4  /* f00A */
-		Parm<int>   m_isHoleClogged;     // _1D4  /* f010 */
-		ParmEnum    m_floorAlphaType;    // _1FC  /* f011 */
-
-		ParmEnum    m_floorBetaType;     // _220  /* f012 */
-
-		ParmEnum    m_floorHidden;       // _244  /* f013 */
-
-		Parm<int>   m_version;           // _268  /* f015 */
-		Parm<float> m_waterwraithTimer;  // _290  /* f016 */
-		Parm<int>   m_glitchySeesaw;     // _2B8  /* f017 */
-		void*       m_end;               // _2E0
+		Type m_spawnType;    // _18
+		Vector3f m_position; // _1C
+		float m_angle;       // _28
+		float m_radius;      // _2C
+		int m_minimum;       // _30
+		int m_maximum;       // _34
 	};
 
-	FloorInfo();
-	virtual ~FloorInfo();
-	virtual void read(Stream&);
+	struct TekiInfo : CNode {
+		enum DropMode {
+			NoDrop = 0,
+			DropOnPikminOrLeader,
+			DropOnPikmin,
+			DropOnLeader,
+			DropOnCarryingPikmin,
+			DropFromPurpleEarthquake
+		};
+		virtual ~TekiInfo();
+		virtual void read(Stream&);
 
-	int getTekiMax();
-	int getTekiInfoNum();
-	TekiInfo* getTekiInfo(int);
-	int getTekiWeightSum();
-
-	int getItemMax();
-	int getItemInfoNum();
-	ItemInfo* getItemInfo(int);
-	int getItemWeightSum();
-
-	int getGateMax();
-	int getGateInfoNum();
-	GateInfo* getGateInfo(int);
-	int getGateWeightSum();
-
-	int getCapMax();
-	int getCapInfoNum();
-	CapInfo* getCapInfo(int);
-
-	int getRoomNum();
-	float getRouteRatio();
-	bool hasEscapeFountain(int);
-	bool hasHiddenCollision();
-	bool useKaidanBarrel();
-
-
-	Parms    m_parms;    // _018
-	TekiInfo m_tekiInfo; // _2FC
-	ItemInfo m_itemInfo; // _324
-	GateInfo m_gateInfo; // _344
-	CapInfo  m_capInfo;  // _368
-};
-
-struct CaveInfo : CNode {
-	/* Erased? */
-	struct Parms : Parameters {
-		inline Parms();
-		Parm<int> m_floorMax; // _0C
-		void*     m_end;      // _34
+		EEnemyTypeID m_enemyID;                             // _18
+		int m_weight;                                       // _1C
+		BaseGen::Type m_type;                               // _20
+		DropMode m_dropMode;                                // _24
+		u8 _25;                                             // _25
+		Game::PelletMgr::OtakaraItemCode m_otakaraItemCode; // _26
 	};
 
-	CaveInfo();
-	virtual ~CaveInfo();
-	virtual void read(Stream&);
+	struct ItemInfo : CNode {
+		virtual ~ItemInfo();
+		virtual void read(Stream&);
 
-	void disablePelplant();
-	int  getFloorMax();
-	FloorInfo* getFloorInfo(int);
-	void load(char*);
+		int m_caveID; // _18
+		int m_weight; // _1C
+	};
 
+	struct GateInfo : CNode {
+		virtual ~GateInfo();
+		virtual void read(Stream&);
 
-	Parms     m_parms;     // _18
-	FloorInfo m_floorInfo; // _50
-};
+		int m_caveID; // _18
+		float m_life; // _1C
+		int m_weight; // _20
+	};
+
+	struct CapInfo : CNode {
+		TekiInfo* getTekiInfo();
+		virtual ~CapInfo();
+		virtual void read(Stream&);
+
+		bool m_doesNotHaveTeki; // _18  /* Always false? */
+		u8 _19[3];              // _19
+		TekiInfo* m_tekiInfo;   // _1C
+	};
+
+	struct FloorInfo : CNode {
+		struct Parms : Parameters {
+			Parms();
+
+			Parm<int> m_floorIndex1;       // _00C  /* f000 */
+			Parm<int> m_floorIndex2;       // _034  /* f001 */
+			Parm<int> m_tekiMax;           // _05C  /* f002 */
+			Parm<int> m_itemMax;           // _084  /* f003 */
+			Parm<int> m_gateMax;           // _0AC  /* f004 */
+			Parm<int> m_capMax;            // _0D4  /* f014 */
+			Parm<int> m_roomCount;         // _0FC  /* f005 */
+			Parm<float> m_routeRatio;      // _124  /* f006 */
+			Parm<int> m_hasEscapeFountain; // _14C  /* f007 */
+			ParmString m_caveUnitFile;     // _174  /* f008 */
+			ParmString m_lightingFile;     // _194  /* f009 */
+			ParmString m_vrBox;            // _1B4  /* f00A */
+			Parm<int> m_isHoleClogged;     // _1D4  /* f010 */
+			ParmEnum m_floorAlphaType;     // _1FC  /* f011 */
+
+			ParmEnum m_floorBetaType; // _220  /* f012 */
+
+			ParmEnum m_floorHidden; // _244  /* f013 */
+
+			Parm<int> m_version;            // _268  /* f015 */
+			Parm<float> m_waterwraithTimer; // _290  /* f016 */
+			Parm<int> m_glitchySeesaw;      // _2B8  /* f017 */
+			void* m_end;                    // _2E0
+		};
+
+		FloorInfo();
+		virtual ~FloorInfo();
+		virtual void read(Stream&);
+
+		int getTekiMax();
+		int getTekiInfoNum();
+		TekiInfo* getTekiInfo(int);
+		int getTekiWeightSum();
+
+		int getItemMax();
+		int getItemInfoNum();
+		ItemInfo* getItemInfo(int);
+		int getItemWeightSum();
+
+		int getGateMax();
+		int getGateInfoNum();
+		GateInfo* getGateInfo(int);
+		int getGateWeightSum();
+
+		int getCapMax();
+		int getCapInfoNum();
+		CapInfo* getCapInfo(int);
+
+		int getRoomNum();
+		float getRouteRatio();
+		bool hasEscapeFountain(int);
+		bool hasHiddenCollision();
+		bool useKaidanBarrel();
+
+		Parms m_parms;       // _018
+		TekiInfo m_tekiInfo; // _2FC
+		ItemInfo m_itemInfo; // _324
+		GateInfo m_gateInfo; // _344
+		CapInfo m_capInfo;   // _368
+	};
+
+	struct CaveInfo : CNode {
+		/* Erased? */
+		struct Parms : Parameters {
+			inline Parms();
+			Parm<int> m_floorMax; // _0C
+			void* m_end;          // _34
+		};
+
+		CaveInfo();
+		virtual ~CaveInfo();
+		virtual void read(Stream&);
+
+		void disablePelplant();
+		int getFloorMax();
+		FloorInfo* getFloorInfo(int);
+		void load(char*);
+
+		Parms m_parms;         // _18
+		FloorInfo m_floorInfo; // _50
+	};
 } // namespace Cave
 } // namespace Game
 
-
 #endif

include/Game/EnemyPelletInfo.h

@@ -13,4 +13,4 @@ struct EnemyPelletInfo {
 };
 } // namespace Game
 
-#endif
+#endif

include/Game/PikiMgr.h

@@ -39,4 +39,4 @@ struct PikiMgr : public MonoObjectMgr<Game::Piki> {
 };
 } // namespace Game
 
-#endif
+#endif

include/JSystem/J3D/J3DDrawMtxData.h

@@ -7,4 +7,4 @@ struct J3DDrawMtxData {
 	u16 m_count;
 };
 
-#endif
+#endif

include/JSystem/J3D/J3DJoint.h

@@ -26,4 +26,4 @@ struct J3DJoint {
 	J3DMaterial* m_material;      // _58
 };
 
-#endif
+#endif

include/JSystem/J3D/J3DJointBlock.h

@@ -15,4 +15,4 @@ struct J3DJointBlock {
 	s32 _18;           // _18
 };
 
-#endif
+#endif

include/JSystem/J3D/J3DJointTree.h

@@ -33,4 +33,4 @@ struct J3DJointTree {
 	JUTNameTab* nametab;            // _44
 };
 
-#endif
+#endif

include/JSystem/J3D/J3DMatColorAnm.h

@@ -9,4 +9,4 @@ struct J3DMatColorAnm {
 	u16 _04; // _04
 };
 
-#endif
+#endif

include/JSystem/J3D/J3DMaterialAnm.h

@@ -17,4 +17,4 @@ struct J3DMaterialAnm {
 	J3DTevKColorAnm m_tevKColAnmList[4];
 };
 
-#endif
+#endif

include/JSystem/J3D/J3DShape.h

@@ -32,4 +32,4 @@ struct J3DShape {
 	s32* _60;              // _60
 };
 
-#endif
+#endif

include/JSystem/J3D/J3DTevColorAnm.h

@@ -13,4 +13,4 @@ struct J3DTevKColorAnm {
 	u32 _04; // _04
 };
 
-#endif
+#endif

include/JSystem/J3D/J3DTexGenBlockPatched.h

@@ -13,4 +13,4 @@ struct J3DTexGenBlockPatched {
 	u32* m_dlistOffs;            // _58
 };
 
-#endif
+#endif

include/JSystem/J3D/J3DTexMtx.h

@@ -38,4 +38,4 @@ struct J3DTexMtx {
 	Matrixf _64;  // _64
 };
 
-#endif
+#endif

include/JSystem/J3D/J3DTexMtxAnm.h

@@ -8,4 +8,4 @@ struct J3DTexMtxAnm {
 	u32 _04; // _04
 };
 
-#endif
+#endif

include/JSystem/J3D/J3DTexNoAnm.h

@@ -9,4 +9,4 @@ struct J3DTexNoAnm {
 	u32 _08; // _08
 };
 
-#endif
+#endif

include/JSystem/JKR/JKRHeap.h

@@ -78,7 +78,7 @@ struct JKRHeap : public JKRDisposer {
 	virtual bool dump_sort();
 	virtual bool dump();
 	virtual void do_destroy();
-	virtual void* do_alloc(ulong,int);
+	virtual void* do_alloc(ulong, int);
 	virtual void do_free(void*);
 	virtual void do_freeAll();
 	virtual void do_freeTail();

include/MonoObjectMgr.h

@@ -12,4 +12,4 @@ template <typename T> struct MonoObjectMgr : public CNode {
 	s8* m_openIds;     // _2C
 };
 
-#endif
+#endif

include/SweepPrune.h

@@ -9,7 +9,7 @@ struct Node {
 	Node* m_prev;    // _04
 	Node* m_next;    // _08
 	Node* m_current; // _0C
-	uint  m_flags;   // _10
+	uint m_flags;    // _10
 };
 
 struct Object {
@@ -24,5 +24,4 @@ struct World {
 };
 } // namespace SweepPrune
 
-
 #endif

include/Sys/Sphere.h

@@ -6,7 +6,7 @@
 namespace Sys {
 struct Sphere {
 	Vector3<float> m_position; // _00
-	float          m_radius;   // _0C
+	float m_radius;            // _0C
 };
 } // namespace Sys
 

include/Sys/Triangle.h

@@ -21,4 +21,4 @@ struct Triangle { // PlaceHolder Structure
 };
 } // namespace Sys
 
-#endif
+#endif

include/cellPyramid.h

@@ -10,7 +10,6 @@
 #include "Rect.h"
 #include "Vector2.h"
 
-
 namespace Game {
 struct CellObject;
 
@@ -18,7 +17,7 @@ struct CollNode {
 	CollNode();
 
 	CellObject* m_cellObject; // _00
-	float       _04;          // _04
+	float _04;                // _04
 };
 
 struct CollisionBuffer {
@@ -108,10 +107,10 @@ struct CellLayer {
 
 	ushort m_sizeX;
 	ushort m_sizeY;
-	short  _04;
-	short  _06;
-	Cell*  m_cells; // _08
-	u8 _0C[0x2C];   // _0C // maybe this is a Cell?
+	short _04;
+	short _06;
+	Cell* m_cells; // _08
+	u8 _0C[0x2C];  // _0C // maybe this is a Cell?
 };
 
 struct CellPyramid : public SweepPrune::World {
@@ -141,7 +140,7 @@ struct CellPyramid : public SweepPrune::World {
 	float _38;
 	float _3C;
 	float _40;
-	uint  _44;
+	uint _44;
 };
 } // namespace Game
 

src/JSystem/JKR/JKRDisposer.cpp

@@ -9,7 +9,7 @@
  * Size:	000068
  */
 JKRDisposer::JKRDisposer()
-	: m_link(this)
+    : m_link(this)
 {
 	p_heap = JKRHeap::findFromRoot(this);
 	if (p_heap) {

src/JSystem/JKR/JKRHeap.cpp

@@ -247,26 +247,27 @@ JKRHeap::~JKRHeap()
  * Address:	800234EC
  * Size:	0000A8
  */
-bool JKRHeap::initArena(char** outUserRamStart, ulong* outUserRamSize, int numHeaps)
+bool JKRHeap::initArena(char** outUserRamStart, ulong* outUserRamSize,
+                        int numHeaps)
 {
-	void* arenaLo = OSGetArenaLo();
-	void* arenaHi = OSGetArenaHi();
+	void* arenaLo    = OSGetArenaLo();
+	void* arenaHi    = OSGetArenaHi();
 	bool sanityCheck = (arenaLo != arenaHi);
 	if (sanityCheck) {
 		OSInitAlloc(arenaLo, arenaHi, numHeaps);
-		u8* userRamEnd = (u8*)((ulong)arenaHi & ~0x1f);
+		u8* userRamEnd   = (u8*)((ulong)arenaHi & ~0x1f);
 		u8* userRamStart = (u8*)(((ulong)arenaLo + 0x1f) & ~0x1f);
 		// TODO: Remove hardcoding of start of memory?
 		mCodeStart = (u8*)0x80000000;
 		// TODO: Remove hardcoding of what I've called OS::PhysicalMemorySize.
-		mMemorySize = *((u32*)0x80000028);
-		mCodeEnd = userRamStart;
+		mMemorySize   = *((u32*)0x80000028);
+		mCodeEnd      = userRamStart;
 		mUserRamStart = userRamStart;
-		mUserRamEnd = userRamEnd;
+		mUserRamEnd   = userRamEnd;
 		OSSetArenaLo(userRamEnd);
 		OSSetArenaHi(userRamEnd);
 		*outUserRamStart = (char*)userRamStart;
-		*outUserRamSize = (ulong)userRamEnd - (ulong)userRamStart;
+		*outUserRamSize  = (ulong)userRamEnd - (ulong)userRamStart;
 	}
 	return sanityCheck;
 	/*
@@ -328,7 +329,7 @@ bool JKRHeap::initArena(char** outUserRamStart, ulong* outUserRamSize, int numHe
 JKRHeap* JKRHeap::becomeSystemHeap()
 {
 	JKRHeap* old = sSystemHeap;
-	sSystemHeap = this;
+	sSystemHeap  = this;
 	return old;
 	/*
 	.loc_0x0:
@@ -773,7 +774,9 @@ ulong JKRHeap::getMaxAllocatableSize(int p1)
 {
 	// u8* maxFreeBlock = do_getMaxFreeBlock();
 	// ulong freeSize = do_getFreeSize();
-	return ~(p1 - 1) & do_getFreeSize() - (p1 - 1 & p1 - ((ulong)do_getMaxFreeBlock() & 0xf));
+	return ~(p1 - 1)
+	       & do_getFreeSize()
+	             - (p1 - 1 & p1 - ((ulong)do_getMaxFreeBlock() & 0xf));
 	/*
 	.loc_0x0:
 	  stwu      r1, -0x20(r1)
@@ -1101,7 +1104,7 @@ JKRHeap* JKRHeap::find(void* memory) const
  * Address:	80023BA0
  * Size:	000014
  */
-template<> JKRHeap* JSUTree<JKRHeap>::getNextChild() const
+template <> JKRHeap* JSUTree<JKRHeap>::getNextChild() const
 {
 	JSUPtrLink* next = m_link.m_next;
 	return (next) ? (JKRHeap*)next[-1].m_list : nullptr;
@@ -1120,7 +1123,8 @@ template<> JKRHeap* JSUTree<JKRHeap>::getNextChild() const
  * Address:	80023BB4
  * Size:	000018
  */
-template<> bool JSUTreeIterator<JKRHeap>::operator!=(const JSUTree<JKRHeap>*) const
+template <>
+bool JSUTreeIterator<JKRHeap>::operator!=(const JSUTree<JKRHeap>*) const
 {
 	/*
 	.loc_0x0:
@@ -1138,17 +1142,14 @@ template<> bool JSUTreeIterator<JKRHeap>::operator!=(const JSUTree<JKRHeap>*) co
  * Address:	80023BCC
  * Size:	000008
  */
-template<> JKRHeap* JSUTree<JKRHeap>::getEndChild() const
-{
-	return nullptr;
-}
+template <> JKRHeap* JSUTree<JKRHeap>::getEndChild() const { return nullptr; }
 
 /*
  * --INFO--
  * Address:	80023BD4
  * Size:	00001C
  */
-template<> void JSUTreeIterator<JKRHeap>::operator++()
+template <> void JSUTreeIterator<JKRHeap>::operator++()
 {
 	/*
 	.loc_0x0:
@@ -1169,7 +1170,7 @@ template<> void JSUTreeIterator<JKRHeap>::operator++()
  * Address:	80023BF0
  * Size:	00000C
  */
-template<> JKRHeap* JSUTreeIterator<JKRHeap>::operator->() const
+template <> JKRHeap* JSUTreeIterator<JKRHeap>::operator->() const
 {
 	return (JKRHeap*)m_tree->m_link.m_value;
 }
@@ -1179,8 +1180,9 @@ template<> JKRHeap* JSUTreeIterator<JKRHeap>::operator->() const
  * Address:	80023BFC
  * Size:	000008
  */
-template<> JSUTreeIterator<JKRHeap>::JSUTreeIterator(JSUTree<JKRHeap>* tree)
-	: m_tree(tree)
+template <>
+JSUTreeIterator<JKRHeap>::JSUTreeIterator(JSUTree<JKRHeap>* tree)
+    : m_tree(tree)
 {
 }
 
@@ -1189,7 +1191,7 @@ template<> JSUTreeIterator<JKRHeap>::JSUTreeIterator(JSUTree<JKRHeap>* tree)
  * Address:	80023C04
  * Size:	000008
  */
-template<> int JSUTree<JKRHeap>::getNumChildren() const
+template <> int JSUTree<JKRHeap>::getNumChildren() const
 {
 	return m_list.m_linkCount;
 }
@@ -1199,7 +1201,7 @@ template<> int JSUTree<JKRHeap>::getNumChildren() const
  * Address:	80023C0C
  * Size:	000014
  */
-template<> JKRHeap* JSUTree<JKRHeap>::getFirstChild() const
+template <> JKRHeap* JSUTree<JKRHeap>::getFirstChild() const
 {
 	/*
 	.loc_0x0:
@@ -1225,7 +1227,7 @@ JSUPtrLink* JSUPtrList::getFirstLink() const { return m_head; }
  */
 u32 JKRHeap::dispose(void* memory, ulong p2)
 {
-	int returnValue = 0;
+	int returnValue   = 0;
 	JSUPtrLink* link1 = _5C.m_head;
 	JSUPtrLink* link2;
 	JSUPtrLink* link3;
@@ -1512,7 +1514,9 @@ JKRHeapErrorHandler* JKRHeap::setErrorHandler(JKRHeapErrorHandler* newHandler)
  */
 void* operator new(ulong byteCount)
 {
-	return (JKRHeap::sCurrentHeap) ? JKRHeap::sCurrentHeap->do_alloc(byteCount, 4) : nullptr;
+	return (JKRHeap::sCurrentHeap)
+	           ? JKRHeap::sCurrentHeap->do_alloc(byteCount, 4)
+	           : nullptr;
 	// void* memory;
 	// if (JKRHeap::sCurrentHeap) {
 	// 	memory = JKRHeap::sCurrentHeap->do_alloc(byteCount, 4);
@@ -1555,7 +1559,9 @@ void* operator new(ulong byteCount)
  */
 void* operator new(ulong byteCount, int p2)
 {
-	return (JKRHeap::sCurrentHeap) ? JKRHeap::sCurrentHeap->do_alloc(byteCount, p2) : nullptr;
+	return (JKRHeap::sCurrentHeap)
+	           ? JKRHeap::sCurrentHeap->do_alloc(byteCount, p2)
+	           : nullptr;
 	/*
 	.loc_0x0:
 	  stwu      r1, -0x10(r1)
@@ -1595,7 +1601,9 @@ void* operator new(ulong byteCount, JKRHeap* heap, int p3)
 	if (heap) {
 		return heap->do_alloc(byteCount, p3);
 	} else {
-		return (JKRHeap::sCurrentHeap) ? JKRHeap::sCurrentHeap->do_alloc(byteCount, p3) : nullptr;
+		return (JKRHeap::sCurrentHeap)
+		           ? JKRHeap::sCurrentHeap->do_alloc(byteCount, p3)
+		           : nullptr;
 	}
 	/*
 	.loc_0x0:
@@ -1642,7 +1650,9 @@ void* operator new(ulong byteCount, JKRHeap* heap, int p3)
  */
 void* operator new[](ulong byteCount)
 {
-	return (JKRHeap::sCurrentHeap) ? JKRHeap::sCurrentHeap->do_alloc(byteCount, 4) : nullptr;
+	return (JKRHeap::sCurrentHeap)
+	           ? JKRHeap::sCurrentHeap->do_alloc(byteCount, 4)
+	           : nullptr;
 	/*
 	.loc_0x0:
 	  stwu      r1, -0x10(r1)
@@ -1678,7 +1688,9 @@ void* operator new[](ulong byteCount)
  */
 void* operator new[](ulong byteCount, int p2)
 {
-	return (JKRHeap::sCurrentHeap) ? JKRHeap::sCurrentHeap->do_alloc(byteCount, p2) : nullptr;
+	return (JKRHeap::sCurrentHeap)
+	           ? JKRHeap::sCurrentHeap->do_alloc(byteCount, p2)
+	           : nullptr;
 	/*
 	.loc_0x0:
 	  stwu      r1, -0x10(r1)
@@ -1718,7 +1730,9 @@ void* operator new[](ulong byteCount, JKRHeap* heap, int p3)
 	if (heap) {
 		return heap->do_alloc(byteCount, p3);
 	} else {
-		return (JKRHeap::sCurrentHeap) ? JKRHeap::sCurrentHeap->do_alloc(byteCount, p3) : nullptr;
+		return (JKRHeap::sCurrentHeap)
+		           ? JKRHeap::sCurrentHeap->do_alloc(byteCount, p3)
+		           : nullptr;
 	}
 	/*
 	.loc_0x0:
@@ -2175,14 +2189,15 @@ bool JKRHeap::TState::isVerbose() { return bVerbose; }
  * Address:	8002454C
  * Size:	000080
  */
-JKRHeap::TState::TState(const JKRHeap* heap, ulong id, bool isCompareOnDestructed)
-	: _00(0)
-	, _04(0)
-	, m_heap(heap ? heap : sCurrentHeap)
-	, m_id(id)
-	, m_isCompareOnDestructed(isCompareOnDestructed)
-	, _1C(0)
-	, _20(-1)
+JKRHeap::TState::TState(const JKRHeap* heap, ulong id,
+                        bool isCompareOnDestructed)
+    : _00(0)
+    , _04(0)
+    , m_heap(heap ? heap : sCurrentHeap)
+    , m_id(id)
+    , m_isCompareOnDestructed(isCompareOnDestructed)
+    , _1C(0)
+    , _20(-1)
 {
 	m_heap->state_register(this, m_id);
 	/*
@@ -2242,8 +2257,8 @@ bool JKRHeap::TState::isCompareOnDestructed() const
  * Size:	000014
  */
 JKRHeap::TState::TLocation::TLocation()
-	: _00(0)
-	, _04(-1)
+    : _00(0)
+    , _04(-1)
 {
 }
 
@@ -2253,9 +2268,9 @@ JKRHeap::TState::TLocation::TLocation()
  * Size:	000020
  */
 JKRHeap::TState::TArgument::TArgument(const JKRHeap* heap, ulong p2, bool p3)
-	: m_heap((heap) ? heap : JKRHeap::sCurrentHeap)
-	, _04(p2)
-	, _08(p3)
+    : m_heap((heap) ? heap : JKRHeap::sCurrentHeap)
+    , _04(p2)
+    , _08(p3)
 {
 	/*
 	.loc_0x0:

src/plugProjectKandoU/cellPyramid.cpp

@@ -19,7 +19,8 @@ namespace Game {
  */
 // void mapSearch__Q24Game11CellPyramidFRQ23Sys6SphereP32IDelegate1<
 //     CellObject*>()
-void CellPyramid::mapSearch(Sys::Sphere& sphere, IDelegate1<CellObject*>* delegate)
+void CellPyramid::mapSearch(Sys::Sphere& sphere,
+                            IDelegate1<CellObject*>* delegate)
 {
 	/*
 	.loc_0x0:
@@ -1820,7 +1821,7 @@ void Cell::rec_resolveColl()
  * Address:	801577CC
  * Size:	000008
  */
-template<> void Parm<bool>::operator()()
+template <> void Parm<bool>::operator()()
 {
 	/*
 	.loc_0x0: