__sinit and progress script update

1 files changed, 78 insertions, 255 deletions

diff --git a/src/d/d_npc_lib.cpp b/src/d/d_npc_lib.cpp
index 185b7e759d..8363039e2e 100644
--- a/src/d/d_npc_lib.cpp
+++ b/src/d/d_npc_lib.cpp
@@ -1,263 +1,120 @@
-// 
+//
 // Generated By: dol2asm
 // Translation Unit: d/d_npc_lib
-// 
+//
 
+#include "d/d_npc_lib.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
-#include "d/d_npc_lib.h"
 
-// 
+//
 // Types:
-// 
+//
 
-struct Vec {
-};
+struct Vec {};
 
 struct cXyz {
-	/* 80009184 */ // False False
-~cXyz();
-	/* 800125DC */ // False False
-cXyz();
-	/* 80266B34 */ // False False
-//  Vec const& False
-// 	 Vec const False
-// 		 Vec False
-void operator-(Vec const&) const;
-	/* 80266EF4 */ // False False
-void normalize();
-	/* 802670AC */ // False False
-void isZero() const;
+    /* 80009184 */ ~cXyz();
+    /* 800125DC */ cXyz();
+    /* 80266B34 */ void operator-(Vec const&) const;
+    /* 80266EF4 */ void normalize();
+    /* 802670AC */ void isZero() const;
 };
 
 struct csXyz {
-	/* 80018BD0 */ // False False
-~csXyz();
-	/* 80112C80 */ // False False
-csXyz();
-	/* 8026745C */ // False False
-//  csXyz& False
-// 	 csXyz False
-void operator+=(csXyz&);
+    /* 80018BD0 */ ~csXyz();
+    /* 80112C80 */ csXyz();
+    /* 8026745C */ void operator+=(csXyz&);
 };
 
 struct mDoMtx_stack_c {
-	/* 8000CD64 */ // False False
-//  cXyz const& False
-// 	 cXyz const False
-// 		 cXyz False
-void transS(cXyz const&);
-	/* 8000CE9C */ // False False
-//  csXyz const& False
-// 	 csXyz const False
-// 		 csXyz False
-void XYZrotS(csXyz const&);
-	/* 8000CF44 */ // False False
-//  csXyz const& False
-// 	 csXyz const False
-// 		 csXyz False
-void ZXYrotM(csXyz const&);
+    /* 8000CD64 */ void transS(cXyz const&);
+    /* 8000CE9C */ void XYZrotS(csXyz const&);
+    /* 8000CF44 */ void ZXYrotM(csXyz const&);
 };
 
-struct fopAc_ac_c {
-};
+struct fopAc_ac_c {};
 
-struct J3DModel {
-};
+struct J3DModel {};
 
 struct dNpcLib_lookat_c {
-	/* 80251314 */ // False False
-dNpcLib_lookat_c();
-	/* 8025140C */ // False False
-//  J3DModel* False
-// 	 J3DModel False
-//  int* False
-// 	 int False
-//  csXyz* False
-// 	 csXyz False
-//  csXyz* False
-// 	 csXyz False
-void init(J3DModel*, int*, csXyz*, csXyz*);
-	/* 80251534 */ // False False
-//  cXyz False
-//  cXyz False
-//  fopAc_ac_c* False
-// 	 fopAc_ac_c False
-//  f32 (* )[4] False
-// 	 f32 False
-// 	 * False
-// 		  False
-//  int False
-void action(cXyz, cXyz, fopAc_ac_c*, f32 (* )[4], int);
-	/* 80251B60 */ // False False
-//  void False
-void dbView();
-	/* 80251B64 */ // True False
-void setPrm();
-	/* 80251EF8 */ // True False
-void update();
-	/* 80252018 */ // True False
-//  s16* False
-// 	 s16 False
-//  s16 False
-//  s16 False
-//  s16 False
-void limitter(s16*, s16, s16, s16);
-	/* 80252094 */ // True False
-~dNpcLib_lookat_c();
+    /* 80251314 */ dNpcLib_lookat_c();
+    /* 8025140C */ void init(J3DModel*, int*, csXyz*, csXyz*);
+    /* 80251534 */ void action(cXyz, cXyz, fopAc_ac_c*, f32 (*)[4], int);
+    /* 80251B60 */ void dbView();
+    /* 80251B64 */ void setPrm();
+    /* 80251EF8 */ void update();
+    /* 80252018 */ void limitter(s16*, s16, s16, s16);
+    /* 80252094 */ ~dNpcLib_lookat_c();
 };
 
