mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-27 14:39:20 -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/J3DGraphBase/J3DDrawBuffer.cpp
+3 -3
View File
@@ -205,17 +205,17 @@ int J3DDrawBuffer::entryImm(J3DPacket* pPacket, u16 index) {
return 1;
}
J3DDrawBuffer::sortFunc J3DDrawBuffer::sortFuncTable[6] = {
DUSK_GAME_DATA J3DDrawBuffer::sortFunc J3DDrawBuffer::sortFuncTable[6] = {
&J3DDrawBuffer::entryMatSort, &J3DDrawBuffer::entryMatAnmSort, &J3DDrawBuffer::entryZSort,
&J3DDrawBuffer::entryModelSort, &J3DDrawBuffer::entryInvalidSort, &J3DDrawBuffer::entryNonSort,
};
J3DDrawBuffer::drawFunc J3DDrawBuffer::drawFuncTable[2] = {
DUSK_GAME_DATA J3DDrawBuffer::drawFunc J3DDrawBuffer::drawFuncTable[2] = {
&J3DDrawBuffer::drawHead,
&J3DDrawBuffer::drawTail,
};
int J3DDrawBuffer::entryNum;
DUSK_GAME_DATA int J3DDrawBuffer::entryNum;
void J3DDrawBuffer::draw() const {
J3D_ASSERT_RANGE(411, mDrawMode < J3DDrawBufDrawMode_MAX);
libs/JSystem/src/J3DGraphBase/J3DPacket.cpp
+2 -2
View File
@@ -68,9 +68,9 @@ void J3DDisplayListObj::callDL() const {
GXCallDisplayList(mpDisplayList[0], mSize);
}
GDLObj J3DDisplayListObj::sGDLObj;
DUSK_GAME_DATA GDLObj J3DDisplayListObj::sGDLObj;
s32 J3DDisplayListObj::sInterruptFlag;
DUSK_GAME_DATA s32 J3DDisplayListObj::sInterruptFlag;
void J3DDisplayListObj::beginDL() {
swapBuffer();
libs/JSystem/src/J3DGraphBase/J3DShape.cpp
+2 -2
View File
@@ -289,7 +289,7 @@ void J3DShape::makeVcdVatCmd() {
OSRestoreInterrupts(sInterruptFlag);
}
void* J3DShape::sOldVcdVatCmd;
DUSK_GAME_DATA void* J3DShape::sOldVcdVatCmd;
void J3DShape::loadCurrentMtx() const {
mCurrentMtx.load();
@@ -304,7 +304,7 @@ void J3DShape::loadPreDrawSetting() const {
mCurrentMtx.load();
}
bool J3DShape::sEnvelopeFlag;
DUSK_GAME_DATA bool J3DShape::sEnvelopeFlag;
void J3DShape::setArrayAndBindPipeline() const {
J3DShapeMtx::setCurrentPipeline((mFlags & 0x1C) >> 2);
libs/JSystem/src/J3DGraphBase/J3DShapeMtx.cpp
+12 -12
View File
@@ -8,7 +8,7 @@
#include "JSystem/J3DGraphBase/J3DTexture.h"
#include "dusk/frame_interpolation.h"
u16 J3DShapeMtx::sMtxLoadCache[10];
DUSK_GAME_DATA u16 J3DShapeMtx::sMtxLoadCache[10];
#ifdef TARGET_PC
static void J3DFrameInterpConcat(MtxP lhs, MtxP rhs, Mtx out) {
@@ -54,42 +54,42 @@ void J3DShapeMtx::loadMtxIndx_PNCPU(int slot, u16 indx) const {
J3DFifoLoadNrmMtxImm(*j3dSys.getShapePacket()->getBaseMtxPtr(), slot * 3);
}
J3DShapeMtx_LoadFunc J3DShapeMtx::sMtxLoadPipeline[4] = {
DUSK_GAME_DATA J3DShapeMtx_LoadFunc J3DShapeMtx::sMtxLoadPipeline[4] = {
&J3DShapeMtx::loadMtxIndx_PNGP,
&J3DShapeMtx::loadMtxIndx_PCPU,
&J3DShapeMtx::loadMtxIndx_NCPU,
&J3DShapeMtx::loadMtxIndx_PNCPU,
};
J3DShapeMtxConcatView_LoadFunc J3DShapeMtxConcatView::sMtxLoadPipeline[4] = {
DUSK_GAME_DATA J3DShapeMtxConcatView_LoadFunc J3DShapeMtxConcatView::sMtxLoadPipeline[4] = {
&J3DShapeMtxConcatView::loadMtxConcatView_PNGP,
&J3DShapeMtxConcatView::loadMtxConcatView_PCPU,
&J3DShapeMtxConcatView::loadMtxConcatView_NCPU,
&J3DShapeMtxConcatView::loadMtxConcatView_PNCPU,
};
J3DShapeMtxConcatView_LoadFunc J3DShapeMtxConcatView::sMtxLoadLODPipeline[4] = {
DUSK_GAME_DATA J3DShapeMtxConcatView_LoadFunc J3DShapeMtxConcatView::sMtxLoadLODPipeline[4] = {
&J3DShapeMtxConcatView::loadMtxConcatView_PNGP_LOD,
&J3DShapeMtxConcatView::loadMtxConcatView_PCPU,
&J3DShapeMtxConcatView::loadMtxConcatView_NCPU,
&J3DShapeMtxConcatView::loadMtxConcatView_PNCPU,
};
u32 J3DShapeMtx::sCurrentPipeline;
DUSK_GAME_DATA u32 J3DShapeMtx::sCurrentPipeline;
u8* J3DShapeMtx::sCurrentScaleFlag;
DUSK_GAME_DATA u8* J3DShapeMtx::sCurrentScaleFlag;
bool J3DShapeMtx::sNBTFlag;
DUSK_GAME_DATA bool J3DShapeMtx::sNBTFlag;
bool J3DShapeMtx::sLODFlag;
DUSK_GAME_DATA bool J3DShapeMtx::sLODFlag;
u32 J3DShapeMtx::sTexMtxLoadType;
DUSK_GAME_DATA u32 J3DShapeMtx::sTexMtxLoadType;
MtxP J3DShapeMtxConcatView::sMtxPtrTbl[2];
DUSK_GAME_DATA MtxP J3DShapeMtxConcatView::sMtxPtrTbl[2];
J3DTexGenBlock* J3DDifferedTexMtx::sTexGenBlock;
DUSK_GAME_DATA J3DTexGenBlock* J3DDifferedTexMtx::sTexGenBlock;
J3DTexMtxObj* J3DDifferedTexMtx::sTexMtxObj;
DUSK_GAME_DATA J3DTexMtxObj* J3DDifferedTexMtx::sTexMtxObj;
void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) {
static Mtx qMtx = {
libs/JSystem/src/J3DGraphBase/J3DSys.cpp
+6 -6
View File
@@ -8,15 +8,15 @@
#include "global.h"
#include "tracy/Tracy.hpp"
J3DSys j3dSys;
DUSK_GAME_DATA J3DSys j3dSys;
Mtx J3DSys::mCurrentMtx;
DUSK_GAME_DATA Mtx J3DSys::mCurrentMtx;
Vec J3DSys::mCurrentS;
DUSK_GAME_DATA Vec J3DSys::mCurrentS;
Vec J3DSys::mParentS;
DUSK_GAME_DATA Vec J3DSys::mParentS;
J3DTexCoordScaleInfo J3DSys::sTexCoordScaleTable[8];
DUSK_GAME_DATA J3DTexCoordScaleInfo J3DSys::sTexCoordScaleTable[8];
#if TARGET_PC // Original game bug, array is too small.
static u8 NullTexData[0x20] ATTRIBUTE_ALIGN(32) = {0};
@@ -35,7 +35,7 @@ static Mtx23 IndMtx = {
0.0f, 0.5f, 0.0f,
};
u32 j3dDefaultViewNo;
DUSK_GAME_DATA u32 j3dDefaultViewNo;
static GXColor ColorBlack = {0x00, 0x00, 0x00, 0x00};
libs/JSystem/src/J3DGraphBase/J3DTevs.cpp
+26 -26
View File
@@ -315,7 +315,7 @@ void loadNBTScale(J3DNBTScale& NBTScale) {
}
}
const J3DLightInfo j3dDefaultLightInfo = {
DUSK_GAME_DATA const J3DLightInfo j3dDefaultLightInfo = {
0.0f, 0.0f, 0.0f,
0.0f, -1.0f, 0.0f,
0xff, 0xff, 0xff, 0xff,
@@ -323,14 +323,14 @@ const J3DLightInfo j3dDefaultLightInfo = {
1.0f, 0.0f, 0.0f,
};
J3DTexCoordInfo const j3dDefaultTexCoordInfo[8] = {
DUSK_GAME_DATA J3DTexCoordInfo const j3dDefaultTexCoordInfo[8] = {
{GX_MTX2x4, GX_TG_TEX0, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX1, GX_IDENTITY, 0},
{GX_MTX2x4, GX_TG_TEX2, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX3, GX_IDENTITY, 0},
{GX_MTX2x4, GX_TG_TEX4, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX5, GX_IDENTITY, 0},
{GX_MTX2x4, GX_TG_TEX6, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX7, GX_IDENTITY, 0},
};
J3DTexMtxInfo const j3dDefaultTexMtxInfo = {
DUSK_GAME_DATA J3DTexMtxInfo const j3dDefaultTexMtxInfo = {
0x01,
0x00,
0xFF,
@@ -341,27 +341,27 @@ J3DTexMtxInfo const j3dDefaultTexMtxInfo = {
1.0f},
};
J3DIndTexMtxInfo const j3dDefaultIndTexMtxInfo = {
DUSK_GAME_DATA J3DIndTexMtxInfo const j3dDefaultIndTexMtxInfo = {
0.5f, 0.0f, 0.0f,
0.0f, 0.5f, 0.0f,
1
};
J3DTevStageInfo const j3dDefaultTevStageInfo = {
DUSK_GAME_DATA J3DTevStageInfo const j3dDefaultTevStageInfo = {
0x04, 0x0A, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
0x05, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
};
J3DIndTevStageInfo const j3dDefaultIndTevStageInfo = {
DUSK_GAME_DATA J3DIndTevStageInfo const j3dDefaultIndTevStageInfo = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
J3DFogInfo const j3dDefaultFogInfo = {
DUSK_GAME_DATA J3DFogInfo const j3dDefaultFogInfo = {
0x00, 0x00, 0x0140, 0.0f, 0.0f, 0.1f, 10000.0f, 0xFF, 0xFF, 0xFF, 0x00,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
};
J3DNBTScaleInfo const j3dDefaultNBTScaleInfo = {
DUSK_GAME_DATA J3DNBTScaleInfo const j3dDefaultNBTScaleInfo = {
#if TARGET_PC
0x00, {1.0f, 1.0f, 1.0f},
#else
@@ -399,9 +399,9 @@ void makeTexCoordTable() {
}
}
u8 j3dTevSwapTableTable[1024];
DUSK_GAME_DATA u8 j3dTevSwapTableTable[1024];
u8 j3dAlphaCmpTable[768];
DUSK_GAME_DATA u8 j3dAlphaCmpTable[768];
void makeAlphaCmpTable() {
u8* table = j3dAlphaCmpTable;
@@ -417,7 +417,7 @@ void makeAlphaCmpTable() {
}
}
u8 j3dZModeTable[96];
DUSK_GAME_DATA u8 j3dZModeTable[96];
void makeZModeTable() {
u8* table = j3dZModeTable;
@@ -495,44 +495,44 @@ static void J3DGDLoadPostTexMtxImm(f32 (*param_1)[4], u32 param_2) {
J3DGDWrite_f32(param_1[2][3]);
}
const GXColor j3dDefaultColInfo = {0xFF, 0xFF, 0xFF, 0xFF};
DUSK_GAME_DATA const GXColor j3dDefaultColInfo = {0xFF, 0xFF, 0xFF, 0xFF};
const GXColor j3dDefaultAmbInfo = {0x32, 0x32, 0x32, 0x32};
DUSK_GAME_DATA const GXColor j3dDefaultAmbInfo = {0x32, 0x32, 0x32, 0x32};
const u8 j3dDefaultNumChans = 1;
DUSK_GAME_DATA const u8 j3dDefaultNumChans = 1;
const J3DTevOrderInfo j3dDefaultTevOrderInfoNull = {0xFF, 0xFF, 0xFF, 0x00};
DUSK_GAME_DATA const J3DTevOrderInfo j3dDefaultTevOrderInfoNull = {0xFF, 0xFF, 0xFF, 0x00};
const J3DIndTexOrderInfo j3dDefaultIndTexOrderNull = {0xFF, 0xFF, 0x00, 0x00};
DUSK_GAME_DATA const J3DIndTexOrderInfo j3dDefaultIndTexOrderNull = {0xFF, 0xFF, 0x00, 0x00};
const GXColorS10 j3dDefaultTevColor = {0xFF, 0xFF, 0xFF, 0xFF};
DUSK_GAME_DATA const GXColorS10 j3dDefaultTevColor = {0xFF, 0xFF, 0xFF, 0xFF};
const J3DIndTexCoordScaleInfo j3dDefaultIndTexCoordScaleInfo = {
DUSK_GAME_DATA const J3DIndTexCoordScaleInfo j3dDefaultIndTexCoordScaleInfo = {
0x00,
0x00,
0x00,
0x00,
};
const GXColor j3dDefaultTevKColor = {0xFF, 0xFF, 0xFF, 0xFF};
DUSK_GAME_DATA const GXColor j3dDefaultTevKColor = {0xFF, 0xFF, 0xFF, 0xFF};
J3DTevSwapModeInfo const j3dDefaultTevSwapMode = {
DUSK_GAME_DATA J3DTevSwapModeInfo const j3dDefaultTevSwapMode = {
0x00,
0x00,
0x00,
0x00,
};
const J3DTevSwapModeTableInfo j3dDefaultTevSwapModeTable = {0x00, 0x01, 0x02, 0x03};
DUSK_GAME_DATA const J3DTevSwapModeTableInfo j3dDefaultTevSwapModeTable = {0x00, 0x01, 0x02, 0x03};
const J3DBlendInfo j3dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP};
DUSK_GAME_DATA const J3DBlendInfo j3dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP};
const J3DColorChanInfo j3dDefaultColorChanInfo = {
DUSK_GAME_DATA const J3DColorChanInfo j3dDefaultColorChanInfo = {
0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0xFF, 0xFF,
};
const u8 j3dDefaultTevSwapTableID = 0x1B;
DUSK_GAME_DATA const u8 j3dDefaultTevSwapTableID = 0x1B;
const u16 j3dDefaultAlphaCmpID = 0x00E7;
DUSK_GAME_DATA const u16 j3dDefaultAlphaCmpID = 0x00E7;
const u16 j3dDefaultZModeID = 0x0017;
DUSK_GAME_DATA const u16 j3dDefaultZModeID = 0x0017;
libs/JSystem/src/J3DGraphBase/J3DTransform.cpp
+4 -4
View File
@@ -74,12 +74,12 @@ void J3DCalcBBoardMtx(__REGISTER Mtx mtx) {
mtx[2][2] = z;
}
J3DTransformInfo const j3dDefaultTransformInfo = {
DUSK_GAME_DATA J3DTransformInfo const j3dDefaultTransformInfo = {
{1.0f, 1.0f, 1.0f}, {0, 0, 0}, {0.0f, 0.0f, 0.0f}};
Vec const j3dDefaultScale = {1.0f, 1.0f, 1.0f};
DUSK_GAME_DATA Vec const j3dDefaultScale = {1.0f, 1.0f, 1.0f};
Mtx const j3dDefaultMtx = {
DUSK_GAME_DATA Mtx const j3dDefaultMtx = {
{1.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 1.0f, 0.0f}};
void J3DCalcYBBoardMtx(Mtx mtx) {
@@ -610,7 +610,7 @@ void J3DPSMtxArrayConcat(Mtx mA, Mtx mB, Mtx mAB, u32 count) {
}
#endif // clang-format on
f32 const PSMulUnit01[] = {
DUSK_GAME_DATA f32 const PSMulUnit01[] = {
0.0f,
-1.0f,
};