__sinit and progress script update

1 files changed, 64 insertions, 217 deletions

diff --git a/src/d/msg/d_msg_string.cpp b/src/d/msg/d_msg_string.cpp
index dc46f9cd78..e128e8bfda 100644
--- a/src/d/msg/d_msg_string.cpp
+++ b/src/d/msg/d_msg_string.cpp
@@ -1,225 +1,96 @@
-// 
+//
 // Generated By: dol2asm
 // Translation Unit: d/msg/d_msg_string
-// 
+//
 
+#include "d/msg/d_msg_string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
-#include "d/msg/d_msg_string.h"
 
-// 
+//
 // Types:
-// 
+//
 
-struct J2DTextBox {
+struct COutFont_c {
+    /* 80225C94 */ COutFont_c(u8);
 };
 
-struct JUTFont {
-};
+struct J2DTextBox {};
 
-struct COutFont_c {
-	/* 80225C94 */ // False False
-//  u8 False
-COutFont_c(u8);
-};
+struct JUTFont {};
 
 struct dMsgString_c {
-	/* 80191B6C */ // False False
-//  u32 False
-//  J2DTextBox* False
-// 	 J2DTextBox False
-//  J2DTextBox* False
-// 	 J2DTextBox False
-//  JUTFont* False
-// 	 JUTFont False
-//  COutFont_c* False
-// 	 COutFont_c False
-//  u8 False
-void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
-	/* 801E1D10 */ // False False
-//  u32 False
-//  u8 False
-//  u8 False
-//  J2DTextBox* False
-// 	 J2DTextBox False
-//  J2DTextBox* False
-// 	 J2DTextBox False
-//  JUTFont* False
-// 	 JUTFont False
-//  COutFont_c* False
-// 	 COutFont_c False
-//  u8 False
-void getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
-	/* 80249C20 */ // False False
-dMsgString_c();
-	/* 80249CA0 */ // False False
-//  u8 False
-dMsgString_c(u8);
-	/* 80249D28 */ // False False
-~dMsgString_c();
-	/* 80249DB4 */ // True False
-//  J2DTextBox* False
-// 	 J2DTextBox False
-void resetStringLocal(J2DTextBox*);
-	/* 80249DE4 */ // True False
-//  J2DTextBox* False
-// 	 J2DTextBox False
-//  f32 False
-void drawOutFontLocal(J2DTextBox*, f32);
-	/* 80249ED0 */ // True False
-//  J2DTextBox* False
-// 	 J2DTextBox False
-//  u8 False
-//  f32 False
-//  f32 False
-//  f32 False
-//  f32 False
-//  u32 False
-//  u8 False
-void drawFontLocal(J2DTextBox*, u8, f32, f32, f32, f32, u32, u8);
+    /* 80191B6C */ void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
+    /* 801E1D10 */ void getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*,
+                                      u8);
+    /* 80249C20 */ dMsgString_c();
+    /* 80249CA0 */ dMsgString_c(u8);
+    /* 80249D28 */ ~dMsgString_c();
+    /* 80249DB4 */ void resetStringLocal(J2DTextBox*);
+    /* 80249DE4 */ void drawOutFontLocal(J2DTextBox*, f32);
+    /* 80249ED0 */ void drawFontLocal(J2DTextBox*, u8, f32, f32, f32, f32, u32, u8);
 };
 
 struct dMsgStringBase_c {
-	/* 802493B4 */ // False False
-dMsgStringBase_c();
-	/* 80249528 */ // False False
-~dMsgStringBase_c();
-	/* 80249700 */ // False False
-void getResource();
-	/* 80249BF8 */ // False False
-//  u32 False
-//  char* False
-// 	 char False
-void getMessage(u32, char*);
+    /* 802493B4 */ dMsgStringBase_c();
+    /* 80249528 */ ~dMsgStringBase_c();
+    /* 80249700 */ void getResource();
+    /* 80249BF8 */ void getMessage(u32, char*);
 };
 
 struct J2DPane {
-	/* 802F79A8 */ // False False
-//  u8 False
-void getGlbVtx(u8) const;
+    /* 802F79A8 */ void getGlbVtx(u8) const;
 };
 
