mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-21 22:10:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

JUTFontData_Ascfont_fix12 match

Browse Source
This commit is contained in:
LagoLunatic
2023-12-06 15:52:57 -05:00
parent f10810e5fe
commit 56a37d2594
9 changed files with 1065 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/GZLE01/splits.txt
+1 -1
View File
@@ -3095,7 +3095,7 @@ JSystem/JUtility/JUTGba.cpp:
.data start:0x8039D5A0 end:0x8039D5C0
.sbss start:0x803F7920 end:0x803F7928
JSystem/JUtility/JUTFontData_Ascfont_fix12.s: comment:0
JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp: comment:0
.rodata start:0x8036CA40 end:0x80370BA0 align:32
JSystem/J2DGraph/J2DGrafContext.cpp:
config/GZLJ01/splits.txt
+1 -1
View File
@@ -3091,7 +3091,7 @@ JSystem/JUtility/JUTGba.cpp:
.data start:0x80390AC8 end:0x80390AE8
.sbss start:0x803EADC0 end:0x803EADC8
JSystem/JUtility/JUTFontData_Ascfont_fix12.s: comment:0
JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp: comment:0
.rodata start:0x8035FEE0 end:0x80364040 align:32
JSystem/J2DGraph/J2DGrafContext.cpp:
config/GZLP01/splits.txt
+1 -1
View File
@@ -3095,7 +3095,7 @@ JSystem/JUtility/JUTGba.cpp:
.data start:0x803A42A0 end:0x803A42C0
.sbss start:0x803FF140 end:0x803FF148
JSystem/JUtility/JUTFontData_Ascfont_fix12.s: comment:0
JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp: comment:0
.rodata start:0x80373720 end:0x80377880 align:32
JSystem/J2DGraph/J2DGrafContext.cpp:
configure.py
+1 -1
View File
@@ -831,7 +831,7 @@ config.libs = [
Object(Matching, "JSystem/JUtility/JUTConsole.cpp"),
Object(Matching, "JSystem/JUtility/JUTDirectFile.cpp"),
Object(Matching, "JSystem/JUtility/JUTGba.cpp"),
Object(NonMatching, "JSystem/JUtility/JUTFontData_Ascfont_fix12.s"),
Object(Matching, "JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp"), # Originally a .s file
],
),
JSystemLib(
include/JSystem/JFramework/JFWSystem.h
+1
View File
@@ -32,6 +32,7 @@ struct JFWSystem {
static JUTConsole* getSystemConsole() { return systemConsole; }
static JKRExpHeap* getSystemHeap() { return systemHeap; }
static JUTResFont* getSystemFont() { return systemFont; }
static void setMaxStdHeap(int max) {
JUT_ASSERT(47, sInitCalled == 0);
CSetUpParam::maxStdHeaps = max;
include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h
+2
View File
@@ -3,4 +3,6 @@
#include "dolphin/types.h"
extern const u8 JUTResFONT_Ascfont_fix12[] __attribute__((aligned(32)));
#endif /* JUTFONTDATA_ASCFONT_FIX12_H */
src/JSystem/JFramework/JFWSystem.cpp
+4 -3
View File
@@ -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) {
src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp
+1052
View File
File diff suppressed because it is too large Load Diff
src/f_pc/f_pc_manager_data.inc
+2
View File
@@ -1,4 +1,6 @@
#include "dolphin/types.h"
const u8 black_tex[] = {
0x00, 0x00, 0x00, 0x08, 0x00, 0x08, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,