-// 
+//
 // Forward References:
-// 
-
+//
 
-// False False
 extern "C" void __ct__16dNpcLib_lookat_cFv();
-// False False
-//  J3DModel* False
-// 	 J3DModel False
-//  int* False
-// 	 int False
-//  csXyz* False
-// 	 csXyz False
-//  csXyz* False
-// 	 csXyz False
 extern "C" void init__16dNpcLib_lookat_cFP8J3DModelPiP5csXyzP5csXyz();
-// False False
-//  cXyz False
-//  cXyz False
-//  fopAc_ac_c* False
-// 	 fopAc_ac_c False
-//  f32 (* )[4] False
-// 	 f32 False
-// 	 * False
-// 		  False
-//  int False
 extern "C" void action__16dNpcLib_lookat_cF4cXyz4cXyzP10fopAc_ac_cPA4_fi();
-// False False
-//  void False
 extern "C" void dbView__16dNpcLib_lookat_cFv();
-// True False
 extern "C" void setPrm__16dNpcLib_lookat_cFv();
-// True False
 extern "C" void update__16dNpcLib_lookat_cFv();
-// True False
-//  s16* False
-// 	 s16 False
-//  s16 False
-//  s16 False
-//  s16 False
 extern "C" void limitter__16dNpcLib_lookat_cFPssss();
-// True False
 extern "C" void __dt__16dNpcLib_lookat_cFv();
 extern "C" extern void* __vt__16dNpcLib_lookat_c[3 + 1 /* padding */];
 
-// 
+//
 // External References:
-// 
+//
 
-// False False
-//  f32 False
-//  f32 False
 void cM_atan2s(f32, f32);
-// False False
-//  void False
-//  void* False
-// 	 void False
 void operator delete(void*);
 
-// False False
 extern "C" void __dt__4cXyzFv();
-// False False
-//  cXyz const& False
-// 	 cXyz const False
-// 		 cXyz False
 extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
-// False False
-//  csXyz const& False
-// 	 csXyz const False
-// 		 csXyz False
 extern "C" void XYZrotS__14mDoMtx_stack_cFRC5csXyz();
-// False False
-//  csXyz const& False
-// 	 csXyz const False
-// 		 csXyz False
 extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz();
-// False False
 extern "C" void __ct__4cXyzFv();
-// False False
 extern "C" void __dt__5csXyzFv();
-// False False
 extern "C" void __ct__5csXyzFv();
-// False False
-//  Vec const& False
-// 	 Vec const False
-// 		 Vec False
 extern "C" void __mi__4cXyzCFRC3Vec();
-// False False
 extern "C" void normalize__4cXyzFv();
-// False False
 extern "C" void isZero__4cXyzCFv();
-// False False
-//  csXyz& False
-// 	 csXyz False
 extern "C" void __apl__5csXyzFR5csXyz();
-// False False
-//  f32 False
-//  f32 False
 extern "C" void cM_atan2s__Fff();
-// False False
-//  void False
-//  void* False
-// 	 void False
 extern "C" void __dl__FPv();
-// False False
 extern "C" void PSMTXCopy();
-// False False
 extern "C" void PSMTXConcat();
-// False False
 extern "C" void PSMTXInverse();
-// False False
 extern "C" void PSMTXMultVec();
