clang-format

1 files changed, 104 insertions, 124 deletions

diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp
index 263badd4bb..4f6e1d8569 100644
--- a/src/d/d_lib.cpp
+++ b/src/d/d_lib.cpp
@@ -1,77 +1,73 @@
-// 
+//
 // Generated By: dol2asm
 // Translation Unit: d/d_lib
-// 
+//
 
+#include "d/d_lib.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
-#include "d/d_lib.h"
 
-// 
+//
 // Types:
-// 
+//
 
-struct fopAc_ac_c {
-};
+struct fopAc_ac_c {};
 
 struct dLib_time_c {
-	/* 80032804 */ void getTime();
-	/* 80032880 */ void stopTime();
-	/* 800328BC */ void startTime();
+    /* 80032804 */ void getTime();
+    /* 80032880 */ void stopTime();
+    /* 800328BC */ void startTime();
 };
 
 struct dEvt_control_c {
-	/* 800434D8 */ void searchMapEventData(u8);
+    /* 800434D8 */ void searchMapEventData(u8);
 };
 
-struct Vec {
-};
+struct Vec {};
 
 struct cXyz {
-	/* 80266B34 */ void operator-(Vec const&) const;
+    /* 80266B34 */ void operator-(Vec const&) const;
 };
 
 struct STControl {
-	/* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
-	/* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16);
-	/* 800320AC */ void init();
-	/* 800320FC */ void Xinit();
-	/* 8003212C */ void Yinit();
-	/* 8003215C */ void getValueStick();
-	/* 8003216C */ void getAngleStick();
-	/* 8003219C */ void checkTrigger();
-	/* 8003242C */ void checkLeftTrigger();
-	/* 800324A8 */ void checkRightTrigger();
-	/* 80032524 */ void checkUpTrigger();
-	/* 800325A0 */ void checkDownTrigger();
+    /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
+    /* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16);
+    /* 800320AC */ void init();
+    /* 800320FC */ void Xinit();
+    /* 8003212C */ void Yinit();
+    /* 8003215C */ void getValueStick();
+    /* 8003216C */ void getAngleStick();
+    /* 8003219C */ void checkTrigger();
+    /* 8003242C */ void checkLeftTrigger();
+    /* 800324A8 */ void checkRightTrigger();
+    /* 80032524 */ void checkUpTrigger();
+    /* 800325A0 */ void checkDownTrigger();
 };
 
-struct JKRHeap {
-};
+struct JKRHeap {};
 
-struct JKRExpandSwitch {
-};
+struct JKRExpandSwitch {};
 
 struct JKRArchive {
-	/* 802D65A4 */ void findFsResource(char const*, u32) const;
+    /* 802D65A4 */ void findFsResource(char const*, u32) const;
 };
 
 struct JKRAramArchive {
-	/* 802D781C */ void getAramAddress(char const*);
+    /* 802D781C */ void getAramAddress(char const*);
 };
 
 struct JKRAram {
-	/* 802D25B4 */ void aramToMainRam(u32, u8*, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
+    /* 802D25B4 */ void aramToMainRam(u32, u8*, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
 };
 
 struct CSTControl {
-	/* 8003217C */ void getValueStick();
-	/* 8003218C */ void getAngleStick();
+    /* 8003217C */ void getValueStick();
+    /* 8003218C */ void getAngleStick();
 };
 
-// 
+//
 // Forward References:
-// 
+//
 
 void dLib_getEventSwitchNo(int);
 void dLib_checkActorInRectangle(fopAc_ac_c*, fopAc_ac_c*, cXyz const*, cXyz const*);
@@ -106,11 +102,11 @@ extern "C" extern void* __vt__10CSTControl[4];
 extern "C" extern void* __vt__9STControl[4];
 extern "C" extern u8 struct_80450DF0[8];
 
-// 
+//
 // External References:
-// 
+//
 
-void mDoMtx_YrotS(f32 (* )[4], s16);
+void mDoMtx_YrotS(f32 (*)[4], s16);
 extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
 extern "C" extern u8 now__14mDoMtx_stack_c[48];
 extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
@@ -129,269 +125,253 @@ extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
 extern "C" extern u8 now__14mDoMtx_stack_c[48];
 extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
 
-// 
+//
 // Declarations:
-// 
+//
 
 /* ############################################################################################## */
-/* 803A7240-803A7250 0010+00 s=0 e=0 z=6  None .data      ZeroQuat                                                     */
+/* 803A7240-803A7250 0010+00 s=0 e=0 z=6  None .data      ZeroQuat */
 SECTION_DATA u8 ZeroQuat[16] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
 };
 
-/* 803A7250-803A7260 0010+00 s=0 e=1 z=0  None .data      __vt__10CSTControl                                           */
+/* 803A7250-803A7260 0010+00 s=0 e=1 z=0  None .data      __vt__10CSTControl */
 SECTION_DATA void* __vt__10CSTControl[4] = {
-	(void*)NULL,
-	(void*)NULL,
-	(void*)getValueStick__10CSTControlFv,
-	(void*)getAngleStick__10CSTControlFv,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)getValueStick__10CSTControlFv,
+    (void*)getAngleStick__10CSTControlFv,
 };
 