-// 
+//
 // Forward References:
-// 
-
+//
 
-// False False
 extern "C" void __ct__12dMsgString_cFv();
-// False False
-//  u8 False
 extern "C" void __ct__12dMsgString_cFUc();
-// False False
 extern "C" void __dt__12dMsgString_cFv();
-// True False
-//  J2DTextBox* False
-// 	 J2DTextBox False
 extern "C" void resetStringLocal__12dMsgString_cFP10J2DTextBox();
-// True False
-//  J2DTextBox* False
-// 	 J2DTextBox False
-//  f32 False
 extern "C" void drawOutFontLocal__12dMsgString_cFP10J2DTextBoxf();
-// True False
-//  J2DTextBox* False
-// 	 J2DTextBox False
-//  u8 False
-//  f32 False
-//  f32 False
-//  f32 False
-//  f32 False
-//  u32 False
-//  u8 False
 extern "C" void drawFontLocal__12dMsgString_cFP10J2DTextBoxUcffffUlUc();
 extern "C" extern void* __vt__12dMsgString_c[8];
 
-// 
+//
 // External References:
-// 
+//
 
-// False False
-//  void* False
-// 	 void False
-//  u32 False
 void* operator new(u32);
-// False False
-//  void False
-//  void* False
-// 	 void False
 void operator delete(void*);
 
-// False False
-//  u32 False
-//  J2DTextBox* False
-// 	 J2DTextBox False
-//  J2DTextBox* False
-// 	 J2DTextBox False
-//  JUTFont* False
-// 	 JUTFont False
-//  COutFont_c* False
-// 	 COutFont_c False
-//  u8 False
 extern "C" void getString__12dMsgString_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc();
-// False False
-//  u32 False
-//  u8 False
-//  u8 False
-//  J2DTextBox* False
-// 	 J2DTextBox False
-//  J2DTextBox* False
-// 	 J2DTextBox False
-//  JUTFont* False
-// 	 JUTFont False
-//  COutFont_c* False
-// 	 COutFont_c False
-//  u8 False
-extern "C" void getStringPage__12dMsgString_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc();
-// False False
-//  u8 False
+extern "C" void
+getStringPage__12dMsgString_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc();
 extern "C" void __ct__10COutFont_cFUc();
-// False False
 extern "C" void __ct__16dMsgStringBase_cFv();
-// False False
 extern "C" void __dt__16dMsgStringBase_cFv();
-// False False
 extern "C" void getResource__16dMsgStringBase_cFv();
-// False False
-//  u32 False
-//  char* False
-// 	 char False
 extern "C" void getMessage__16dMsgStringBase_cFUlPc();
-// False False
-//  void* False
-// 	 void False
-//  u32 False
 extern "C" void* __nw__FUl();
-// False False
-//  void False
-//  void* False
-// 	 void False
 extern "C" void __dl__FPv();
-// False False
-//  u8 False
 extern "C" void getGlbVtx__7J2DPaneCFUc();
 
-// 
+//
 // Declarations:
-// 
+//
 
 /* ############################################################################################## */
