__sinit and progress script update

1 files changed, 72 insertions, 211 deletions

diff --git a/libs/JSystem/JFramework/JFWSystem.cpp b/libs/JSystem/JFramework/JFWSystem.cpp
index 79a49842b1..de0ad03266 100644
--- a/libs/JSystem/JFramework/JFWSystem.cpp
+++ b/libs/JSystem/JFramework/JFWSystem.cpp
@@ -1,162 +1,93 @@
-// 
+//
 // Generated By: dol2asm
 // Translation Unit: JFWSystem
-// 
+//
 
+#include "JSystem/JFramework/JFWSystem.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
-#include "JSystem/JFramework/JFWSystem.h"
 
-// 
+//
 // Types:
-// 
+//
 
-struct _GXRenderModeObj {
-};
+struct _GXRenderModeObj {};
 
-struct ResFONT {
-};
+struct ResFONT {};
 
-struct OSThread {
-};
+struct OSThread {};
 
 struct JUTVideo {
-	/* 802E4C54 */ // False False
-//  _GXRenderModeObj const* False
-// 	 _GXRenderModeObj const False
-// 		 _GXRenderModeObj False
-void createManager(_GXRenderModeObj const*);
+    /* 802E4C54 */ void createManager(_GXRenderModeObj const*);
 };
 
 struct JKRHeap {
-	/* 802CE4D4 */ // False False
-//  u32 False
-//  int False
-void alloc(u32, int);
+    /* 802CE4D4 */ void alloc(u32, int);
 };
 
 struct JUTResFont {
-	/* 802DEF94 */ // False False
-//  ResFONT const* False
-// 	 ResFONT const False
-// 		 ResFONT False
-//  JKRHeap* False
-// 	 JKRHeap False
-JUTResFont(ResFONT const*, JKRHeap*);
+    /* 802DEF94 */ JUTResFont(ResFONT const*, JKRHeap*);
 };
 
 struct JUTGraphFifo {
-	/* 802DEB58 */ // False False
-//  u32 False
-JUTGraphFifo(u32);
+    /* 802DEB58 */ JUTGraphFifo(u32);
 };
 
 struct JUTGamePad {
-	/* 802E0898 */ // False False
-void init();
+    /* 802E0898 */ void init();
 };
 
-struct JUTFont {
-};
+struct JUTFont {};
 
 struct JUTDirectPrint {
-	/* 802E4240 */ // False False
-void start();
+    /* 802E4240 */ void start();
 };
 
 struct JUTException {
-	/* 802E1E40 */ // False False
-//  JUTDirectPrint* False
-// 	 JUTDirectPrint False
-void create(JUTDirectPrint*);
-	/* 802E3FEC */ // False False
-//  void* False
-// 	 void False
-//  u32 False
-void createConsole(void*, u32);
+    /* 802E1E40 */ void create(JUTDirectPrint*);
+    /* 802E3FEC */ void createConsole(void*, u32);
 };
 
 struct JUTDbPrint {
-	/* 802E0190 */ // False False
-//  JUTFont* False
-// 	 JUTFont False
-//  JKRHeap* False
-// 	 JKRHeap False
-void start(JUTFont*, JKRHeap*);
-	/* 802E0204 */ // False False
-//  JUTFont* False
-// 	 JUTFont False
-void changeFont(JUTFont*);
+    /* 802E0190 */ void start(JUTFont*, JKRHeap*);
+    /* 802E0204 */ void changeFont(JUTFont*);
 };
 
 struct JUTConsoleManager {
-	/* 802E81F4 */ // False False
-//  JKRHeap* False
-// 	 JKRHeap False
-void createManager(JKRHeap*);
+    /* 802E81F4 */ void createManager(JKRHeap*);
 };
 
 struct JUTConsole {
-	/* 802E7354 */ // False False
-//  unsigned int False
-//  unsigned int False
-//  JKRHeap* False
-// 	 JKRHeap False
-void create(unsigned int, unsigned int, JKRHeap*);
+    /* 802E7354 */ void create(unsigned int, unsigned int, JKRHeap*);
 };
 
 struct JUTAssertion {
-	/* 802E495C */ // False False
-//  void False
-void create();
+    /* 802E495C */ void create();
 };
 
 struct JKRThread {
-	/* 802D16B8 */ // False False
-//  OSThread* False
-// 	 OSThread False
-//  int False
-JKRThread(OSThread*, int);
+    /* 802D16B8 */ JKRThread(OSThread*, int);
 };
 
 struct JKRExpHeap {
-	/* 802CEDB4 */ // False False
-//  int False
-//  bool False
-void createRoot(int, bool);
-	/* 802CEE2C */ // False False
-//  u32 False
-//  JKRHeap* False
-// 	 JKRHeap False
-//  bool False
-void create(u32, JKRHeap*, bool);
+    /* 802CEDB4 */ void createRoot(int, bool);
+    /* 802CEE2C */ void create(u32, JKRHeap*, bool);
 };
 
 struct JKRAram {
-	/* 802D1FA4 */ // False False
-//  u32 False
-//  u32 False
-//  s32 False
-//  s32 False
-//  s32 False
-void create(u32, u32, s32, s32, s32);
+    /* 802D1FA4 */ void create(u32, u32, s32, s32, s32);
 };
 
 struct JFWSystem {
-	/* 80271CD0 */ // False False
-void firstInit();
-	/* 80271D18 */ // False False
-void init();
+    /* 80271CD0 */ void firstInit();
+    /* 80271D18 */ void init();
 };
 
