__sinit and progress script update

1 files changed, 52 insertions, 201 deletions

diff --git a/src/d/d_insect.cpp b/src/d/d_insect.cpp
index 312c41cc6a..424b3689a2 100644
--- a/src/d/d_insect.cpp
+++ b/src/d/d_insect.cpp
@@ -1,276 +1,130 @@
-// 
+//
 // Generated By: dol2asm
 // Translation Unit: d/d_insect
-// 
+//
 
+#include "d/d_insect.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
-#include "d/d_insect.h"
 
-// 
+//
 // Types:
-// 
+//
 
 struct fopAc_ac_c {
-	/* 80018B64 */ // False False
-fopAc_ac_c();
+    /* 80018B64 */ fopAc_ac_c();
 };
 
 struct dSv_event_c {
-	/* 800349BC */ // False False
-//  u16 False
-void isEventBit(u16) const;
+    /* 800349BC */ void isEventBit(u16) const;
 };
 
 struct dMenu_Insect_c {
-	/* 801D9F3C */ // False False
-//  u8 False
-void isCatchNotGiveInsect(u8);
+    /* 801D9F3C */ void isCatchNotGiveInsect(u8);
 };
 
 struct dInsect_c {
-	/* 80110648 */ // False False
-void Insect_Release();
-	/* 8015E010 */ // False False
-dInsect_c();
-	/* 8015E078 */ // False False
-void Insect_GetDemoMain();
-	/* 8015E26C */ // False False
-//  f32 False
-void CalcZBuffer(f32);
+    /* 80110648 */ void Insect_Release();
+    /* 8015E010 */ dInsect_c();
+    /* 8015E078 */ void Insect_GetDemoMain();
+    /* 8015E26C */ void CalcZBuffer(f32);
 };
 
 struct dEvt_control_c {
-	/* 80042468 */ // False False
-void reset();
-	/* 800436EC */ // False False
-//  unsigned int False
-void setPtI_Id(unsigned int);
+    /* 80042468 */ void reset();
+    /* 800436EC */ void setPtI_Id(unsigned int);
 };
 
 struct dEvent_manager_c {
-	/* 80047ADC */ // False False
-//  char const* False
-// 	 char const False
-// 		 char False
-void endCheckOld(char const*);
+    /* 80047ADC */ void endCheckOld(char const*);
 };
 
 struct dDlst_peekZ_c {
-	/* 80056018 */ // False False
-//  s16 False
-//  s16 False
-//  u32* False
-// 	 u32 False
-void newData(s16, s16, u32*);
+    /* 80056018 */ void newData(s16, s16, u32*);
 };
 
-struct csXyz {
-};
+struct csXyz {};
 
-struct cXyz {
-};
+struct cXyz {};
 
-struct Vec {
-};
+struct Vec {};
 
-// 
+//
 // Forward References:
-// 
+//
 
-
-// False False
 extern "C" void __ct__9dInsect_cFv();
-// False False
 extern "C" void Insect_GetDemoMain__9dInsect_cFv();
-// False False
-//  f32 False
 extern "C" void CalcZBuffer__9dInsect_cFf();
 extern "C" extern char const* const d_d_insect__stringBase0;
 extern "C" extern void* __vt__9dInsect_c[3 + 1 /* padding */];
 
-// 
+//
 // External References:
-// 
+//
 
-// False False
-//  Vec* False
-// 	 Vec False
-//  Vec* False
-// 	 Vec False
 void mDoLib_project(Vec*, Vec*);
-// False False
-//  Vec* False
-// 	 Vec False
-//  Vec* False
-// 	 Vec False
 void mDoLib_pos2camera(Vec*, Vec*);
-// False False
-//  fopAc_ac_c* False
-// 	 fopAc_ac_c False
 void fopAcM_delete(fopAc_ac_c*);
-// False False
-//  fopAc_ac_c* False
-// 	 fopAc_ac_c False
-//  u16 False
-//  u16 False
 void fopAcM_orderItemEvent(fopAc_ac_c*, u16, u16);
-// False False
-//  cXyz const* False
-// 	 cXyz const False
-// 		 cXyz False
-//  int False
-//  int False
-//  int False
-//  csXyz const* False
-// 	 csXyz const False
-// 		 csXyz False
-//  cXyz const* False
-// 	 cXyz const False
-// 		 cXyz False
 void fopAcM_createItemForTrBoxDemo(cXyz const*, int, int, int, csXyz const*, cXyz const*);
-// False False
-//  cXyz const* False
-// 	 cXyz const False
-// 		 cXyz False
-//  int False
-//  int False
-//  int False
-//  csXyz const* False
-// 	 csXyz const False
-// 		 csXyz False
-//  cXyz const* False
-// 	 cXyz const False
-// 		 cXyz False
-//  int False
 void fopAcM_createItem(cXyz const*, int, int, int, csXyz const*, cXyz const*, int);