-// False False
 extern "C" void PSVECSquareMag();
-// False False
 extern "C" void __destroy_arr();
-// False False
 extern "C" void __construct_array();
-// False False
 extern "C" void _savegpr_22();
-// False False
 extern "C" void _savegpr_23();
-// False False
 extern "C" void _savegpr_25();
-// False False
 extern "C" void _restgpr_22();
-// False False
 extern "C" void _restgpr_23();
-// False False
 extern "C" void _restgpr_25();
 extern "C" extern u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u32 __float_nan;
 extern "C" extern u8 Zero__5csXyz[4];
 extern "C" extern u8 data_80451164[4];
 
-// 
+//
 // Declarations:
-// 
+//
 
 /* ############################################################################################## */
-/* 803C2B88-803C2B98 000C+04 s=2 e=0 z=0  None .data      __vt__16dNpcLib_lookat_c                                     */
+/* 803C2B88-803C2B98 000C+04 s=2 e=0 z=0  None .data      __vt__16dNpcLib_lookat_c */
 SECTION_DATA void* __vt__16dNpcLib_lookat_c[3 + 1 /* padding */] = {
-	(void*)NULL /* RTTI */,
-	(void*)NULL,
-	(void*)__dt__16dNpcLib_lookat_cFv,
-	/* padding */
-	NULL,
+    (void*)NULL /* RTTI */,
+    (void*)NULL,
+    (void*)__dt__16dNpcLib_lookat_cFv,
+    /* padding */
+    NULL,
 };
 
-/* 80251314-8025140C 00F8+00 s=0 e=0 z=4  None .text      __ct__16dNpcLib_lookat_cFv                                   */
+/* 80251314-8025140C 00F8+00 s=0 e=0 z=4  None .text      __ct__16dNpcLib_lookat_cFv */
 //	80251328: 803C2B88 (__vt__16dNpcLib_lookat_c)
 //	8025132C: 803C2B88 (__vt__16dNpcLib_lookat_c)
 //	80251338: 800125DC (__ct__4cXyzFv)
@@ -293,15 +150,14 @@ SECTION_DATA void* __vt__16dNpcLib_lookat_c[3 + 1 /* padding */] = {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// False False
 asm dNpcLib_lookat_c::dNpcLib_lookat_c() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_npc_lib/__ct__16dNpcLib_lookat_cFv.s"
 }
 #pragma pop
 
-
-/* 8025140C-80251534 0128+00 s=0 e=0 z=2  None .text      init__16dNpcLib_lookat_cFP8J3DModelPiP5csXyzP5csXyz          */
+/* 8025140C-80251534 0128+00 s=0 e=0 z=2  None .text
+ * init__16dNpcLib_lookat_cFP8J3DModelPiP5csXyzP5csXyz          */
 //	8025141C: 803621C0 (_savegpr_22)
 //	80251464: 803DD470 (now__14mDoMtx_stack_c)
 //	80251468: 803DD470 (now__14mDoMtx_stack_c)
@@ -310,53 +166,47 @@ asm dNpcLib_lookat_c::dNpcLib_lookat_c() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// False False
-//  J3DModel* False
-// 	 J3DModel False
-//  int* False
-// 	 int False
-//  csXyz* False
-// 	 csXyz False
-//  csXyz* False
-// 	 csXyz False
 asm void dNpcLib_lookat_c::init(J3DModel* param_0, int* param_1, csXyz* param_2, csXyz* param_3) {
-	nofralloc
+    nofralloc
 #include "asm/d/d_npc_lib/init__16dNpcLib_lookat_cFP8J3DModelPiP5csXyzP5csXyz.s"
 }
 #pragma pop
 
-
 /* ############################################################################################## */
-/* 80454DE8-80454DEC 0004+00 s=3 e=0 z=0  None .sdata2    @3864                                                        */
+/* 80454DE8-80454DEC 0004+00 s=3 e=0 z=0  None .sdata2    @3864 */
 SECTION_SDATA2 static u8 lit_3864[4] = {
-	0x00, 0x00, 0x00, 0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
 };
 