-// 
+//
 // Forward References:
-// 
-
+//
 
-// False False
 extern "C" void firstInit__9JFWSystemFv();
-// False False
 extern "C" void init__9JFWSystemFv();
 extern "C" extern u32 maxStdHeaps__Q29JFWSystem11CSetUpParam;
 extern "C" extern u32 sysHeapSize__Q29JFWSystem11CSetUpParam;
@@ -167,129 +98,56 @@ extern "C" extern void* renderMode__Q29JFWSystem11CSetUpParam;
 extern "C" extern u8 systemHeap__9JFWSystem[4];
 extern "C" extern u8 systemConsole__9JFWSystem[4];
 
-// 
+//
 // External References:
-// 
+//
 
-// False False
-//  void* False
-// 	 void False
-//  u32 False
 void* operator new(u32);
 
-// False False
-//  u32 False
-//  int False
 extern "C" void alloc__7JKRHeapFUli();
-// False False
-//  void* False
-// 	 void False
-//  u32 False
 extern "C" void* __nw__FUl();
-// False False
-//  int False
-//  bool False
 extern "C" void createRoot__10JKRExpHeapFib();
-// False False
-//  u32 False
-//  JKRHeap* False
-// 	 JKRHeap False
-//  bool False
 extern "C" void create__10JKRExpHeapFUlP7JKRHeapb();
-// False False
-//  OSThread* False
-// 	 OSThread False
-//  int False
 extern "C" void __ct__9JKRThreadFP8OSThreadi();
-// False False
-//  u32 False
-//  u32 False
-//  s32 False
-//  s32 False
-//  s32 False
 extern "C" void create__7JKRAramFUlUllll();
-// False False
-//  u32 False
 extern "C" void __ct__12JUTGraphFifoFUl();
-// False False
-//  ResFONT const* False
-// 	 ResFONT const False
-// 		 ResFONT False
-//  JKRHeap* False
-// 	 JKRHeap False
 extern "C" void __ct__10JUTResFontFPC7ResFONTP7JKRHeap();
-// False False
-//  JUTFont* False
-// 	 JUTFont False
-//  JKRHeap* False
-// 	 JKRHeap False
 extern "C" void start__10JUTDbPrintFP7JUTFontP7JKRHeap();
-// False False
-//  JUTFont* False
-// 	 JUTFont False
 extern "C" void changeFont__10JUTDbPrintFP7JUTFont();
-// False False
 extern "C" void init__10JUTGamePadFv();