-// False False
-//  fopAc_ac_c* False
-// 	 fopAc_ac_c False
 void fopAcM_cancelCarryNow(fopAc_ac_c*);
 
-// False False
-//  Vec* False
-// 	 Vec False
-//  Vec* False
-// 	 Vec False
 extern "C" void mDoLib_project__FP3VecP3Vec();
-// False False
-//  Vec* False
-// 	 Vec False
-//  Vec* False
-// 	 Vec False
 extern "C" void mDoLib_pos2camera__FP3VecP3Vec();
-// False False
 extern "C" void __ct__10fopAc_ac_cFv();
-// False False
-//  fopAc_ac_c* False
-// 	 fopAc_ac_c False
 extern "C" void fopAcM_delete__FP10fopAc_ac_c();
-// False False
-//  fopAc_ac_c* False
-// 	 fopAc_ac_c False
-//  u16 False
-//  u16 False
 extern "C" void fopAcM_orderItemEvent__FP10fopAc_ac_cUsUs();
-// False False
-//  cXyz const* False
-// 	 cXyz const False
-// 		 cXyz False
-//  int False
-//  int False
-//  int False
-//  csXyz const* False
-// 	 csXyz const False
-// 		 csXyz False
-//  cXyz const* False
-// 	 cXyz const False
-// 		 cXyz False
 extern "C" void fopAcM_createItemForTrBoxDemo__FPC4cXyziiiPC5csXyzPC4cXyz();
-// False False
-//  cXyz const* False
-// 	 cXyz const False
-// 		 cXyz False
-//  int False
-//  int False
-//  int False
-//  csXyz const* False
-// 	 csXyz const False
-// 		 csXyz False
-//  cXyz const* False
-// 	 cXyz const False
-// 		 cXyz False
-//  int False
 extern "C" void fopAcM_createItem__FPC4cXyziiiPC5csXyzPC4cXyzi();
-// False False
-//  fopAc_ac_c* False
-// 	 fopAc_ac_c False
 extern "C" void fopAcM_cancelCarryNow__FP10fopAc_ac_c();
-// False False
-//  u16 False
 extern "C" void isEventBit__11dSv_event_cCFUs();
-// False False
 extern "C" void reset__14dEvt_control_cFv();
-// False False
-//  unsigned int False
 extern "C" void setPtI_Id__14dEvt_control_cFUi();
-// False False
-//  char const* False
-// 	 char const False
-// 		 char False
 extern "C" void endCheckOld__16dEvent_manager_cFPCc();
-// False False
-//  s16 False
-//  s16 False
-//  u32* False
-// 	 u32 False
 extern "C" void newData__13dDlst_peekZ_cFssPUl();
-// False False
 extern "C" void Insect_Release__9dInsect_cFv();
-// False False
-//  u8 False
 extern "C" void isCatchNotGiveInsect__14dMenu_Insect_cFUc();
 extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 
-// 
+//
 // Declarations:
-// 
+//
 
 /* ############################################################################################## */
-/* 803BA078-803BA088 000C+04 s=1 e=0 z=0  None .data      __vt__9dInsect_c                                             */
+/* 803BA078-803BA088 000C+04 s=1 e=0 z=0  None .data      __vt__9dInsect_c */
 SECTION_DATA void* __vt__9dInsect_c[3 + 1 /* padding */] = {
-	(void*)NULL /* RTTI */,
-	(void*)NULL,
-	(void*)Insect_Release__9dInsect_cFv,
-	/* padding */
-	NULL,
+    (void*)NULL /* RTTI */,
+    (void*)NULL,
+    (void*)Insect_Release__9dInsect_cFv,
+    /* padding */
+    NULL,
 };
 
-/* 8015E010-8015E078 0068+00 s=0 e=0 z=13  None .text      __ct__9dInsect_cFv                                           */
+/* 8015E010-8015E078 0068+00 s=0 e=0 z=13  None .text      __ct__9dInsect_cFv */
 //	8015E024: 80018B64 (__ct__10fopAc_ac_cFv)
 //	8015E028: 803BA078 (__vt__9dInsect_c)
 //	8015E02C: 803BA078 (__vt__9dInsect_c)
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// False False
 asm dInsect_c::dInsect_c() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_insect/__ct__9dInsect_cFv.s"
 }
 #pragma pop
 
-
 /* ############################################################################################## */
