diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-01-09 17:33:14 -0800 |
|---|---|---|
| committer | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-01-09 17:33:14 -0800 |
| commit | 37146dfed130ad271f552fc1bbfff4dde7958d53 (patch) | |
| tree | 26a14703979221daf1a642c9f3726cf7a93dd992 /src | |
| parent | 035a24092ee91139ab60d41fb5f8b4fb35053281 (diff) | |
JFramework mostly ok
Diffstat (limited to 'src')
| -rw-r--r-- | src/m_Do/m_Do_graphic.cpp | 4 | ||||
| -rw-r--r-- | src/m_Do/m_Do_machine.cpp | 3 | ||||
| -rw-r--r-- | src/m_Do/m_Do_main.cpp | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 8f12cebe78..e92b25e23a 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -68,10 +68,6 @@ struct cXyz { static f32 Zero[3]; }; -struct JUTProcBar { - static u8 sManager[4]; -}; - struct JUTGamePad { static u8 mPadStatus[48]; }; diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp index ff67445668..aea800a5a2 100644 --- a/src/m_Do/m_Do_machine.cpp +++ b/src/m_Do/m_Do_machine.cpp @@ -356,7 +356,8 @@ void myExceptionCallback(u16 param_0, OSContext* param_1, u32 param_2, u32 param OSReport("JUTAssertionを可視化しました\n"); JUTAssertion::setVisible(true); JUTDbPrint::getManager()->setVisible(true); - JFWSystem::getSystemConsole()->setOutput(3); + JFWSystem::getSystemConsole()->setOutput(JUTConsole::OUTPUT_OSREPORT | + JUTConsole::OUTPUT_CONSOLE); } else { PPCHalt(); } diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index c3286e0f64..5d77a1ec3d 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -544,7 +544,7 @@ bool Debug_console(u32 i_padNo) { if (mDoCPd_c::getTrig(i_padNo) & CButton::A) { console->dumpToTerminal(0xFFFFFFFF); - console->setOutput(3); + console->setOutput(JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE); } JUTReport(0x1E, 0x186, 1, "Press X+Y+START to CLEAR console."); @@ -709,7 +709,7 @@ void main01(void) { JUTConsole* console = JFWSystem::getSystemConsole(); if (data_80450580 != 0) { - console->setOutput(3); + console->setOutput(JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE); } console->setPosition(32, 42); |