-/* 803A7260-803A7270 0010+00 s=1 e=1 z=0  None .data      __vt__9STControl                                             */
+/* 803A7260-803A7270 0010+00 s=1 e=1 z=0  None .data      __vt__9STControl */
 SECTION_DATA void* __vt__9STControl[4] = {
-	(void*)NULL,
-	(void*)NULL,
-	(void*)getValueStick__9STControlFv,
-	(void*)getAngleStick__9STControlFv,
+    (void*)NULL,
+    (void*)NULL,
+    (void*)getValueStick__9STControlFv,
+    (void*)getAngleStick__9STControlFv,
 };
 
-/* 80032044-80032088 0044+00 s=0 e=6 z=0  None .text      __ct__9STControlFssssffss                                    */
+/* 80032044-80032088 0044+00 s=0 e=6 z=0  None .text      __ct__9STControlFssssffss */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm STControl::STControl(s16 param_0, s16 param_1, s16 param_2, s16 param_3, f32 param_4, f32 param_5, s16 param_6, s16 param_7) {
-	nofralloc
+asm STControl::STControl(s16 param_0, s16 param_1, s16 param_2, s16 param_3, f32 param_4,
+                         f32 param_5, s16 param_6, s16 param_7) {
+    nofralloc
 #include "asm/d/d_lib/__ct__9STControlFssssffss.s"
 }
 #pragma pop
 
-
-/* 80032088-800320AC 0024+00 s=1 e=3 z=0  None .text      setWaitParm__9STControlFssssffss                             */
+/* 80032088-800320AC 0024+00 s=1 e=3 z=0  None .text      setWaitParm__9STControlFssssffss */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void STControl::setWaitParm(s16 param_0, s16 param_1, s16 param_2, s16 param_3, f32 param_4, f32 param_5, s16 param_6, s16 param_7) {
-	nofralloc
+asm void STControl::setWaitParm(s16 param_0, s16 param_1, s16 param_2, s16 param_3, f32 param_4,
+                                f32 param_5, s16 param_6, s16 param_7) {
+    nofralloc
 #include "asm/d/d_lib/setWaitParm__9STControlFssssffss.s"
 }
 #pragma pop
 
-
-/* 800320AC-800320FC 0050+00 s=1 e=1 z=0  None .text      init__9STControlFv                                           */
+/* 800320AC-800320FC 0050+00 s=1 e=1 z=0  None .text      init__9STControlFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void STControl::init() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_lib/init__9STControlFv.s"
 }
 #pragma pop
 
-
-/* 800320FC-8003212C 0030+00 s=1 e=0 z=0  None .text      Xinit__9STControlFv                                          */
+/* 800320FC-8003212C 0030+00 s=1 e=0 z=0  None .text      Xinit__9STControlFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void STControl::Xinit() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_lib/Xinit__9STControlFv.s"
 }
 #pragma pop
 
-
-/* 8003212C-8003215C 0030+00 s=1 e=0 z=0  None .text      Yinit__9STControlFv                                          */
+/* 8003212C-8003215C 0030+00 s=1 e=0 z=0  None .text      Yinit__9STControlFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void STControl::Yinit() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_lib/Yinit__9STControlFv.s"
 }
 #pragma pop
 
-
-/* 8003215C-8003216C 0010+00 s=1 e=0 z=0  None .text      getValueStick__9STControlFv                                  */
+/* 8003215C-8003216C 0010+00 s=1 e=0 z=0  None .text      getValueStick__9STControlFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void STControl::getValueStick() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_lib/getValueStick__9STControlFv.s"
 }
 #pragma pop
 
-
-/* 8003216C-8003217C 0010+00 s=1 e=0 z=0  None .text      getAngleStick__9STControlFv                                  */
+/* 8003216C-8003217C 0010+00 s=1 e=0 z=0  None .text      getAngleStick__9STControlFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void STControl::getAngleStick() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_lib/getAngleStick__9STControlFv.s"
 }
 #pragma pop
 
-
-/* 8003217C-8003218C 0010+00 s=1 e=0 z=0  None .text      getValueStick__10CSTControlFv                                */
+/* 8003217C-8003218C 0010+00 s=1 e=0 z=0  None .text      getValueStick__10CSTControlFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void CSTControl::getValueStick() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_lib/getValueStick__10CSTControlFv.s"
 }
 #pragma pop
 
-
-/* 8003218C-8003219C 0010+00 s=1 e=0 z=0  None .text      getAngleStick__10CSTControlFv                                */
+/* 8003218C-8003219C 0010+00 s=1 e=0 z=0  None .text      getAngleStick__10CSTControlFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void CSTControl::getAngleStick() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_lib/getAngleStick__10CSTControlFv.s"
 }
 #pragma pop
 
-
-/* 8003219C-8003242C 0290+00 s=0 e=24 z=0  None .text      checkTrigger__9STControlFv                                   */
+/* 8003219C-8003242C 0290+00 s=0 e=24 z=0  None .text      checkTrigger__9STControlFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void STControl::checkTrigger() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_lib/checkTrigger__9STControlFv.s"
 }
 #pragma pop
 
-
-/* 8003242C-800324A8 007C+00 s=0 e=14 z=0  None .text      checkLeftTrigger__9STControlFv                               */
+/* 8003242C-800324A8 007C+00 s=0 e=14 z=0  None .text      checkLeftTrigger__9STControlFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void STControl::checkLeftTrigger() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_lib/checkLeftTrigger__9STControlFv.s"
 }
 #pragma pop
 
-
-/* 800324A8-80032524 007C+00 s=0 e=14 z=0  None .text      checkRightTrigger__9STControlFv                              */
+/* 800324A8-80032524 007C+00 s=0 e=14 z=0  None .text      checkRightTrigger__9STControlFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void STControl::checkRightTrigger() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_lib/checkRightTrigger__9STControlFv.s"
 }
 #pragma pop
 
-
-/* 80032524-800325A0 007C+00 s=0 e=20 z=0  None .text      checkUpTrigger__9STControlFv                                 */
+/* 80032524-800325A0 007C+00 s=0 e=20 z=0  None .text      checkUpTrigger__9STControlFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void STControl::checkUpTrigger() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_lib/checkUpTrigger__9STControlFv.s"
 }
 #pragma pop
 
-
-/* 800325A0-8003261C 007C+00 s=0 e=21 z=0  None .text      checkDownTrigger__9STControlFv                               */
+/* 800325A0-8003261C 007C+00 s=0 e=21 z=0  None .text      checkDownTrigger__9STControlFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void STControl::checkDownTrigger() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_lib/checkDownTrigger__9STControlFv.s"
 }
 #pragma pop
 
-
-/* 8003261C-80032654 0038+00 s=0 e=0 z=1  None .text      dLib_getEventSwitchNo__Fi                                    */
+/* 8003261C-80032654 0038+00 s=0 e=0 z=1  None .text      dLib_getEventSwitchNo__Fi */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void dLib_getEventSwitchNo(int param_0) {
-	nofralloc
+    nofralloc
 #include "asm/d/d_lib/dLib_getEventSwitchNo__Fi.s"
 }
 #pragma pop
 
-
-/* 80032654-80032738 00E4+00 s=0 e=0 z=8  None .text      dLib_checkActorInRectangle__FP10fopAc_ac_cP10fopAc_ac_cPC4cXyzPC4cXyz */
+/* 80032654-80032738 00E4+00 s=0 e=0 z=8  None .text
+ * dLib_checkActorInRectangle__FP10fopAc_ac_cP10fopAc_ac_cPC4cXyzPC4cXyz */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz const* param_2, cXyz const* param_3) {
-	nofralloc
+asm void dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz const* param_2,
+                                    cXyz const* param_3) {
+    nofralloc
 #include "asm/d/d_lib/dLib_checkActorInRectangle__FP10fopAc_ac_cP10fopAc_ac_cPC4cXyzPC4cXyz.s"
 }
 #pragma pop
 
-
-/* 80032738-80032804 00CC+00 s=0 e=4 z=0  None .text      dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc     */
+/* 80032738-80032804 00CC+00 s=0 e=4 z=0  None .text
+ * dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc     */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void dLib_getExpandSizeFromAramArchive(JKRAramArchive* param_0, char const* param_1) {
-	nofralloc
+    nofralloc
 #include "asm/d/d_lib/dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc.s"
 }
 #pragma pop
 
-
 /* ############################################################################################## */
-/* 80450DD8-80450DDC 0004+00 s=2 e=0 z=0  None .sbss      m_diffTime__11dLib_time_c                                    */
+/* 80450DD8-80450DDC 0004+00 s=2 e=0 z=0  None .sbss      m_diffTime__11dLib_time_c */
 static u8 m_diffTime__11dLib_time_c[4];
 
-/* 80450DDC-80450DE0 0004+00 s=2 e=0 z=0  None .sbss      None                                                         */
+/* 80450DDC-80450DE0 0004+00 s=2 e=0 z=0  None .sbss      None */
 static u8 data_80450DDC[4];
 
-/* 80450DE0-80450DE4 0004+00 s=3 e=0 z=0  None .sbss      m_stopTime__11dLib_time_c                                    */
+/* 80450DE0-80450DE4 0004+00 s=3 e=0 z=0  None .sbss      m_stopTime__11dLib_time_c */
 static u8 m_stopTime__11dLib_time_c[4];
 
-/* 80450DE4-80450DE8 0004+00 s=3 e=0 z=0  None .sbss      None                                                         */
+/* 80450DE4-80450DE8 0004+00 s=3 e=0 z=0  None .sbss      None */
 static u8 data_80450DE4[4];
 
-/* 80450DE8-80450DF0 0008+00 s=3 e=0 z=0  None .sbss      None                                                         */
+/* 80450DE8-80450DF0 0008+00 s=3 e=0 z=0  None .sbss      None */
 static u8 data_80450DE8[8];
 
-/* 80032804-80032880 007C+00 s=0 e=8 z=0  None .text      getTime__11dLib_time_cFv                                     */
+/* 80032804-80032880 007C+00 s=0 e=8 z=0  None .text      getTime__11dLib_time_cFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void dLib_time_c::getTime() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_lib/getTime__11dLib_time_cFv.s"
 }
 #pragma pop
 
-
-/* 80032880-800328BC 003C+00 s=0 e=1 z=0  None .text      stopTime__11dLib_time_cFv                                    */
+/* 80032880-800328BC 003C+00 s=0 e=1 z=0  None .text      stopTime__11dLib_time_cFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void dLib_time_c::stopTime() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_lib/stopTime__11dLib_time_cFv.s"
 }
 #pragma pop
 
-
-/* 800328BC-80032918 005C+00 s=0 e=1 z=0  None .text      startTime__11dLib_time_cFv                                   */
+/* 800328BC-80032918 005C+00 s=0 e=1 z=0  None .text      startTime__11dLib_time_cFv */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm void dLib_time_c::startTime() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_lib/startTime__11dLib_time_cFv.s"
 }
 #pragma pop
 
-
 /* ############################################################################################## */
-/* 80450DF0-80450DF8 0008+00 s=0 e=4 z=0  None .sbss      None                                                         */
+/* 80450DF0-80450DF8 0008+00 s=0 e=4 z=0  None .sbss      None */
 u8 struct_80450DF0[8];
-