diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2023-12-06 15:52:57 -0500 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2023-12-06 15:52:57 -0500 |
| commit | 56a37d2594701d37d220fe6d4927d61f4abb3419 (patch) | |
| tree | 10f87acb51c21594093798b169484bb9a90e6788 /src/JSystem/JFramework/JFWSystem.cpp | |
| parent | f10810e5fe7bafa960be440019e4afa5c18abbd4 (diff) | |
JUTFontData_Ascfont_fix12 match
Diffstat (limited to 'src/JSystem/JFramework/JFWSystem.cpp')
| -rw-r--r-- | src/JSystem/JFramework/JFWSystem.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/JSystem/JFramework/JFWSystem.cpp b/src/JSystem/JFramework/JFWSystem.cpp index 4ba5d809..de8ad822 100644 --- a/src/JSystem/JFramework/JFWSystem.cpp +++ b/src/JSystem/JFramework/JFWSystem.cpp @@ -15,6 +15,7 @@ #include "JSystem/JUtility/JUTResFont.h" #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTConsole.h" +#include "JSystem/JUtility/JUTFontData_Ascfont_fix12.h" #include "dolphin/os/OS.h" #include "dolphin/dvd/dvd.h" #include "dolphin/gx/GXFrameBuf.h" @@ -28,8 +29,8 @@ u32 JFWSystem::CSetUpParam::aramGraphBufSize = 0x600000; u32 JFWSystem::CSetUpParam::streamPriority = 8; u32 JFWSystem::CSetUpParam::decompPriority = 7; u32 JFWSystem::CSetUpParam::aPiecePriority = 6; -ResFONT* JFWSystem::CSetUpParam::systemFontRes = (ResFONT*)0x8036CA40; //using JUTResFONT_Ascfont_fix12 makes the pointer null -GXRenderModeObj* JFWSystem::CSetUpParam::renderMode = (GXRenderModeObj*)0x803A1AB8; //using GXNtsc480IntDf makes the pointer null +ResFONT* JFWSystem::CSetUpParam::systemFontRes = (ResFONT*)JUTResFONT_Ascfont_fix12; +GXRenderModeObj* JFWSystem::CSetUpParam::renderMode = &GXNtsc480IntDf; u32 JFWSystem::CSetUpParam::exConsoleBufferSize = 0x24F8; JKRExpHeap* JFWSystem::rootHeap = 0; @@ -53,7 +54,7 @@ void JFWSystem::firstInit() { } void JFWSystem::init() { - /* Nonmatching */ + /* Nonmatching - regalloc */ JUT_ASSERT(101, sInitCalled == false); if(rootHeap == 0) { |