-/* 80454DEC-80454DF0 0004+00 s=1 e=0 z=0  None .sdata2    @3865                                                        */
+/* 80454DEC-80454DF0 0004+00 s=1 e=0 z=0  None .sdata2    @3865 */
 SECTION_SDATA2 static f32 lit_3865 = 1.0f;
 
-/* 80454DF0-80454DF8 0008+00 s=2 e=0 z=0  None .sdata2    @3866                                                        */
+/* 80454DF0-80454DF8 0008+00 s=2 e=0 z=0  None .sdata2    @3866 */
 SECTION_SDATA2 static f64 lit_3866 = 0.5;
 
-/* 80454DF8-80454E00 0008+00 s=2 e=0 z=0  None .sdata2    @3867                                                        */
+/* 80454DF8-80454E00 0008+00 s=2 e=0 z=0  None .sdata2    @3867 */
 SECTION_SDATA2 static f64 lit_3867 = 3.0;
 
-/* 80454E00-80454E08 0008+00 s=2 e=0 z=0  None .sdata2    @3868                                                        */
+/* 80454E00-80454E08 0008+00 s=2 e=0 z=0  None .sdata2    @3868 */
 SECTION_SDATA2 static u8 lit_3868[8] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 80454E08-80454E10 0004+04 s=1 e=0 z=0  None .sdata2    @3869                                                        */
+/* 80454E08-80454E10 0004+04 s=1 e=0 z=0  None .sdata2    @3869 */
 SECTION_SDATA2 static f32 lit_3869[1 + 1 /* padding */] = {
-	0.5f,
-	/* padding */
-	0.0f,
+    0.5f,
+    /* padding */
+    0.0f,
 };
 
-/* 80454E10-80454E18 0008+00 s=2 e=0 z=0  None .sdata2    @3873                                                        */
+/* 80454E10-80454E18 0008+00 s=2 e=0 z=0  None .sdata2    @3873 */
 SECTION_SDATA2 static f64 lit_3873 = 4503601774854144.0 /* cast s32 to float */;
 
-/* 80251534-80251B60 062C+00 s=0 e=0 z=2  None .text      action__16dNpcLib_lookat_cF4cXyz4cXyzP10fopAc_ac_cPA4_fi     */
+/* 80251534-80251B60 062C+00 s=0 e=0 z=2  None .text
+ * action__16dNpcLib_lookat_cF4cXyz4cXyzP10fopAc_ac_cPA4_fi     */
 //	80251554: 803621C0 (_savegpr_22)
 //	80251574: 803464B0 (PSMTXCopy)
 //	80251578: 80454DE8 (lit_3864)