-/* 80393D98-80393DA8 0010+00 s=1 e=0 z=0  None .rodata    @stringBase0                                                 */
+/* 80393D98-80393DA8 0010+00 s=1 e=0 z=0  None .rodata    @stringBase0 */
 #pragma push
 #pragma force_active on
 #pragma section ".dead"
 SECTION_DEAD char const* const stringBase_80393D98 = "DEFAULT_GETITEM";
 #pragma pop
 
-/* 8015E078-8015E26C 01F4+00 s=0 e=0 z=24  None .text      Insect_GetDemoMain__9dInsect_cFv                             */
+/* 8015E078-8015E26C 01F4+00 s=0 e=0 z=24  None .text      Insect_GetDemoMain__9dInsect_cFv */
 //	8015E0D0: 8001CBA0 (fopAcM_cancelCarryNow__FP10fopAc_ac_c)
 //	8015E0E0: 8001B9D0 (fopAcM_orderItemEvent__FP10fopAc_ac_cUsUs)
 //	8015E10C: 8001BC74 (fopAcM_createItemForTrBoxDemo__FPC4cXyziiiPC5csXyzPC4cXyz)
@@ -295,43 +149,44 @@ SECTION_DEAD char const* const stringBase_80393D98 = "DEFAULT_GETITEM";
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// False False
 asm void dInsect_c::Insect_GetDemoMain() {
-	nofralloc
+    nofralloc
 #include "asm/d/d_insect/Insect_GetDemoMain__9dInsect_cFv.s"
 }
 #pragma pop
 
-
 /* ############################################################################################## */
-/* 804535E0-804535E4 0004+00 s=1 e=0 z=0  None .sdata2    @3871                                                        */
+/* 804535E0-804535E4 0004+00 s=1 e=0 z=0  None .sdata2    @3871 */
 SECTION_SDATA2 static f32 lit_3871 = 20.0f;
 
-/* 804535E4-804535E8 0004+00 s=1 e=0 z=0  None .sdata2    @3872                                                        */
+/* 804535E4-804535E8 0004+00 s=1 e=0 z=0  None .sdata2    @3872 */
 SECTION_SDATA2 static u8 lit_3872[4] = {
-	0x00, 0x00, 0x00, 0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
 };
 
-/* 804535E8-804535EC 0004+00 s=1 e=0 z=0  None .sdata2    @3873                                                        */
+/* 804535E8-804535EC 0004+00 s=1 e=0 z=0  None .sdata2    @3873 */
 SECTION_SDATA2 static f32 lit_3873 = 608.0f;
 
-/* 804535EC-804535F0 0004+00 s=1 e=0 z=0  None .sdata2    @3874                                                        */
+/* 804535EC-804535F0 0004+00 s=1 e=0 z=0  None .sdata2    @3874 */
 SECTION_SDATA2 static f32 lit_3874 = 448.0f;
 
-/* 804535F0-804535F4 0004+00 s=1 e=0 z=0  None .sdata2    @3875                                                        */
+/* 804535F0-804535F4 0004+00 s=1 e=0 z=0  None .sdata2    @3875 */
 SECTION_SDATA2 static f32 lit_3875 = -10.0f;
 
-/* 804535F4-804535F8 0004+00 s=1 e=0 z=0  None .sdata2    @3876                                                        */
+/* 804535F4-804535F8 0004+00 s=1 e=0 z=0  None .sdata2    @3876 */
 SECTION_SDATA2 static f32 lit_3876 = 16777215.0f;
 
-/* 804535F8-80453600 0004+04 s=1 e=0 z=0  None .sdata2    @3877                                                        */
+/* 804535F8-80453600 0004+04 s=1 e=0 z=0  None .sdata2    @3877 */
 SECTION_SDATA2 static f32 lit_3877[1 + 1 /* padding */] = {
-	1.0f,
-	/* padding */
-	0.0f,
+    1.0f,
+    /* padding */
+    0.0f,
 };
 
-/* 8015E26C-8015E3F8 018C+00 s=0 e=0 z=3  None .text      CalcZBuffer__9dInsect_cFf                                    */
+/* 8015E26C-8015E3F8 018C+00 s=0 e=0 z=3  None .text      CalcZBuffer__9dInsect_cFf */
 //	8015E2B4: 804535E0 (lit_3871)
 //	8015E2C8: 80015310 (mDoLib_project__FP3VecP3Vec)
 //	8015E2CC: 804061C0 (g_dComIfG_gameInfo)
@@ -353,12 +208,8 @@ SECTION_SDATA2 static f32 lit_3877[1 + 1 /* padding */] = {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// False False
-//  f32 False
 asm void dInsect_c::CalcZBuffer(f32 param_0) {
-	nofralloc
+    nofralloc
 #include "asm/d/d_insect/CalcZBuffer__9dInsect_cFf.s"
 }
 #pragma pop
-
-