-// False False
-//  JUTDirectPrint* False
-// 	 JUTDirectPrint False
 extern "C" void create__12JUTExceptionFP14JUTDirectPrint();
-// False False
-//  void* False
-// 	 void False
-//  u32 False
 extern "C" void createConsole__12JUTExceptionFPvUl();
-// False False
 extern "C" void start__14JUTDirectPrintFv();
-// False False
-//  void False
 extern "C" void create__12JUTAssertionFv();
-// False False
-//  _GXRenderModeObj const* False
-// 	 _GXRenderModeObj const False
-// 		 _GXRenderModeObj False
 extern "C" void createManager__8JUTVideoFPC16_GXRenderModeObj();
-// False False
-//  unsigned int False
-//  unsigned int False
-//  JKRHeap* False
-// 	 JKRHeap False
 extern "C" void create__10JUTConsoleFUiUiP7JKRHeap();
-// False False
-//  JKRHeap* False
-// 	 JKRHeap False
 extern "C" void createManager__17JUTConsoleManagerFP7JKRHeap();
-// False False
 extern "C" void JUTSetReportConsole();
-// False False
 extern "C" void JUTSetWarningConsole();
-// False False
 extern "C" void OSInit();
-// False False
 extern "C" void OSGetCurrentThread();
-// False False
 extern "C" void DVDInit();
 extern "C" extern u8 const JUTResFONT_Ascfont_fix12[16736];
 extern "C" extern u8 GXNtsc480IntDf[60];
 
-// 
+//
 // Declarations:
-// 
+//
 
 /* ############################################################################################## */
-/* 80450770-80450774 0004+00 s=1 e=1 z=0  None .sdata     maxStdHeaps__Q29JFWSystem11CSetUpParam                       */
+/* 80450770-80450774 0004+00 s=1 e=1 z=0  None .sdata     maxStdHeaps__Q29JFWSystem11CSetUpParam */
 SECTION_SDATA u32 maxStdHeaps__Q29JFWSystem11CSetUpParam = 0x00000002;
 
-/* 80450774-80450778 0004+00 s=1 e=1 z=0  None .sdata     sysHeapSize__Q29JFWSystem11CSetUpParam                       */
+/* 80450774-80450778 0004+00 s=1 e=1 z=0  None .sdata     sysHeapSize__Q29JFWSystem11CSetUpParam */
 SECTION_SDATA u32 sysHeapSize__Q29JFWSystem11CSetUpParam = 0x00400000;
 
-/* 804511A0-804511A4 0004+00 s=2 e=0 z=0  None .sbss      rootHeap__9JFWSystem                                         */
+/* 804511A0-804511A4 0004+00 s=2 e=0 z=0  None .sbss      rootHeap__9JFWSystem */
 static u8 rootHeap__9JFWSystem[4];
 
-/* 804511A4-804511A8 0004+00 s=2 e=1 z=0  None .sbss      systemHeap__9JFWSystem                                       */
+/* 804511A4-804511A8 0004+00 s=2 e=1 z=0  None .sbss      systemHeap__9JFWSystem */
 u8 systemHeap__9JFWSystem[4];
 
-/* 80271CD0-80271D18 0048+00 s=1 e=1 z=0  None .text      firstInit__9JFWSystemFv                                      */
+/* 80271CD0-80271D18 0048+00 s=1 e=1 z=0  None .text      firstInit__9JFWSystemFv */
 //	80271CDC: 80339F60 (OSInit)
 //	80271CE0: 803490F0 (DVDInit)
 //	80271CE4: 80450770 (maxStdHeaps__Q29JFWSystem11CSetUpParam)
@@ -301,74 +159,80 @@ u8 systemHeap__9JFWSystem[4];
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// False False
 asm void JFWSystem::firstInit() {
-	nofralloc
+    nofralloc
 #include "asm/JSystem/JFramework/JFWSystem/firstInit__9JFWSystemFv.s"
 }
 #pragma pop
 
-
 /* ############################################################################################## */
