mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-13 19:44:32 -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/JUtility/JUTConsole.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
#include "dusk/string.hpp"
#include "global.h"
JUTConsoleManager* JUTConsoleManager::sManager;
DUSK_GAME_DATA JUTConsoleManager* JUTConsoleManager::sManager;
JUTConsole* JUTConsole::create(unsigned int param_0, unsigned int maxLines, JKRHeap* pHeap) {
JUTConsoleManager* pManager = JUTConsoleManager::getManager();
libs/JSystem/src/JUtility/JUTDbPrint.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) {
mVisible = true;
}
JUTDbPrint* JUTDbPrint::sDebugPrint;
DUSK_GAME_DATA JUTDbPrint* JUTDbPrint::sDebugPrint;
JUTDbPrint* JUTDbPrint::start(JUTFont* pFont, JKRHeap* pHeap) {
if (sDebugPrint == NULL) {
libs/JSystem/src/JUtility/JUTDirectPrint.cpp
+4 -4
View File
@@ -7,7 +7,7 @@
#include "global.h"
#include "angle_utils.h"
JUTDirectPrint* JUTDirectPrint::sDirectPrint;
DUSK_GAME_DATA JUTDirectPrint* JUTDirectPrint::sDirectPrint;
JUTDirectPrint::JUTDirectPrint() {
changeFrameBuffer(NULL, 0, 0);
@@ -48,7 +48,7 @@ void JUTDirectPrint::erase(int x, int y, int width, int height) {
}
}
u8 JUTDirectPrint::sAsciiTable[128] = {
DUSK_GAME_DATA u8 JUTDirectPrint::sAsciiTable[128] = {
0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0xFD, 0xFE, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0x29, 0x64, 0x65, 0x66, 0x2B, 0x67, 0x68, 0x25, 0x26, 0x69, 0x2A, 0x6A, 0x27, 0x2C, 0x6B,
@@ -59,7 +59,7 @@ u8 JUTDirectPrint::sAsciiTable[128] = {
0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x76, 0x77, 0x78, 0x79, 0x7A,
};
u32 JUTDirectPrint::sFontData[64] = {
DUSK_GAME_DATA u32 JUTDirectPrint::sFontData[64] = {
0x70871C30, 0x8988A250, 0x88808290, 0x88830C90, 0x888402F8, 0x88882210, 0x71CF9C10, 0xF9CF9C70,
0x8208A288, 0xF200A288, 0x0BC11C78, 0x0A222208, 0x8A222208, 0x71C21C70, 0x23C738F8, 0x5228A480,
0x8A282280, 0x8BC822F0, 0xFA282280, 0x8A28A480, 0x8BC738F8, 0xF9C89C08, 0x82288808, 0x82088808,
@@ -70,7 +70,7 @@ u32 JUTDirectPrint::sFontData[64] = {
0x70800000, 0x88822200, 0x08820400, 0x108F8800, 0x20821000, 0x00022200, 0x20800020, 0x00000000,
};
u32 JUTDirectPrint::sFontData2[77] = {
DUSK_GAME_DATA u32 JUTDirectPrint::sFontData2[77] = {
0x51421820, 0x53E7A420, 0x014A2C40, 0x01471000, 0x0142AA00, 0x03EAA400, 0x01471A78, 0x00000000,
0x50008010, 0x20010820, 0xF8020040, 0x20420820, 0x50441010, 0x00880000, 0x00070E00, 0x01088840,
0x78898820, 0x004A8810, 0x788A8810, 0x01098808, 0x00040E04, 0x70800620, 0x11400820, 0x12200820,
libs/JSystem/src/JUtility/JUTException.cpp
+12 -12
View File
@@ -27,16 +27,16 @@ struct CallbackObject {
/* 0x10 */ int param_4;
};
OSMessageQueue JUTException::sMessageQueue = {0};
DUSK_GAME_DATA OSMessageQueue JUTException::sMessageQueue = {0};
STATIC_ASSERT(sizeof(CallbackObject) == 0x14);
static CallbackObject exCallbackObject;
JSUList<JUTException::JUTExMapFile> JUTException::sMapFileList(false);
DUSK_GAME_DATA JSUList<JUTException::JUTExMapFile> JUTException::sMapFileList(false);
static OSTime c3bcnt[4] = {0, 0, 0, 0};
const char* JUTException::sCpuExpName[17] = {
DUSK_GAME_DATA const char* JUTException::sCpuExpName[17] = {
"SYSTEM RESET",
"MACHINE CHECK",
"DSI",
@@ -56,11 +56,11 @@ const char* JUTException::sCpuExpName[17] = {
"FLOATING POINT",
};
JUTException* JUTException::sErrorManager;
DUSK_GAME_DATA JUTException* JUTException::sErrorManager;
JUTExceptionUserCallback JUTException::sPreUserCallback;
DUSK_GAME_DATA JUTExceptionUserCallback JUTException::sPreUserCallback;
JUTExceptionUserCallback JUTException::sPostUserCallback;
DUSK_GAME_DATA JUTExceptionUserCallback JUTException::sPostUserCallback;
#if PLATFORM_GCN
const int stack_size = 0x1C00;
@@ -100,7 +100,7 @@ JUTException* JUTException::create(JUTDirectPrint* directPrint) {
return sErrorManager;
}
OSMessage JUTException::sMessageBuffer[1] = {0};
DUSK_GAME_DATA OSMessage JUTException::sMessageBuffer[1] = {0};
void* JUTException::run() {
#ifdef TARGET_PC
@@ -140,15 +140,15 @@ void* JUTException::run() {
#endif
}
void* JUTException::sConsoleBuffer;
DUSK_GAME_DATA void* JUTException::sConsoleBuffer;
u32 JUTException::sConsoleBufferSize;
DUSK_GAME_DATA u32 JUTException::sConsoleBufferSize;
JUTConsole* JUTException::sConsole;
DUSK_GAME_DATA JUTConsole* JUTException::sConsole;
u32 JUTException::msr;
DUSK_GAME_DATA u32 JUTException::msr;
u32 JUTException::fpscr;
DUSK_GAME_DATA u32 JUTException::fpscr;
void JUTException::errorHandler(OSError error, OSContext* context, u32 param_3, u32 param_4) {
#ifndef TARGET_PC
libs/JSystem/src/JUtility/JUTFontData_Ascfont_fix12.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#endif
#include "global.h"
u8 const JUTResFONT_Ascfont_fix12[] ATTRIBUTE_ALIGN(32) = {
DUSK_GAME_DATA u8 const JUTResFONT_Ascfont_fix12[] ATTRIBUTE_ALIGN(32) = {
0x46, 0x4F, 0x4E, 0x54, 0x62, 0x66, 0x6E, 0x31, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x00, 0x04,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x49, 0x4E, 0x46, 0x31, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C,
libs/JSystem/src/JUtility/JUTGamePad.cpp
+27 -27
View File
@@ -8,7 +8,7 @@
#include "dusk/action_bindings.h"
#endif
u32 JUTGamePad::CRumble::sChannelMask[4] = {
DUSK_GAME_DATA u32 JUTGamePad::CRumble::sChannelMask[4] = {
PAD_CHAN0_BIT,
PAD_CHAN1_BIT,
PAD_CHAN2_BIT,
@@ -17,11 +17,11 @@ u32 JUTGamePad::CRumble::sChannelMask[4] = {
static u32 channel_mask[4] = {PAD_CHAN0_BIT, PAD_CHAN1_BIT, PAD_CHAN2_BIT, PAD_CHAN3_BIT};
JSUList<JUTGamePad> JUTGamePad::mPadList(false);
DUSK_GAME_DATA JSUList<JUTGamePad> JUTGamePad::mPadList(false);
bool JUTGamePad::mListInitialized;
DUSK_GAME_DATA bool JUTGamePad::mListInitialized;
u8 JUTGamePad::mPadAssign[4];
DUSK_GAME_DATA u8 JUTGamePad::mPadAssign[4];
JUTGamePad::JUTGamePad(EPadPort port) : mRumble(this), mLink(this) {
mPortNum = port;
@@ -53,11 +53,11 @@ void JUTGamePad::initList() {
}
}
u32 JUTGamePad::sSuppressPadReset;
DUSK_GAME_DATA u32 JUTGamePad::sSuppressPadReset;
u8 data_8074CFA4_debug;
DUSK_GAME_DATA u8 data_8074CFA4_debug;
s32 JUTGamePad::sAnalogMode;
DUSK_GAME_DATA s32 JUTGamePad::sAnalogMode;
BOOL JUTGamePad::init() {
PADSetSpec(PAD_SPEC_5);
@@ -73,19 +73,19 @@ void JUTGamePad::clear() {
#endif
}
PADStatus JUTGamePad::mPadStatus[4];
DUSK_GAME_DATA PADStatus JUTGamePad::mPadStatus[4];
JUTGamePad::CButton JUTGamePad::mPadButton[4];
DUSK_GAME_DATA JUTGamePad::CButton JUTGamePad::mPadButton[4];
JUTGamePad::CStick JUTGamePad::mPadMStick[4];
DUSK_GAME_DATA JUTGamePad::CStick JUTGamePad::mPadMStick[4];
JUTGamePad::CStick JUTGamePad::mPadSStick[4];
DUSK_GAME_DATA JUTGamePad::CStick JUTGamePad::mPadSStick[4];
JUTGamePad::EStickMode JUTGamePad::sStickMode = EStickMode1;
DUSK_GAME_DATA JUTGamePad::EStickMode JUTGamePad::sStickMode = EStickMode1;
int JUTGamePad::sClampMode = EClampStick;
DUSK_GAME_DATA int JUTGamePad::sClampMode = EClampStick;
u32 JUTGamePad::sRumbleSupported;
DUSK_GAME_DATA u32 JUTGamePad::sRumbleSupported;
u32 JUTGamePad::read() {
sRumbleSupported = PADRead(mPadStatus);
@@ -181,21 +181,21 @@ void JUTGamePad::assign() {
}
}
u8 JUTGamePad::CRumble::mStatus[4];
DUSK_GAME_DATA u8 JUTGamePad::CRumble::mStatus[4];
u32 JUTGamePad::CRumble::mEnabled;
DUSK_GAME_DATA u32 JUTGamePad::CRumble::mEnabled;
callbackFn JUTGamePad::C3ButtonReset::sCallback;
DUSK_GAME_DATA callbackFn JUTGamePad::C3ButtonReset::sCallback;
void* JUTGamePad::C3ButtonReset::sCallbackArg;
DUSK_GAME_DATA void* JUTGamePad::C3ButtonReset::sCallbackArg;
OSTime JUTGamePad::C3ButtonReset::sThreshold = (OSTime)(OS_TIMER_CLOCK / 60) * 30;
DUSK_GAME_DATA OSTime JUTGamePad::C3ButtonReset::sThreshold = (OSTime)(OS_TIMER_CLOCK / 60) * 30;
bool JUTGamePad::C3ButtonReset::sResetSwitchPushing;
DUSK_GAME_DATA bool JUTGamePad::C3ButtonReset::sResetSwitchPushing;
bool JUTGamePad::C3ButtonReset::sResetOccurred;
DUSK_GAME_DATA bool JUTGamePad::C3ButtonReset::sResetOccurred;
s32 JUTGamePad::C3ButtonReset::sResetOccurredPort;
DUSK_GAME_DATA s32 JUTGamePad::C3ButtonReset::sResetOccurredPort;
void JUTGamePad::checkResetCallback(OSTime holdTime) {
if (holdTime >= JUTGamePad::C3ButtonReset::sThreshold) {
@@ -208,13 +208,13 @@ void JUTGamePad::checkResetCallback(OSTime holdTime) {
}
}
f32 JUTGamePad::CStick::sPressPoint = 0.5f;
DUSK_GAME_DATA f32 JUTGamePad::CStick::sPressPoint = 0.5f;
f32 JUTGamePad::CStick::sReleasePoint = 0.25f;
DUSK_GAME_DATA f32 JUTGamePad::CStick::sReleasePoint = 0.25f;
u32 JUTGamePad::C3ButtonReset::sResetPattern = PAD_BUTTON_START | PAD_BUTTON_X | PAD_BUTTON_B;
DUSK_GAME_DATA u32 JUTGamePad::C3ButtonReset::sResetPattern = PAD_BUTTON_START | PAD_BUTTON_X | PAD_BUTTON_B;
u32 JUTGamePad::C3ButtonReset::sResetMaskPattern = 0x0000FFFF;
DUSK_GAME_DATA u32 JUTGamePad::C3ButtonReset::sResetMaskPattern = 0x0000FFFF;
void JUTGamePad::update() {
if (mPortNum != EPortInvalid) {
@@ -269,7 +269,7 @@ void JUTGamePad::update() {
}
}
JSUList<JUTGamePadLongPress> JUTGamePadLongPress::sPatternList(false);
DUSK_GAME_DATA JSUList<JUTGamePadLongPress> JUTGamePadLongPress::sPatternList(false);
void JUTGamePad::checkResetSwitch() {
if (!JUTGamePad::C3ButtonReset::sResetOccurred) {
libs/JSystem/src/JUtility/JUTGraphFifo.cpp
+2 -2
View File
@@ -6,7 +6,7 @@
static bool data_804514B8;
JUTGraphFifo* JUTGraphFifo::sCurrentFifo;
DUSK_GAME_DATA JUTGraphFifo* JUTGraphFifo::sCurrentFifo;
JUTGraphFifo::JUTGraphFifo(u32 size) {
mSize = ROUND(size, 0x20);
@@ -26,7 +26,7 @@ JUTGraphFifo::JUTGraphFifo(u32 size) {
}
}
bool JUTGraphFifo::mGpStatus[5];
DUSK_GAME_DATA bool JUTGraphFifo::mGpStatus[5];
JUTGraphFifo::~JUTGraphFifo() {
sCurrentFifo->save();
libs/JSystem/src/JUtility/JUTProcBar.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ JUTProcBar::JUTProcBar() {
mWatchHeap = NULL;
}
JUTProcBar* JUTProcBar::sManager;
DUSK_GAME_DATA JUTProcBar* JUTProcBar::sManager;
JUTProcBar::~JUTProcBar() {
sManager = NULL;
libs/JSystem/src/JUtility/JUTResFont.cpp
+1 -1
View File
@@ -143,7 +143,7 @@ void JUTResFont::countBlock() {
}
}
IsLeadByte_func const JUTResFont::saoAboutEncoding_[3] = {
DUSK_GAME_DATA IsLeadByte_func const JUTResFont::saoAboutEncoding_[3] = {
JUTFont::isLeadByte_1Byte,
JUTFont::isLeadByte_2Byte,
JUTFont::isLeadByte_ShiftJIS,
libs/JSystem/src/JUtility/JUTVideo.cpp
+3 -3
View File
@@ -8,11 +8,11 @@
#include "JSystem/JKernel/JKRHeap.h"
JUTVideo* JUTVideo::sManager;
DUSK_GAME_DATA JUTVideo* JUTVideo::sManager;
OSTick JUTVideo::sVideoLastTick;
DUSK_GAME_DATA OSTick JUTVideo::sVideoLastTick;
OSTick JUTVideo::sVideoInterval;
DUSK_GAME_DATA OSTick JUTVideo::sVideoInterval;
static bool data_80451544;
libs/JSystem/src/JUtility/JUTXfb.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ JUTXfb::JUTXfb(GXRenderModeObj const* pObj, JKRHeap* pHeap, JUTXfb::EXfbNumber x
}
}
JUTXfb* JUTXfb::sManager;
DUSK_GAME_DATA JUTXfb* JUTXfb::sManager;
JUTXfb::~JUTXfb() {
for (int i = 0; i < 3; i++) {