-/* 803C1498-803C14B8 0020+00 s=3 e=0 z=0  None .data      __vt__12dMsgString_c                                         */
+/* 803C1498-803C14B8 0020+00 s=3 e=0 z=0  None .data      __vt__12dMsgString_c */
 SECTION_DATA void* __vt__12dMsgString_c[8] = {
-	(void*)NULL /* RTTI */,
-	(void*)NULL,
-	(void*)getString__12dMsgString_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc,
-	(void*)getStringPage__12dMsgString_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc,
-	(void*)getMessage__16dMsgStringBase_cFUlPc,
-	(void*)resetStringLocal__12dMsgString_cFP10J2DTextBox,
-	(void*)drawOutFontLocal__12dMsgString_cFP10J2DTextBoxf,
-	(void*)drawFontLocal__12dMsgString_cFP10J2DTextBoxUcffffUlUc,
+    (void*)NULL /* RTTI */,
+    (void*)NULL,
+    (void*)getString__12dMsgString_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc,
+    (void*)getStringPage__12dMsgString_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc,
+    (void*)getMessage__16dMsgStringBase_cFUlPc,
+    (void*)resetStringLocal__12dMsgString_cFP10J2DTextBox,
+    (void*)drawOutFontLocal__12dMsgString_cFP10J2DTextBoxf,
+    (void*)drawFontLocal__12dMsgString_cFP10J2DTextBoxUcffffUlUc,
 };
 
-/* 80249C20-80249CA0 0080+00 s=0 e=15 z=0  None .text      __ct__12dMsgString_cFv                                       */
+/* 80249C20-80249CA0 0080+00 s=0 e=15 z=0  None .text      __ct__12dMsgString_cFv */
 //	80249C34: 802493B4 (__ct__16dMsgStringBase_cFv)
 //	80249C38: 803C1498 (__vt__12dMsgString_c)
 //	80249C3C: 803C1498 (__vt__12dMsgString_c)
