mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 20:57:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Annotate all data with DUSK_GAME_DATA (#2214)

Browse Source 
The hope of auto-importing data via lld MinGW
+ pseudo_reloc is now dead thanks to ARM64,
so I just wrote a script to go annotate every
exported data symbol in the game instead.
This commit is contained in:
Luke Street
2026-07-14 13:49:21 -06:00
committed by GitHub
parent f5d30a886d
commit eed14acdc6
843 changed files with 4817 additions and 4821 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/src/JFramework/JFWDisplay.cpp
+2 -2
View File
@@ -65,7 +65,7 @@ JFWDisplay::~JFWDisplay() {
mXfbManager = NULL;
}
JFWDisplay* JFWDisplay::sManager;
DUSK_GAME_DATA JFWDisplay* JFWDisplay::sManager;
JFWDisplay* JFWDisplay::createManager(GXRenderModeObj const* p_rObj, JKRHeap* p_heap,
JUTXfb::EXfbNumber xfb_num, bool enableAlpha) {
@@ -428,7 +428,7 @@ static void waitForTick(u32 p1, u16 p2) {
}
}
JSUList<JFWAlarm> JFWAlarm::sList(false);
DUSK_GAME_DATA JSUList<JFWAlarm> JFWAlarm::sList(false);
static void JFWThreadAlarmHandler(OSAlarm* p_alarm, OSContext* p_ctx) {
JFWAlarm* alarm = static_cast<JFWAlarm*>(p_alarm);
alarm->removeLink();
libs/JSystem/src/JFramework/JFWSystem.cpp
+19 -19
View File
@@ -13,32 +13,32 @@
#include "JSystem/JUtility/JUTResFont.h"
#include "JSystem/JUtility/JUTDbPrint.h"
s32 JFWSystem::CSetUpParam::maxStdHeaps = 2;
DUSK_GAME_DATA s32 JFWSystem::CSetUpParam::maxStdHeaps = 2;
u32 JFWSystem::CSetUpParam::sysHeapSize = 0x400000;
DUSK_GAME_DATA u32 JFWSystem::CSetUpParam::sysHeapSize = 0x400000;
JKRExpHeap* JFWSystem::rootHeap;
DUSK_GAME_DATA JKRExpHeap* JFWSystem::rootHeap;
JKRExpHeap* JFWSystem::systemHeap;
DUSK_GAME_DATA JKRExpHeap* JFWSystem::systemHeap;
u32 JFWSystem::CSetUpParam::fifoBufSize = 0x40000;
DUSK_GAME_DATA u32 JFWSystem::CSetUpParam::fifoBufSize = 0x40000;
u32 JFWSystem::CSetUpParam::aramAudioBufSize = 0x800000;
DUSK_GAME_DATA u32 JFWSystem::CSetUpParam::aramAudioBufSize = 0x800000;
u32 JFWSystem::CSetUpParam::aramGraphBufSize = 0x600000;
DUSK_GAME_DATA u32 JFWSystem::CSetUpParam::aramGraphBufSize = 0x600000;
s32 JFWSystem::CSetUpParam::streamPriority = 8;
DUSK_GAME_DATA s32 JFWSystem::CSetUpParam::streamPriority = 8;
s32 JFWSystem::CSetUpParam::decompPriority = 7;
DUSK_GAME_DATA s32 JFWSystem::CSetUpParam::decompPriority = 7;
s32 JFWSystem::CSetUpParam::aPiecePriority = 6;
DUSK_GAME_DATA s32 JFWSystem::CSetUpParam::aPiecePriority = 6;
ResFONT* JFWSystem::CSetUpParam::systemFontRes = (ResFONT*)&JUTResFONT_Ascfont_fix12;
DUSK_GAME_DATA ResFONT* JFWSystem::CSetUpParam::systemFontRes = (ResFONT*)&JUTResFONT_Ascfont_fix12;
const GXRenderModeObj* JFWSystem::CSetUpParam::renderMode = &GXNtsc480IntDf;
DUSK_GAME_DATA const GXRenderModeObj* JFWSystem::CSetUpParam::renderMode = &GXNtsc480IntDf;
u32 JFWSystem::CSetUpParam::exConsoleBufferSize = 0x24FC;
DUSK_GAME_DATA u32 JFWSystem::CSetUpParam::exConsoleBufferSize = 0x24FC;
void JFWSystem::firstInit() {
JUT_ASSERT(80, rootHeap == NULL);
@@ -49,17 +49,17 @@ void JFWSystem::firstInit() {
JKRHEAP_NAME(systemHeap, "System");
}
JKRThread* JFWSystem::mainThread;
DUSK_GAME_DATA JKRThread* JFWSystem::mainThread;
JUTDbPrint* JFWSystem::debugPrint;
DUSK_GAME_DATA JUTDbPrint* JFWSystem::debugPrint;
JUTResFont* JFWSystem::systemFont;
DUSK_GAME_DATA JUTResFont* JFWSystem::systemFont;
JUTConsoleManager* JFWSystem::systemConsoleManager;
DUSK_GAME_DATA JUTConsoleManager* JFWSystem::systemConsoleManager;
JUTConsole* JFWSystem::systemConsole;
DUSK_GAME_DATA JUTConsole* JFWSystem::systemConsole;
bool JFWSystem::sInitCalled = false;
DUSK_GAME_DATA bool JFWSystem::sInitCalled = false;
void JFWSystem::init() {
JUT_ASSERT(101, sInitCalled == false);