JFramework mostly ok

This commit is contained in:
TakaRikka
2022-01-09 17:33:14 -08:00
parent 035a24092e
commit 37146dfed1
17 changed files with 878 additions and 583 deletions
+1 -1
View File
@@ -1126,7 +1126,7 @@ void JUTException::createConsole(void* console_buffer, u32 console_buffer_size)
sConsole->setPosition(15, 26);
sConsole->setHeight(23);
sConsole->setVisible(true);
sConsole->setOutput(3);
sConsole->setOutput(JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE);
}
}
+1 -39
View File
@@ -11,47 +11,10 @@
// Types:
//
struct JUtility {
struct TColor {};
};
struct JUTVideo {
static u8 sManager[4];
};
struct JUTProcBar {
struct CTime {
/* 802E7340 */ CTime();
};
/* 802E5888 */ JUTProcBar();
/* 802E599C */ ~JUTProcBar();
/* 802E59E0 */ void create();
/* 802E5A28 */ void destroy();
/* 802E5A60 */ void clear();
/* 802E5B30 */ void bar_subroutine(int, int, int, int, int, int, int, JUtility::TColor,
JUtility::TColor);
/* 802E5CC4 */ void adjustMeterLength(u32, f32*, f32, f32, int*);
/* 802E5E08 */ void draw();
/* 802E5E3C */ void drawProcessBar();
/* 802E6FA0 */ void drawHeapBar();
static u8 sManager[4];
};
struct JKRHeap {
/* 802CE784 */ void getTotalFreeSize();
static u8 sSystemHeap[4];
static u8 sCurrentHeap[4];
static u8 sRootHeap[4];
static u8 mCodeStart[4];
static u8 mCodeEnd[4];
static u8 mUserRamStart[4];
static u8 mUserRamEnd[4];
static u8 mMemorySize[4];
};
//
// Forward References:
//
@@ -82,7 +45,6 @@ extern "C" void __dl__FPv();
extern "C" void J2DDrawLine__FffffQ28JUtility6TColori();
extern "C" void J2DFillBox__FffffQ28JUtility6TColor();
extern "C" void J2DDrawFrame__FffffQ28JUtility6TColorUc();
extern "C" void OSGetTick();
extern "C" void __construct_array();
extern "C" void _savegpr_21();
extern "C" void _savegpr_25();
@@ -118,7 +80,7 @@ asm JUTProcBar::JUTProcBar() {
/* ############################################################################################## */
/* 80451558-8045155C 000A58 0004+00 4/4 6/6 0/0 .sbss sManager__10JUTProcBar */
u8 JUTProcBar::sManager[4];
JUTProcBar* JUTProcBar::sManager;
/* 802E599C-802E59E0 2E02DC 0044+00 1/1 0/0 0/0 .text __dt__10JUTProcBarFv */
#pragma push
+1 -2
View File
@@ -15,7 +15,6 @@
//
extern "C" void GXSetDrawDone();
extern "C" void GXCopyDisp(void*, BOOL);
//
// Declarations:
@@ -156,7 +155,7 @@ void JUTVideo::preRetraceProc(u32 retrace_count) {
s16 index = xfb->getDrawnXfbIndex();
if (index >= 0) {
xfb->setDisplayingXfbIndex(index);
GXCopyDisp(xfb->getDisplayingXfb(), 1);
GXCopyDisp(xfb->getDisplayingXfb(), GX_TRUE);
GXFlush();
xfb->setSDrawingFlag(2);
frameBuffer = xfb->getDisplayingXfb();