@@ -229,15 +100,13 @@ SECTION_DATA void* __vt__12dMsgString_c[8] = {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// False False
 asm dMsgString_c::dMsgString_c() {
-	nofralloc
+    nofralloc
 #include "asm/d/msg/d_msg_string/__ct__12dMsgString_cFv.s"
 }
 #pragma pop
 
-
-/* 80249CA0-80249D28 0088+00 s=0 e=1 z=0  None .text      __ct__12dMsgString_cFUc                                      */
+/* 80249CA0-80249D28 0088+00 s=0 e=1 z=0  None .text      __ct__12dMsgString_cFUc */
 //	80249CBC: 802493B4 (__ct__16dMsgStringBase_cFv)
 //	80249CC0: 803C1498 (__vt__12dMsgString_c)
 //	80249CC4: 803C1498 (__vt__12dMsgString_c)
@@ -247,16 +116,13 @@ asm dMsgString_c::dMsgString_c() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// False False
-//  u8 False
 asm dMsgString_c::dMsgString_c(u8 param_0) {
-	nofralloc
+    nofralloc
 #include "asm/d/msg/d_msg_string/__ct__12dMsgString_cFUc.s"
 }
 #pragma pop
 
-
-/* 80249D28-80249DB4 008C+00 s=0 e=17 z=0  None .text      __dt__12dMsgString_cFv                                       */
+/* 80249D28-80249DB4 008C+00 s=0 e=17 z=0  None .text      __dt__12dMsgString_cFv */
 //	80249D48: 803C1498 (__vt__12dMsgString_c)
 //	80249D4C: 803C1498 (__vt__12dMsgString_c)
 //	80249D84: 80249528 (__dt__16dMsgStringBase_cFv)
@@ -264,46 +130,42 @@ asm dMsgString_c::dMsgString_c(u8 param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// False False
 asm dMsgString_c::~dMsgString_c() {
-	nofralloc
+    nofralloc
 #include "asm/d/msg/d_msg_string/__dt__12dMsgString_cFv.s"
 }
 #pragma pop
 
-
-/* 80249DB4-80249DE4 0030+00 s=1 e=0 z=0  None .text      resetStringLocal__12dMsgString_cFP10J2DTextBox               */
+/* 80249DB4-80249DE4 0030+00 s=1 e=0 z=0  None .text
+ * resetStringLocal__12dMsgString_cFP10J2DTextBox               */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// True False
-//  J2DTextBox* False
-// 	 J2DTextBox False
 asm void dMsgString_c::resetStringLocal(J2DTextBox* param_0) {
-	nofralloc
+    nofralloc
 #include "asm/d/msg/d_msg_string/resetStringLocal__12dMsgString_cFP10J2DTextBox.s"
 }
 #pragma pop
 
-
 /* ############################################################################################## */
-/* 80454D78-80454D7C 0004+00 s=1 e=0 z=0  None .sdata2    @3777                                                        */
+/* 80454D78-80454D7C 0004+00 s=1 e=0 z=0  None .sdata2    @3777 */
 SECTION_SDATA2 static f32 lit_3777 = 255.0f;
 
-/* 80454D7C-80454D80 0004+00 s=1 e=0 z=0  None .sdata2    @3778                                                        */
+/* 80454D7C-80454D80 0004+00 s=1 e=0 z=0  None .sdata2    @3778 */
 SECTION_SDATA2 static f32 lit_3778 = -1.0f;
 
-/* 80454D80-80454D88 0004+04 s=1 e=0 z=0  None .sdata2    @3779                                                        */
+/* 80454D80-80454D88 0004+04 s=1 e=0 z=0  None .sdata2    @3779 */
 SECTION_SDATA2 static f32 lit_3779[1 + 1 /* padding */] = {
-	1.0f,
-	/* padding */
-	0.0f,
+    1.0f,
+    /* padding */
+    0.0f,
 };
 
-/* 80454D88-80454D90 0008+00 s=1 e=0 z=0  None .sdata2    @3781                                                        */
+/* 80454D88-80454D90 0008+00 s=1 e=0 z=0  None .sdata2    @3781 */
 SECTION_SDATA2 static f64 lit_3781 = 4503599627370496.0 /* cast u32 to float */;
 
-/* 80249DE4-80249ED0 00EC+00 s=1 e=0 z=0  None .text      drawOutFontLocal__12dMsgString_cFP10J2DTextBoxf              */
+/* 80249DE4-80249ED0 00EC+00 s=1 e=0 z=0  None .text
+ * drawOutFontLocal__12dMsgString_cFP10J2DTextBoxf              */
 //	80249E1C: 802F79A8 (getGlbVtx__7J2DPaneCFUc)
 //	80249E3C: 80454D7C (lit_3778)
 //	80249E4C: 80454D88 (lit_3781)
@@ -312,35 +174,20 @@ SECTION_SDATA2 static f64 lit_3781 = 4503599627370496.0 /* cast u32 to float */;
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// True False
-//  J2DTextBox* False
-// 	 J2DTextBox False
-//  f32 False
 asm void dMsgString_c::drawOutFontLocal(J2DTextBox* param_0, f32 param_1) {
-	nofralloc
+    nofralloc
 #include "asm/d/msg/d_msg_string/drawOutFontLocal__12dMsgString_cFP10J2DTextBoxf.s"
 }
 #pragma pop
 
-
-/* 80249ED0-80249F00 0030+00 s=1 e=0 z=0  None .text      drawFontLocal__12dMsgString_cFP10J2DTextBoxUcffffUlUc        */
+/* 80249ED0-80249F00 0030+00 s=1 e=0 z=0  None .text
+ * drawFontLocal__12dMsgString_cFP10J2DTextBoxUcffffUlUc        */
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// True False
-//  J2DTextBox* False
-// 	 J2DTextBox False
-//  u8 False
-//  f32 False
-//  f32 False
-//  f32 False
-//  f32 False
-//  u32 False
-//  u8 False
-asm void dMsgString_c::drawFontLocal(J2DTextBox* param_0, u8 param_1, f32 param_2, f32 param_3, f32 param_4, f32 param_5, u32 param_6, u8 param_7) {
-	nofralloc
+asm void dMsgString_c::drawFontLocal(J2DTextBox* param_0, u8 param_1, f32 param_2, f32 param_3,
+                                     f32 param_4, f32 param_5, u32 param_6, u8 param_7) {
+    nofralloc
 #include "asm/d/msg/d_msg_string/drawFontLocal__12dMsgString_cFP10J2DTextBoxUcffffUlUc.s"
 }
 #pragma pop
-
-