-/* 80450778-8045077C 0004+00 s=1 e=1 z=0  None .sdata     fifoBufSize__Q29JFWSystem11CSetUpParam                       */
+/* 80450778-8045077C 0004+00 s=1 e=1 z=0  None .sdata     fifoBufSize__Q29JFWSystem11CSetUpParam */
 SECTION_SDATA u32 fifoBufSize__Q29JFWSystem11CSetUpParam = 0x00040000;
 
-/* 8045077C-80450780 0004+00 s=1 e=1 z=0  None .sdata     aramAudioBufSize__Q29JFWSystem11CSetUpParam                  */
+/* 8045077C-80450780 0004+00 s=1 e=1 z=0  None .sdata aramAudioBufSize__Q29JFWSystem11CSetUpParam
+ */
 SECTION_SDATA u32 aramAudioBufSize__Q29JFWSystem11CSetUpParam = 0x00800000;
 
-/* 80450780-80450784 0004+00 s=1 e=1 z=0  None .sdata     aramGraphBufSize__Q29JFWSystem11CSetUpParam                  */
+/* 80450780-80450784 0004+00 s=1 e=1 z=0  None .sdata aramGraphBufSize__Q29JFWSystem11CSetUpParam
+ */
 SECTION_SDATA u32 aramGraphBufSize__Q29JFWSystem11CSetUpParam = 0x00600000;
 
-/* 80450784-80450788 0004+00 s=1 e=0 z=0  None .sdata     streamPriority__Q29JFWSystem11CSetUpParam                    */
+/* 80450784-80450788 0004+00 s=1 e=0 z=0  None .sdata     streamPriority__Q29JFWSystem11CSetUpParam
+ */
 SECTION_SDATA static u32 streamPriority__Q29JFWSystem11CSetUpParam = 0x00000008;
 
-/* 80450788-8045078C 0004+00 s=1 e=0 z=0  None .sdata     decompPriority__Q29JFWSystem11CSetUpParam                    */
+/* 80450788-8045078C 0004+00 s=1 e=0 z=0  None .sdata     decompPriority__Q29JFWSystem11CSetUpParam
+ */
 SECTION_SDATA static u32 decompPriority__Q29JFWSystem11CSetUpParam = 0x00000007;
 
-/* 8045078C-80450790 0004+00 s=1 e=0 z=0  None .sdata     aPiecePriority__Q29JFWSystem11CSetUpParam                    */
+/* 8045078C-80450790 0004+00 s=1 e=0 z=0  None .sdata     aPiecePriority__Q29JFWSystem11CSetUpParam
+ */
 SECTION_SDATA static u32 aPiecePriority__Q29JFWSystem11CSetUpParam = 0x00000006;
 
-/* 80450790-80450794 0004+00 s=1 e=0 z=0  None .sdata     systemFontRes__Q29JFWSystem11CSetUpParam                     */
-SECTION_SDATA static void* systemFontRes__Q29JFWSystem11CSetUpParam = (void*)&JUTResFONT_Ascfont_fix12;
+/* 80450790-80450794 0004+00 s=1 e=0 z=0  None .sdata     systemFontRes__Q29JFWSystem11CSetUpParam
+ */
+SECTION_SDATA static void* systemFontRes__Q29JFWSystem11CSetUpParam =
+    (void*)&JUTResFONT_Ascfont_fix12;
 
-/* 80450794-80450798 0004+00 s=1 e=1 z=0  None .sdata     renderMode__Q29JFWSystem11CSetUpParam                        */
+/* 80450794-80450798 0004+00 s=1 e=1 z=0  None .sdata     renderMode__Q29JFWSystem11CSetUpParam */
 SECTION_SDATA void* renderMode__Q29JFWSystem11CSetUpParam = (void*)&GXNtsc480IntDf;
 
