From 7d271be857c95c4a6c28d4d185378fba5c762c16 Mon Sep 17 00:00:00 2001
From: TakaRikka <38417346+TakaRikka@users.noreply.github.com>
Date: Fri, 24 Sep 2021 08:11:10 -0700
Subject: m_Do cleanup, d_resource, drawlist stuff (#145)

* d_resource / some d_stage

* setup dDlst_list_c / d_select_icon OK

* JUTXfb / some JUTVideo + various

* some J2D classes / JUTVideo/Fader attempts

* bunch of m_Do cleanup + matches / f_ap_game OK

* mDoLib_clipper::setup OK

* most of d_meter_HIO OK

* pane_class / kantera_icon_meter
---
 libs/JSystem/JFramework/JFWSystem.cpp | 39 +----------------------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

(limited to 'libs/JSystem/JFramework/JFWSystem.cpp')

diff --git a/libs/JSystem/JFramework/JFWSystem.cpp b/libs/JSystem/JFramework/JFWSystem.cpp
index dad2e433e3..b102ce1a28 100644
--- a/libs/JSystem/JFramework/JFWSystem.cpp
+++ b/libs/JSystem/JFramework/JFWSystem.cpp
@@ -11,10 +11,6 @@
 // Types:
 //
 
-struct _GXRenderModeObj {};
-
-struct ResFONT {};
-
 struct OSThread {};
 
 struct JUTVideo {
@@ -37,8 +33,6 @@ struct JUTGamePad {
     /* 802E0898 */ void init();
 };
 
-struct JUTFont {};
-
 struct JUTDirectPrint {
     /* 802E4240 */ void start();
 };
@@ -57,10 +51,6 @@ struct JUTConsoleManager {
     /* 802E81F4 */ void createManager(JKRHeap*);
 };
 
-struct JUTConsole {
-    /* 802E7354 */ void create(unsigned int, unsigned int, JKRHeap*);
-};
-
 struct JUTAssertion {
     /* 802E495C */ void create();
 };
@@ -78,33 +68,6 @@ struct JKRAram {
     /* 802D1FA4 */ void create(u32, u32, s32, s32, s32);
 };
 
-struct JFWSystem {
-    struct CSetUpParam {
-        static u32 maxStdHeaps;
-        static u32 sysHeapSize;
-        static u32 fifoBufSize;
-        static u32 aramAudioBufSize;
-        static u32 aramGraphBufSize;
-        static u32 streamPriority;
-        static u32 decompPriority;
-        static u32 aPiecePriority;
-        static void* systemFontRes;
-        static void* renderMode;
-        static u32 exConsoleBufferSize[1 + 1 /* padding */];
-    };
-
-    /* 80271CD0 */ void firstInit();
-    /* 80271D18 */ void init();
-
-    static u8 rootHeap[4];
-    static u8 systemHeap[4];
-    static u8 mainThread[4];
-    static u8 debugPrint[4];
-    static u8 systemFont[4];
-    static u8 systemConsoleManager[4];
-    static u8 systemConsole[4];
-};
-
 //
 // Forward References:
 //
@@ -238,7 +201,7 @@ u8 JFWSystem::systemFont[4];
 u8 JFWSystem::systemConsoleManager[4];
 
 /* 804511B8-804511BC 0006B8 0004+00 1/1 7/7 0/0 .sbss            systemConsole__9JFWSystem */
-u8 JFWSystem::systemConsole[4];
+JUTConsole* JFWSystem::systemConsole;
 
 /* 804511BC-804511C0 0006BC 0004+00 1/1 0/0 0/0 .sbss            None */
 static u8 data_804511BC[4];
-- 
cgit v1.2.3