@@ -436,40 +286,27 @@ SECTION_SDATA2 static f64 lit_3873 = 4503601774854144.0 /* cast s32 to float */;
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// False False
-//  cXyz False
-//  cXyz False
-//  fopAc_ac_c* False
-// 	 fopAc_ac_c False
-//  f32 (* )[4] False
-// 	 f32 False
-// 	 * False
-// 		  False
-//  int False
-asm void dNpcLib_lookat_c::action(cXyz param_0, cXyz param_1, fopAc_ac_c* param_2, f32 (* param_3)[4], int param_4) {
-	nofralloc
+asm void dNpcLib_lookat_c::action(cXyz param_0, cXyz param_1, fopAc_ac_c* param_2,
+                                  f32 (*param_3)[4], int param_4) {
+    nofralloc
 #include "asm/d/d_npc_lib/action__16dNpcLib_lookat_cF4cXyz4cXyzP10fopAc_ac_cPA4_fi.s"
 }
 #pragma pop
 
-
-/* 80251B60-80251B64 0004+00 s=0 e=0 z=2  None .text      dbView__16dNpcLib_lookat_cFv                                 */
-// False False
-//  void False
+/* 80251B60-80251B64 0004+00 s=0 e=0 z=2  None .text      dbView__16dNpcLib_lookat_cFv */
 void dNpcLib_lookat_c::dbView() {
-	/* empty function */
+    /* empty function */
 }
 
-
 /* ############################################################################################## */
-/* 80454E18-80454E20 0004+04 s=1 e=0 z=0  None .sdata2    @3970                                                        */
+/* 80454E18-80454E20 0004+04 s=1 e=0 z=0  None .sdata2    @3970 */
 SECTION_SDATA2 static f32 lit_3970[1 + 1 /* padding */] = {
-	2.0f / 5.0f,
-	/* padding */
-	0.0f,
+    2.0f / 5.0f,
+    /* padding */
+    0.0f,
 };
 
-/* 80251B64-80251EF8 0394+00 s=1 e=0 z=0  None .text      setPrm__16dNpcLib_lookat_cFv                                 */
+/* 80251B64-80251EF8 0394+00 s=1 e=0 z=0  None .text      setPrm__16dNpcLib_lookat_cFv */
 //	80251B8C: 803621CC (_savegpr_25)
 //	80251BA0: 80451160 (Zero__5csXyz)
 //	80251BA4: 80454DE8 (lit_3864)
@@ -500,15 +337,13 @@ SECTION_SDATA2 static f32 lit_3970[1 + 1 /* padding */] = {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// True False
 asm void dNpcLib_lookat_c::setPrm() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_npc_lib/setPrm__16dNpcLib_lookat_cFv.s"
 }
 #pragma pop
 
-
-/* 80251EF8-80252018 0120+00 s=1 e=0 z=0  None .text      update__16dNpcLib_lookat_cFv                                 */
+/* 80251EF8-80252018 0120+00 s=1 e=0 z=0  None .text      update__16dNpcLib_lookat_cFv */
 //	80251F10: 803621C4 (_savegpr_23)
 //	80251F18: 80451160 (Zero__5csXyz)
 //	80251F20: 80451164 (data_80451164)
@@ -525,32 +360,23 @@ asm void dNpcLib_lookat_c::setPrm() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// True False
 asm void dNpcLib_lookat_c::update() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_npc_lib/update__16dNpcLib_lookat_cFv.s"
 }
 #pragma pop
 
-
-/* 80252018-80252094 007C+00 s=1 e=0 z=0  None .text      limitter__16dNpcLib_lookat_cFPssss                           */
+/* 80252018-80252094 007C+00 s=1 e=0 z=0  None .text      limitter__16dNpcLib_lookat_cFPssss */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// True False
-//  s16* False
-// 	 s16 False
-//  s16 False
-//  s16 False
-//  s16 False
 asm void dNpcLib_lookat_c::limitter(s16* param_0, s16 param_1, s16 param_2, s16 param_3) {
-	nofralloc
+    nofralloc
 #include "asm/d/d_npc_lib/limitter__16dNpcLib_lookat_cFPssss.s"
 }
 #pragma pop
 
-
-/* 80252094-8025217C 00E8+00 s=1 e=0 z=0  None .text      __dt__16dNpcLib_lookat_cFv                                   */
+/* 80252094-8025217C 00E8+00 s=1 e=0 z=0  None .text      __dt__16dNpcLib_lookat_cFv */
 //	802520B4: 803C2B88 (__vt__16dNpcLib_lookat_c)
 //	802520B8: 803C2B88 (__vt__16dNpcLib_lookat_c)
 //	802520C4: 80018BD0 (__dt__5csXyzFv)
@@ -575,11 +401,8 @@ asm void dNpcLib_lookat_c::limitter(s16* param_0, s16 param_1, s16 param_2, s16
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// True False
 asm dNpcLib_lookat_c::~dNpcLib_lookat_c() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_npc_lib/__dt__16dNpcLib_lookat_cFv.s"
 }
 #pragma pop
-
-