-/* 80450798-804507A0 0004+04 s=1 e=0 z=0  None .sdata     exConsoleBufferSize__Q29JFWSystem11CSetUpParam               */
+/* 80450798-804507A0 0004+04 s=1 e=0 z=0  None .sdata
+ * exConsoleBufferSize__Q29JFWSystem11CSetUpParam               */
 SECTION_SDATA static u32 exConsoleBufferSize__Q29JFWSystem11CSetUpParam[1 + 1 /* padding */] = {
-	0x000024FC,
-	/* padding */
-	0x00000000,
+    0x000024FC,
+    /* padding */
+    0x00000000,
 };
 
-/* 804511A8-804511AC 0004+00 s=1 e=0 z=0  None .sbss      mainThread__9JFWSystem                                       */
+/* 804511A8-804511AC 0004+00 s=1 e=0 z=0  None .sbss      mainThread__9JFWSystem */
 static u8 mainThread__9JFWSystem[4];
 
-/* 804511AC-804511B0 0004+00 s=1 e=0 z=0  None .sbss      debugPrint__9JFWSystem                                       */
+/* 804511AC-804511B0 0004+00 s=1 e=0 z=0  None .sbss      debugPrint__9JFWSystem */
 static u8 debugPrint__9JFWSystem[4];
 
-/* 804511B0-804511B4 0004+00 s=1 e=0 z=0  None .sbss      systemFont__9JFWSystem                                       */
+/* 804511B0-804511B4 0004+00 s=1 e=0 z=0  None .sbss      systemFont__9JFWSystem */
 static u8 systemFont__9JFWSystem[4];
 
-/* 804511B4-804511B8 0004+00 s=1 e=0 z=0  None .sbss      systemConsoleManager__9JFWSystem                             */
+/* 804511B4-804511B8 0004+00 s=1 e=0 z=0  None .sbss      systemConsoleManager__9JFWSystem */
 static u8 systemConsoleManager__9JFWSystem[4];
 
-/* 804511B8-804511BC 0004+00 s=1 e=7 z=0  None .sbss      systemConsole__9JFWSystem                                    */
+/* 804511B8-804511BC 0004+00 s=1 e=7 z=0  None .sbss      systemConsole__9JFWSystem */
 u8 systemConsole__9JFWSystem[4];
 
-/* 804511BC-804511C0 0004+00 s=1 e=0 z=0  None .sbss      None                                                         */
+/* 804511BC-804511C0 0004+00 s=1 e=0 z=0  None .sbss      None */
 static u8 data_804511BC[4];
 
-/* 80455240-80455244 0004+00 s=1 e=0 z=0  None .sdata2    @2242                                                        */
+/* 80455240-80455244 0004+00 s=1 e=0 z=0  None .sdata2    @2242 */
 SECTION_SDATA2 static f32 lit_2242 = 0.5f;
 
-/* 80455244-80455248 0004+00 s=1 e=0 z=0  None .sdata2    @2243                                                        */
+/* 80455244-80455248 0004+00 s=1 e=0 z=0  None .sdata2    @2243 */
 SECTION_SDATA2 static f32 lit_2243 = 17.0f / 20.0f;
 
-/* 80455248-80455250 0008+00 s=1 e=0 z=0  None .sdata2    @2245                                                        */
+/* 80455248-80455250 0008+00 s=1 e=0 z=0  None .sdata2    @2245 */
 SECTION_SDATA2 static f64 lit_2245 = 4503601774854144.0 /* cast s32 to float */;
 
-/* 80271D18-80272040 0328+00 s=0 e=1 z=0  None .text      init__9JFWSystemFv                                           */
+/* 80271D18-80272040 0328+00 s=0 e=1 z=0  None .text      init__9JFWSystemFv */
 //	80271D34: 804511A0 (rootHeap__9JFWSystem)
 //	80271D40: 80271CD0 (firstInit__9JFWSystemFv)
 //	80271D48: 804511BC (data_804511BC)
@@ -436,11 +300,8 @@ SECTION_SDATA2 static f64 lit_2245 = 4503601774854144.0 /* cast s32 to float */;
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-// False False
 asm void JFWSystem::init() {
-	nofralloc
+    nofralloc
 #include "asm/JSystem/JFramework/JFWSystem/init__9JFWSystemFv.s"
 }
 #pragma pop
-
-