mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-29 15:23:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/TwilitRealm/dusk into randomizer

Browse Source
This commit is contained in:
gymnast86
2026-07-14 15:33:40 -07:00
parent a4c619ad58 eed14acdc6
commit fa34335a09
844 changed files with 4843 additions and 4842 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/src/J2DGraph/J2DPane.cpp
+1 -1
View File
@@ -424,7 +424,7 @@ void J2DPane::resize(f32 x, f32 y) {
place(box);
}
JGeometry::TBox2<f32> J2DPane::static_mBounds(0, 0, 0, 0);
DUSK_GAME_DATA JGeometry::TBox2<f32> J2DPane::static_mBounds(0, 0, 0, 0);
JGeometry::TBox2<f32>& J2DPane::getBounds() {
static_mBounds = mBounds;
libs/JSystem/src/J2DGraph/J2DPrint.cpp
+2 -2
View File
@@ -7,11 +7,11 @@
#include <cstdlib>
#include <cstring>
char* J2DPrint::mStrBuff;
DUSK_GAME_DATA char* J2DPrint::mStrBuff;
static bool sStrBufInitialized;
size_t J2DPrint::mStrBuffSize;
DUSK_GAME_DATA size_t J2DPrint::mStrBuffSize;
static u8 data_8045158C[4];
libs/JSystem/src/J2DGraph/J2DScreen.cpp
+1 -1
View File
@@ -408,7 +408,7 @@ bool J2DScreen::isUsed(ResFONT const* p_font) {
return J2DPane::isUsed(p_font);
}
J2DDataManage* J2DScreen::mDataManage;
DUSK_GAME_DATA J2DDataManage* J2DScreen::mDataManage;
void* J2DScreen::getNameResource(char const* resName) {
void* res = JKRGetNameResource(resName, NULL);
libs/JSystem/src/J2DGraph/J2DTevs.cpp
+18 -18
View File
@@ -117,60 +117,60 @@ static void dummyVirtual(J2DMaterial* material) {
block->getTevSwapModeTable(0);
}
J2DTexCoordInfo const j2dDefaultTexCoordInfo[8] = {
DUSK_GAME_DATA J2DTexCoordInfo const j2dDefaultTexCoordInfo[8] = {
{GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY, 0}, {GX_TG_MTX2x4, GX_TG_TEX1, GX_IDENTITY, 0},
{GX_TG_MTX2x4, GX_TG_TEX2, GX_IDENTITY, 0}, {GX_TG_MTX2x4, GX_TG_TEX3, GX_IDENTITY, 0},
{GX_TG_MTX2x4, GX_TG_TEX4, GX_IDENTITY, 0}, {GX_TG_MTX2x4, GX_TG_TEX5, GX_IDENTITY, 0},
{GX_TG_MTX2x4, GX_TG_TEX6, GX_IDENTITY, 0}, {GX_TG_MTX2x4, GX_TG_TEX7, GX_IDENTITY, 0},
};
J2DTexMtxInfo const j2dDefaultTexMtxInfo = {1, 1, 255, 255, {0.5f, 0.5f,
DUSK_GAME_DATA J2DTexMtxInfo const j2dDefaultTexMtxInfo = {1, 1, 255, 255, {0.5f, 0.5f,
0.0f}, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f};
J2DIndTexMtxInfo const j2dDefaultIndTexMtxInfo = {{0.5f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f}, 1};
DUSK_GAME_DATA J2DIndTexMtxInfo const j2dDefaultIndTexMtxInfo = {{0.5f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f}, 1};
J2DTevStageInfo const j2dDefaultTevStageInfo = {
DUSK_GAME_DATA J2DTevStageInfo const j2dDefaultTevStageInfo = {
4, GX_CC_RASC, GX_CC_ZERO, GX_CC_ZERO, GX_CC_CPREV, GX_TEV_ADD,
GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV, GX_CA_RASA, GX_CA_ZERO,
GX_CA_ZERO, GX_CA_APREV, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1,
GX_TEVPREV};
const J2DIndTevStageInfo j2dDefaultIndTevStageInfo = {
DUSK_GAME_DATA const J2DIndTevStageInfo j2dDefaultIndTevStageInfo = {
GX_INDTEXSTAGE0, GX_ITB_NONE, GX_ITB_NONE, GX_ITM_OFF, GX_ITW_OFF,
GX_ITW_OFF, 0, 0, GX_ITBA_OFF,
};
const GXColor j2dDefaultColInfo = {255, 255, 255, 255};
DUSK_GAME_DATA const GXColor j2dDefaultColInfo = {255, 255, 255, 255};
const J2DTevOrderInfo j2dDefaultTevOrderInfoNull = {
DUSK_GAME_DATA const J2DTevOrderInfo j2dDefaultTevOrderInfoNull = {
GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR_NULL, 0};
const J2DIndTexOrderInfo j2dDefaultIndTexOrderNull = {
DUSK_GAME_DATA const J2DIndTexOrderInfo j2dDefaultIndTexOrderNull = {
GX_TEXCOORD_NULL,
GX_TEXMAP_NULL,
};
const GXColorS10 j2dDefaultTevColor = {255, 255, 255, 255};
DUSK_GAME_DATA const GXColorS10 j2dDefaultTevColor = {255, 255, 255, 255};
const J2DIndTexCoordScaleInfo j2dDefaultIndTexCoordScaleInfo = {
DUSK_GAME_DATA const J2DIndTexCoordScaleInfo j2dDefaultIndTexCoordScaleInfo = {
GX_ITS_1,
GX_ITS_1,
};
const GXColor j2dDefaultTevKColor = {255, 255, 255, 255};
DUSK_GAME_DATA const GXColor j2dDefaultTevKColor = {255, 255, 255, 255};
const J2DTevSwapModeInfo j2dDefaultTevSwapMode = {GX_TEV_SWAP0, GX_TEV_SWAP0, 0, 0};
DUSK_GAME_DATA const J2DTevSwapModeInfo j2dDefaultTevSwapMode = {GX_TEV_SWAP0, GX_TEV_SWAP0, 0, 0};
const J2DTevSwapModeTableInfo j2dDefaultTevSwapModeTable = {
DUSK_GAME_DATA const J2DTevSwapModeTableInfo j2dDefaultTevSwapModeTable = {
GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA};
const J2DBlendInfo j2dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA,
DUSK_GAME_DATA const J2DBlendInfo j2dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA,
GX_LO_NOOP};
const u8 j2dDefaultPEBlockDither = 0;
DUSK_GAME_DATA const u8 j2dDefaultPEBlockDither = 0;
const J2DColorChanInfo j2dDefaultColorChanInfo = {0, 3, 0, 0};
DUSK_GAME_DATA const J2DColorChanInfo j2dDefaultColorChanInfo = {0, 3, 0, 0};
const u8 j2dDefaultTevSwapTableID = 0x1B;
DUSK_GAME_DATA const u8 j2dDefaultTevSwapTableID = 0x1B;
const u16 j2dDefaultAlphaCmp = 0x00E7;
DUSK_GAME_DATA const u16 j2dDefaultAlphaCmp = 0x00E7;
libs/JSystem/src/J3DGraphAnimator/J3DJoint.cpp
+3 -3
View File
@@ -22,9 +22,9 @@ void J3DMtxCalcJ3DSysInitMaya::init(Vec const& scale, Mtx const& mtx) {
JMAMTXApplyScale(mtx, J3DSys::mCurrentMtx, scale.x, scale.y, scale.z);
}
J3DMtxBuffer* J3DMtxCalc::mMtxBuffer;
DUSK_GAME_DATA J3DMtxBuffer* J3DMtxCalc::mMtxBuffer;
J3DJoint* J3DMtxCalc::mJoint;
DUSK_GAME_DATA J3DJoint* J3DMtxCalc::mJoint;
void J3DMtxCalcCalcTransformBasic::calcTransform(J3DTransformInfo const& transInfo) {
J3DJoint* joint = J3DMtxCalc::getJoint();
@@ -189,7 +189,7 @@ void J3DJoint::entryIn() {
}
}
J3DMtxCalc* J3DJoint::mCurrentMtxCalc;
DUSK_GAME_DATA J3DMtxCalc* J3DJoint::mCurrentMtxCalc;
void J3DJoint::recursiveCalc() {
J3DMtxCalc* prevMtxCalc = NULL;
libs/JSystem/src/J3DGraphAnimator/J3DMtxBuffer.cpp
+4 -4
View File
@@ -6,13 +6,13 @@
#include "JSystem/J3DGraphLoader/J3DModelLoader.h"
#include "JSystem/JKernel/JKRHeap.h"
Mtx J3DMtxBuffer::sNoUseDrawMtx;
DUSK_GAME_DATA Mtx J3DMtxBuffer::sNoUseDrawMtx;
Mtx33 J3DMtxBuffer::sNoUseNrmMtx;
DUSK_GAME_DATA Mtx33 J3DMtxBuffer::sNoUseNrmMtx;
Mtx* J3DMtxBuffer::sNoUseDrawMtxPtr = &J3DMtxBuffer::sNoUseDrawMtx;
DUSK_GAME_DATA Mtx* J3DMtxBuffer::sNoUseDrawMtxPtr = &J3DMtxBuffer::sNoUseDrawMtx;
Mtx33* J3DMtxBuffer::sNoUseNrmMtxPtr = &J3DMtxBuffer::sNoUseNrmMtx;
DUSK_GAME_DATA Mtx33* J3DMtxBuffer::sNoUseNrmMtxPtr = &J3DMtxBuffer::sNoUseNrmMtx;
// force .sdata2 order
static f32 dummy1() {
libs/JSystem/src/J3DGraphAnimator/J3DSkinDeform.cpp
+3 -3
View File
@@ -79,9 +79,9 @@ J3DSkinDeform::J3DSkinDeform() {
mSkinNList = NULL;
}
BE(u16)* J3DSkinDeform::sWorkArea_WEvlpMixMtx[1024];
DUSK_GAME_DATA BE(u16)* J3DSkinDeform::sWorkArea_WEvlpMixMtx[1024];
BE(f32)* J3DSkinDeform::sWorkArea_WEvlpMixWeight[1024];
DUSK_GAME_DATA BE(f32)* J3DSkinDeform::sWorkArea_WEvlpMixWeight[1024];
void J3DSkinDeform::initSkinInfo(J3DModelData* pModelData) {
J3D_ASSERT_NULLPTR(322, pModelData != NULL);
@@ -194,7 +194,7 @@ void J3DSkinDeform::initSkinInfo(J3DModelData* pModelData) {
}
}
u16 J3DSkinDeform::sWorkArea_MtxReg[1024];
DUSK_GAME_DATA u16 J3DSkinDeform::sWorkArea_MtxReg[1024];
int J3DSkinDeform::initMtxIndexArray(J3DModelData* pModelData) {
J3D_ASSERT_NULLPTR(507, pModelData != NULL);
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,
};
libs/JSystem/src/JAHostIO/JAHVirtualNode.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include "dusk/string.hpp"
u32 JAHVirtualNode::smVirNodeNum;
DUSK_GAME_DATA u32 JAHVirtualNode::smVirNodeNum;
void JAHVirtualNode::virtualMessage(JAHControl& control) {
message(control);
libs/JSystem/src/JAHostIO/JAHioMessage.cpp
+11 -11
View File
@@ -5,17 +5,17 @@
#include "JSystem/JAHostIO/JAHioUtil.h"
#include "JSystem/JHostIO/JORMContext.h"
u16 JAHControl::smButtonWidth[] = {20, 50, 100, 150, 300, 600};
u16 JAHControl::smCommentWidth[] = {20, 50, 100, 200, 400, 800};
u16 JAHControl::smComboWidth[] = {50, 100, 150, 200, 300, 600};
u16 JAHControl::smYTop = 5;
u16 JAHControl::smXLeft = 5;
u16 JAHControl::smIndentSize = 30;
u16 JAHControl::smLineHeight = 23;
u16 JAHControl::smContWidth = 450;
u16 JAHControl::smIntX = 2;
u16 JAHControl::smIntY = 5;
u16 JAHControl::smNameWidth = 150;
DUSK_GAME_DATA u16 JAHControl::smButtonWidth[] = {20, 50, 100, 150, 300, 600};
DUSK_GAME_DATA u16 JAHControl::smCommentWidth[] = {20, 50, 100, 200, 400, 800};
DUSK_GAME_DATA u16 JAHControl::smComboWidth[] = {50, 100, 150, 200, 300, 600};
DUSK_GAME_DATA u16 JAHControl::smYTop = 5;
DUSK_GAME_DATA u16 JAHControl::smXLeft = 5;
DUSK_GAME_DATA u16 JAHControl::smIndentSize = 30;
DUSK_GAME_DATA u16 JAHControl::smLineHeight = 23;
DUSK_GAME_DATA u16 JAHControl::smContWidth = 450;
DUSK_GAME_DATA u16 JAHControl::smIntX = 2;
DUSK_GAME_DATA u16 JAHControl::smIntY = 5;
DUSK_GAME_DATA u16 JAHControl::smNameWidth = 150;
void JAHControl::returnY(u16 param_1) {
mY += u16(smIntY + smLineHeight * param_1);
libs/JSystem/src/JAHostIO/JAHioMgr.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "JSystem/JHostIO/JORServer.h"
template <>
JAHioMgr* JAHSingletonBase<JAHioMgr>::sInstance = NULL;
DUSK_GAME_DATA JAHioMgr* JAHSingletonBase<JAHioMgr>::sInstance = NULL;
JAHioMgr::JAHioMgr() : field_0x4(0), field_0x8(0) {}
libs/JSystem/src/JAHostIO/JAHioNode.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include "JSystem/JHostIO/JORServer.h"
#include "dusk/string.hpp"
JAHioNode* JAHioNode::smCurrentNode;
DUSK_GAME_DATA JAHioNode* JAHioNode::smCurrentNode;
JAHioNode::JAHioNode(const char* name) : mTree(this) {
mLastChild = NULL;
libs/JSystem/src/JAHostIO/JAHioUtil.cpp
+3 -3
View File
@@ -6,10 +6,10 @@
#include "JSystem/JAHostIO/JAHioUtil.h"
#include "JSystem/JHostIO/JORFile.h"
char JAHioUtil::mStringBuffer[256];
DUSK_GAME_DATA char JAHioUtil::mStringBuffer[256];
JAHioNode* JAHUpdate::spNode;
JORMContext* JAHUpdate::spMc;
DUSK_GAME_DATA JAHioNode* JAHUpdate::spNode;
DUSK_GAME_DATA JORMContext* JAHUpdate::spMc;
static char* dummy(JORDir* dir) {
return std::strrchr(dir->getFilename(), '\n');
libs/JSystem/src/JAudio2/JASAiCtrl.cpp
+16 -16
View File
@@ -20,33 +20,33 @@
#include "tracy/Tracy.hpp"
s16* JASDriver::sDmaDacBuffer[3];
DUSK_GAME_DATA s16* JASDriver::sDmaDacBuffer[3];
static u8 data_804507A8 = 3;
s16** JASDriver::sDspDacBuffer;
DUSK_GAME_DATA s16** JASDriver::sDspDacBuffer;
s32 JASDriver::sDspDacWriteBuffer;
DUSK_GAME_DATA s32 JASDriver::sDspDacWriteBuffer;
s32 JASDriver::sDspDacReadBuffer;
DUSK_GAME_DATA s32 JASDriver::sDspDacReadBuffer;
s32 JASDriver::sDspStatus;
DUSK_GAME_DATA s32 JASDriver::sDspStatus;
JASDriver::DSPBufCallback JASDriver::sDspDacCallback;
DUSK_GAME_DATA JASDriver::DSPBufCallback JASDriver::sDspDacCallback;
s16* JASDriver::lastRspMadep;
DUSK_GAME_DATA s16* JASDriver::lastRspMadep;
void (*JASDriver::dacCallbackFunc)(s16*, u32);
DUSK_GAME_DATA void (*JASDriver::dacCallbackFunc)(s16*, u32);
JASDriver::MixCallback JASDriver::extMixCallback;
DUSK_GAME_DATA JASDriver::MixCallback JASDriver::extMixCallback;
u32 JASDriver::sOutputRate;
DUSK_GAME_DATA u32 JASDriver::sOutputRate;
JASMixMode JASDriver::sMixMode = MIX_MODE_EXTRA;
DUSK_GAME_DATA JASMixMode JASDriver::sMixMode = MIX_MODE_EXTRA;
f32 JASDriver::sDacRate = 32028.5f;
DUSK_GAME_DATA f32 JASDriver::sDacRate = 32028.5f;
u32 JASDriver::sSubFrames = 0x00000007;
DUSK_GAME_DATA u32 JASDriver::sSubFrames = 0x00000007;
void JASDriver::initAI(void (*param_0)(void)) {
setOutputRate(OUTPUT_RATE_0);
@@ -114,14 +114,14 @@ void JASDriver::setOutputRate(JASOutputRate param_0) {
#endif
}
const JASDriver::MixFunc JASDriver::sMixFuncs[4] = {
DUSK_GAME_DATA const JASDriver::MixFunc JASDriver::sMixFuncs[4] = {
mixMonoTrack,
mixMonoTrackWide,
mixExtraTrack,
mixInterleaveTrack,
};
u32 JASDriver::sSubFrameCounter;
DUSK_GAME_DATA u32 JASDriver::sSubFrameCounter;
void JASDriver::updateDac() {
static u32 dacp = 0;
@@ -227,7 +227,7 @@ void JASDriver::readDspBuffer(s16* param_0, u32 param_1) {
JASCalc::imixcopy(endDacBuffer, dacBuffer, param_0, param_1);
}
u32 sDspUpCount;
DUSK_GAME_DATA u32 sDspUpCount;
void JASDriver::finishDSPFrame() {
static u32 waitcount;
libs/JSystem/src/JAudio2/JASAramStream.cpp
+6 -6
View File
@@ -12,16 +12,16 @@
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "JSystem/JSupport/JSupport.h"
JASTaskThread* JASAramStream::sLoadThread;
DUSK_GAME_DATA JASTaskThread* JASAramStream::sLoadThread;
u8* JASAramStream::sReadBuffer;
DUSK_GAME_DATA u8* JASAramStream::sReadBuffer;
u32 JASAramStream::sBlockSize;
DUSK_GAME_DATA u32 JASAramStream::sBlockSize;
u32 JASAramStream::sChannelMax;
DUSK_GAME_DATA u32 JASAramStream::sChannelMax;
bool dvdHasErrored;
bool hasErrored;
DUSK_GAME_DATA bool dvdHasErrored;
DUSK_GAME_DATA bool hasErrored;
#define PAUSE_REQUESTED 1
#define PAUSE_DVD_ERROR 2
libs/JSystem/src/JAudio2/JASAudioThread.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ void JASAudioThread::stop() {
jamMessageBlock((void*)2);
}
volatile int JASAudioThread::snIntCount;
DUSK_GAME_DATA volatile int JASAudioThread::snIntCount;
class Lock {
public:
libs/JSystem/src/JAudio2/JASBNKParser.cpp
+1 -1
View File
@@ -13,7 +13,7 @@ JASBank* JASBNKParser::createBank(void const* stream, JKRHeap* heap) {
return createBasicBank(stream, heap);
}
u32 JASBNKParser::sUsedHeapSize;
DUSK_GAME_DATA u32 JASBNKParser::sUsedHeapSize;
JASBasicBank* JASBNKParser::createBasicBank(void const* stream, JKRHeap* heap) {
if (heap == NULL) {
libs/JSystem/src/JAudio2/JASBasicWaveBank.cpp
+1 -1
View File
@@ -55,7 +55,7 @@ void JASBasicWaveBank::incWaveTable(JASBasicWaveBank::TWaveGroup const* param_0)
}
}
u32 JASBasicWaveBank::mNoLoad;
DUSK_GAME_DATA u32 JASBasicWaveBank::mNoLoad;
void JASBasicWaveBank::decWaveTable(JASBasicWaveBank::TWaveGroup const* param_0) {
JASMutexLock lock(&field_0x4);
libs/JSystem/src/JAudio2/JASCalc.cpp
+1 -1
View File
@@ -141,7 +141,7 @@ void JASCalc::bzero(void* dest, u32 size) {
}
#if AVOID_UB
s16 const JASCalc::CUTOFF_TO_IIR_TABLE[129][4] = {
DUSK_GAME_DATA s16 const JASCalc::CUTOFF_TO_IIR_TABLE[129][4] = {
#else
s16 const JASCalc::CUTOFF_TO_IIR_TABLE[128][4] = {
#endif
libs/JSystem/src/JAudio2/JASChannel.cpp
+4 -4
View File
@@ -12,13 +12,13 @@
#include "JSystem/JMath/JMATrigonometric.h"
#include "JSystem/JGeometry.h"
OSMessageQueue JASChannel::sBankDisposeMsgQ;
DUSK_GAME_DATA OSMessageQueue JASChannel::sBankDisposeMsgQ;
OSMessage JASChannel::sBankDisposeMsg[16];
DUSK_GAME_DATA OSMessage JASChannel::sBankDisposeMsg[16];
OSMessage JASChannel::sBankDisposeList[16];
DUSK_GAME_DATA OSMessage JASChannel::sBankDisposeList[16];
int JASChannel::sBankDisposeListSize;
DUSK_GAME_DATA int JASChannel::sBankDisposeListSize;
JASChannel::JASChannel(Callback i_callback, void* i_callbackData) :
mStatus(STATUS_STOP),
libs/JSystem/src/JAudio2/JASCmdStack.cpp
+2 -2
View File
@@ -8,9 +8,9 @@
#include "JSystem/JAudio2/JASCriticalSection.h"
#include <os.h>
JASPortCmd::TPortHead JASPortCmd::sCommandListOnce;
DUSK_GAME_DATA JASPortCmd::TPortHead JASPortCmd::sCommandListOnce;
JASPortCmd::TPortHead JASPortCmd::sCommandListStay;
DUSK_GAME_DATA JASPortCmd::TPortHead JASPortCmd::sCommandListStay;
bool JASPortCmd::addPortCmdOnce() {
JASCriticalSection cs;
libs/JSystem/src/JAudio2/JASDSPChannel.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include "JSystem/JAudio2/JASHeapCtrl.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
JASDSPChannel* JASDSPChannel::sDspChannels;
DUSK_GAME_DATA JASDSPChannel* JASDSPChannel::sDspChannels;
JASDSPChannel::JASDSPChannel() :
mStatus(STATUS_INACTIVE),
libs/JSystem/src/JAudio2/JASDSPInterface.cpp
+8 -8
View File
@@ -11,13 +11,13 @@
#include "JSystem/JKernel/JKRSolidHeap.h"
#include <os.h>
JASDsp::TChannel* JASDsp::CH_BUF;
DUSK_GAME_DATA JASDsp::TChannel* JASDsp::CH_BUF;
JASDsp::FxBuf* JASDsp::FX_BUF;
DUSK_GAME_DATA JASDsp::FxBuf* JASDsp::FX_BUF;
f32 JASDsp::sDSPVolume;
DUSK_GAME_DATA f32 JASDsp::sDSPVolume;
u16 JASDsp::SEND_TABLE[] = {
DUSK_GAME_DATA u16 JASDsp::SEND_TABLE[] = {
0x0D00,
0x0D60,
0x0DC8,
@@ -32,10 +32,10 @@ u16 JASDsp::SEND_TABLE[] = {
0x0000,
};
u32 JASWaveInfo::one = 1;
DUSK_GAME_DATA u32 JASWaveInfo::one = 1;
#if DEBUG
s32 JASDsp::dspMutex = 1;
DUSK_GAME_DATA s32 JASDsp::dspMutex = 1;
#endif
void JASDsp::boot(void (*param_0)(void*)) {
@@ -99,14 +99,14 @@ void JASDsp::invalChannelAll() {
DCInvalidateRange(CH_BUF, sizeof(TChannel) * DSP_CHANNELS);
}
u8 const ATTRIBUTE_ALIGN(32) JASDsp::DSPADPCM_FILTER[64] = {
DUSK_GAME_DATA u8 const ATTRIBUTE_ALIGN(32) JASDsp::DSPADPCM_FILTER[64] = {
0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x04, 0x00,
0x10, 0x00, 0xF8, 0x00, 0x0E, 0x00, 0xFA, 0x00, 0x0C, 0x00, 0xFC, 0x00, 0x12, 0x00, 0xF6, 0x00,
0x10, 0x68, 0xF7, 0x38, 0x12, 0xC0, 0xF7, 0x04, 0x14, 0x00, 0xF4, 0x00, 0x08, 0x00, 0xF8, 0x00,
0x04, 0x00, 0xFC, 0x00, 0xFC, 0x00, 0x04, 0x00, 0xFC, 0x00, 0x00, 0x00, 0xF8, 0x00, 0x00, 0x00,
};
u32 const ATTRIBUTE_ALIGN(32) JASDsp::DSPRES_FILTER[320] = {
DUSK_GAME_DATA u32 const ATTRIBUTE_ALIGN(32) JASDsp::DSPRES_FILTER[320] = {
0x0C3966AD,
0x0D46FFDF,
0x0B396696,
libs/JSystem/src/JAudio2/JASDriverIF.cpp
+5 -5
View File
@@ -9,7 +9,7 @@ void JASDriver::setDSPLevel(f32 param_0) {
JASDsp::setDSPMixerLevel(param_0);
}
u16 JASDriver::MAX_MIXERLEVEL = 0x2EE0;
DUSK_GAME_DATA u16 JASDriver::MAX_MIXERLEVEL = 0x2EE0;
u16 JASDriver::getChannelLevel_dsp() {
return JASDriver::MAX_MIXERLEVEL;
@@ -23,7 +23,7 @@ f32 JASDriver::getDSPLevel() {
return JASDsp::getDSPMixerLevel();
}
u32 JASDriver::JAS_SYSTEM_OUTPUT_MODE = JAS_OUTPUT_STEREO;
DUSK_GAME_DATA u32 JASDriver::JAS_SYSTEM_OUTPUT_MODE = JAS_OUTPUT_STEREO;
void JASDriver::setOutputMode(u32 mode) {
JAS_SYSTEM_OUTPUT_MODE = mode;
@@ -40,11 +40,11 @@ void JASDriver::waitSubFrame() {
} while (r31 == getSubFrameCounter());
}
JASCallbackMgr JASDriver::sDspSyncCallback;
DUSK_GAME_DATA JASCallbackMgr JASDriver::sDspSyncCallback;
JASCallbackMgr JASDriver::sSubFrameCallback;
DUSK_GAME_DATA JASCallbackMgr JASDriver::sSubFrameCallback;
JASCallbackMgr JASDriver::sUpdateDacCallback;
DUSK_GAME_DATA JASCallbackMgr JASDriver::sUpdateDacCallback;
int JASDriver::rejectCallback(DriverCallback callback, void* param_1) {
int r31 = sDspSyncCallback.reject(callback, param_1);
libs/JSystem/src/JAudio2/JASDvdThread.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include "JSystem/JAudio2/JASTaskThread.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
JASTaskThread* JASDvd::sThread;
DUSK_GAME_DATA JASTaskThread* JASDvd::sThread;
JASTaskThread* JASDvd::getThreadPointer() {
return JASDvd::sThread;
libs/JSystem/src/JAudio2/JASHeapCtrl.cpp
+5 -5
View File
@@ -247,7 +247,7 @@ JASGenericMemPool::~JASGenericMemPool() {
}
}
JKRSolidHeap* JASDram;
DUSK_GAME_DATA JKRSolidHeap* JASDram;
// TODO: What is this and Where does it go?
struct TNextOnFreeList {
@@ -290,11 +290,11 @@ void JASGenericMemPool::free(void* ptr, u32 param_1) {
freeMemCount++;
}
uintptr_t JASKernel::sAramBase;
DUSK_GAME_DATA uintptr_t JASKernel::sAramBase;
JKRHeap* JASKernel::sSystemHeap;
DUSK_GAME_DATA JKRHeap* JASKernel::sSystemHeap;
JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* JASKernel::sCommandHeap;
DUSK_GAME_DATA JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* JASKernel::sCommandHeap;
void JASKernel::setupRootHeap(JKRSolidHeap* heap, u32 size) {
JUT_ASSERT(784, heap);
@@ -314,7 +314,7 @@ JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* JASKernel::getCom
return JASKernel::sCommandHeap;
}
JASHeap JASKernel::audioAramHeap;
DUSK_GAME_DATA JASHeap JASKernel::audioAramHeap;
void JASKernel::setupAramHeap(uintptr_t param_0, u32 param_1) {
#if !PLATFORM_GCN
libs/JSystem/src/JAudio2/JASLfo.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ void JASLfo::incCounter(f32 param_0) {
}
}
JASLfo JASLfo::sFreeRunLfo;
DUSK_GAME_DATA JASLfo JASLfo::sFreeRunLfo;
void JASLfo::resetCounter() {
field_0x16 = mDelay;
libs/JSystem/src/JAudio2/JASOscillator.cpp
+4 -4
View File
@@ -131,25 +131,25 @@ void JASOscillator::update() {
updateCurrentValue(psVar1[mCurPoint].mTime);
}
f32 const JASOscillator::sCurveTableLinear[17] = {
DUSK_GAME_DATA f32 const JASOscillator::sCurveTableLinear[17] = {
1.0, 0.9375, 0.875, 0.8125, 0.75, 0.6875, 0.625, 0.5625, 0.5,
0.4375, 0.375, 0.3125, 0.25, 0.1875, 0.125, 0.0625, 0.0,
};
f32 const JASOscillator::sCurveTableSampleCell[17] = {
DUSK_GAME_DATA f32 const JASOscillator::sCurveTableSampleCell[17] = {
1.0, 0.9704890251159668, 0.7812740206718445, 0.5462809801101685, 0.39979198575019836,
0.28931498527526855, 0.21210399270057678, 0.15747599303722382, 0.1126129999756813, 0.08178959786891937,
0.057985201478004456, 0.04364150017499924, 0.03082370012998581, 0.023712899535894394, 0.015259300358593464,
0.00915555004030466, 0.0
};
f32 const JASOscillator::sCurveTableSqRoot[17] = {
DUSK_GAME_DATA f32 const JASOscillator::sCurveTableSqRoot[17] = {
1.0, 0.8789060115814209, 0.765625, 0.6601560115814209, 0.5625, 0.4726560115814209,
0.390625, 0.3164060115814209, 0.25, 0.1914059966802597, 0.140625, 0.09765619784593582,
0.0625, 0.03515620157122612, 0.015625, 0.00390625, 0.0
};
f32 const JASOscillator::sCurveTableSquare[17] = {
DUSK_GAME_DATA f32 const JASOscillator::sCurveTableSquare[17] = {
1.0, 0.9682459831237793, 0.9354140162467957, 0.9013879895210266, 0.8660249710083008,
0.8291559815406799, 0.790569007396698, 0.75, 0.7071070075035095, 0.66143798828125,
0.6123719811439514, 0.55901700258255, 0.5, 0.433012992143631, 0.35355299711227417, 0.25, 0.0,
libs/JSystem/src/JAudio2/JASProbe.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ void JASProbe::stop() {
_1A8++;
}
JASProbe* JASProbe::sProbeTable[16];
DUSK_GAME_DATA JASProbe* JASProbe::sProbeTable[16];
void JASProbe::start(s32 index, char const* name) {
JASProbe* probe;
libs/JSystem/src/JAudio2/JASSeqCtrl.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include "JSystem/JAudio2/JASSeqParser.h"
#include "JSystem/JAudio2/JASTrack.h"
JASSeqParser JASSeqCtrl::sDefaultParser;
DUSK_GAME_DATA JASSeqParser JASSeqCtrl::sDefaultParser;
JASSeqCtrl::JASSeqCtrl() {
field_0x3c = &sDefaultParser;
libs/JSystem/src/JAudio2/JASSeqParser.cpp
+3 -3
View File
@@ -9,7 +9,7 @@
#include "JSystem/JUtility/JUTAssert.h"
JASSeqParser::CmdInfo JASSeqParser::sCmdInfo[96] = {
DUSK_GAME_DATA JASSeqParser::CmdInfo JASSeqParser::sCmdInfo[96] = {
NULL, 0x0000, 0x0000,
NULL, 0x0000, 0x0000,
NULL, 0x0000, 0x0000,
@@ -108,7 +108,7 @@ JASSeqParser::CmdInfo JASSeqParser::sCmdInfo[96] = {
&JASSeqParser::cmdFinish, 0x0000, 0x0000,
};
JASSeqParser::CmdInfo JASSeqParser::sExtCmdInfo[255] = {
DUSK_GAME_DATA JASSeqParser::CmdInfo JASSeqParser::sExtCmdInfo[255] = {
NULL, 0x0000, 0x0000,
&JASSeqParser::cmdDump, 0x0000, 0x0000,
NULL, 0x0000, 0x0000,
@@ -589,7 +589,7 @@ s32 JASSeqParser::cmdIntTimer(JASTrack* param_0, u32* param_1) {
return 0;
}
u16 (*JASSeqParser::sCallBackFunc)(JASTrack*, u16);
DUSK_GAME_DATA u16 (*JASSeqParser::sCallBackFunc)(JASTrack*, u16);
s32 JASSeqParser::cmdSyncCPU(JASTrack* param_0, u32* param_1) {
u16 r31 = 0xffff;
libs/JSystem/src/JAudio2/JASTrack.cpp
+6 -6
View File
@@ -15,9 +15,9 @@ JASTrack::JASTrack() : mDefaultChannelMgr(this), mChannelMgrCount(1), mStatus(0)
init();
}
JASDefaultBankTable JASTrack::sDefaultBankTable;
DUSK_GAME_DATA JASDefaultBankTable JASTrack::sDefaultBankTable;
JASTrack::TList JASTrack::sTrackList;
DUSK_GAME_DATA JASTrack::TList JASTrack::sTrackList;
// NONMATCHING JASPoolAllocObject_MultiThreaded<_> locations
JASTrack::~JASTrack() {
@@ -50,16 +50,16 @@ void JASTrack::setChannelMgrCount(u32 count) {
}
}
JASOscillator::Point const JASTrack::sAdsTable[4] = {
DUSK_GAME_DATA JASOscillator::Point const JASTrack::sAdsTable[4] = {
{0, 0, 0x7fff},
{0, 0, 0x7fff},
{0, 0, 0},
{0xe, 0, 0},
};
JASOscillator::Data const JASTrack::sEnvOsc = {0, 1.0f, NULL, NULL, 1.0f, 0.0f};
DUSK_GAME_DATA JASOscillator::Data const JASTrack::sEnvOsc = {0, 1.0f, NULL, NULL, 1.0f, 0.0f};
JASOscillator::Data const JASTrack::sPitchEnvOsc = {1, 1.0f, NULL, NULL, 1.0f, 0.0f};
DUSK_GAME_DATA JASOscillator::Data const JASTrack::sPitchEnvOsc = {1, 1.0f, NULL, NULL, 1.0f, 0.0f};
// NONMATCHING JASPoolAllocObject_MultiThreaded<_> locations
void JASTrack::init() {
@@ -552,7 +552,7 @@ void JASTrack::setOscAdsr(s16 param_0, s16 param_1, s16 param_2, s16 param_3, u1
mDirectRelease = i_directRelease;
}
const u32 JASDsp::FILTER_MODE_IIR = 0x00000020;
DUSK_GAME_DATA const u32 JASDsp::FILTER_MODE_IIR = 0x00000020;
void JASTrack::setFIR(s16 const* i_FIR) {
for (int i = 0; i < 8; i++) {
libs/JSystem/src/JAudio2/JASVoiceBank.cpp
+2 -2
View File
@@ -3,11 +3,11 @@
#include "JSystem/JAudio2/JASVoiceBank.h"
#include "JSystem/JAudio2/JASBasicInst.h"
const JASOscillator::Data JASVoiceBank::sOscData = {
DUSK_GAME_DATA const JASOscillator::Data JASVoiceBank::sOscData = {
0, 1.0f, NULL, NULL, 1.0f, 0.0f,
};
JASOscillator::Data* JASVoiceBank::sOscTable;
DUSK_GAME_DATA JASOscillator::Data* JASVoiceBank::sOscTable;
bool JASVoiceBank::getInstParam(int param_0, int param_1, int param_2,
JASInstParam* param_3) const {
libs/JSystem/src/JAudio2/JASWSParser.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ JASWaveBank* JASWSParser::createWaveBank(void const* stream, JKRHeap* heap) {
}
}
u32 JASWSParser::sUsedHeapSize;
DUSK_GAME_DATA u32 JASWSParser::sUsedHeapSize;
JASBasicWaveBank* JASWSParser::createBasicWaveBank(void const* stream, JKRHeap* heap) {
if (heap == NULL) {
libs/JSystem/src/JAudio2/JASWaveArcLoader.cpp
+2 -2
View File
@@ -11,7 +11,7 @@
#include "dusk/string.hpp"
JASHeap* JASWaveArcLoader::sAramHeap;
DUSK_GAME_DATA JASHeap* JASWaveArcLoader::sAramHeap;
JASHeap* JASWaveArcLoader::getRootHeap() {
if (JASWaveArcLoader::sAramHeap) {
@@ -20,7 +20,7 @@ JASHeap* JASWaveArcLoader::getRootHeap() {
return JASKernel::getAramHeap();
}
char JASWaveArcLoader::sCurrentDir[DIR_MAX] = "/AudioRes/Waves/";
DUSK_GAME_DATA char JASWaveArcLoader::sCurrentDir[DIR_MAX] = "/AudioRes/Waves/";
void JASWaveArcLoader::setCurrentDir(char const* dir) {
JUT_ASSERT(40, std::strlen(dir) < DIR_MAX - 1);
libs/JSystem/src/JAudio2/osdsp_task.cpp
+2 -2
View File
@@ -5,8 +5,8 @@
#include <dsp.h>
#include <os.h>
extern DSPTaskInfo* __DSP_first_task;
extern DSPTaskInfo* __DSP_curr_task;
DUSK_GAME_EXTERN DSPTaskInfo* __DSP_first_task;
DUSK_GAME_EXTERN DSPTaskInfo* __DSP_curr_task;
extern "C" void __DSP_exec_task(DSPTaskInfo*, DSPTaskInfo*);
extern "C" void __DSP_remove_task(DSPTaskInfo* task);
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);
libs/JSystem/src/JHostIO/JHIMccBuf.cpp
+2 -2
View File
@@ -14,8 +14,8 @@ void JHIReport(const char* fmt, ...) {}
void JHIHalt(const char* fmt, ...) {}
u8* JHIMccBuf::mTempBuf;
u16 JHIMccBuf::mRefCount;
DUSK_GAME_DATA u8* JHIMccBuf::mTempBuf;
DUSK_GAME_DATA u16 JHIMccBuf::mRefCount;
JHIMccBuf::JHIMccBuf(u16 channel, u16 param_1, u32 param_2) {
initInstance(channel, param_1, param_2);
libs/JSystem/src/JHostIO/JHIRMcc.cpp
+7 -7
View File
@@ -7,14 +7,14 @@
#include <revolution/hio2.h>
#endif
HIO2DeviceType gExiDevice = HIO2_DEVICE_INVALID;
u8 data_8074bd04 = 1;
DUSK_GAME_DATA HIO2DeviceType gExiDevice = HIO2_DEVICE_INVALID;
DUSK_GAME_DATA u8 data_8074bd04 = 1;
s32 ghHIO2;
JHIMccContext tContext_old;
JHIMccContext tContext_new;
bool data_8074d138;
u8 data_8074d139;
DUSK_GAME_DATA s32 ghHIO2;
DUSK_GAME_DATA JHIMccContext tContext_old;
DUSK_GAME_DATA JHIMccContext tContext_new;
DUSK_GAME_DATA bool data_8074d138;
DUSK_GAME_DATA u8 data_8074d139;
BOOL JHIhio2CallbackEnum(HIO2DeviceType type) {
gExiDevice = type;
libs/JSystem/src/JHostIO/JHIhioASync.cpp
+8 -8
View File
@@ -9,16 +9,16 @@
#endif
#include "global.h"
u32 gsEnableHostio;
u32 gsEnableInterface;
u32 gsDataToRead;
DUSK_GAME_DATA u32 gsEnableHostio;
DUSK_GAME_DATA u32 gsEnableInterface;
DUSK_GAME_DATA u32 gsDataToRead;
u8* gsReadBuf;
u8* gsWriteBuf;
JHICommBufReader* gsJHIrecvBuf;
JHICommBufWriter* gsJHIsendBuf;
DUSK_GAME_DATA u8* gsReadBuf;
DUSK_GAME_DATA u8* gsWriteBuf;
DUSK_GAME_DATA JHICommBufReader* gsJHIrecvBuf;
DUSK_GAME_DATA JHICommBufWriter* gsJHIsendBuf;
JHIMccContext gMccContext;
DUSK_GAME_DATA JHIMccContext gMccContext;
BOOL JHIInit(u32 enabled) {
gsEnableHostio = enabled;
libs/JSystem/src/JHostIO/JORServer.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ void JORReflexible::listenPropertyEvent(const JORPropertyEvent* pEvent) {
}
#endif
JORServer* JORServer::instance;
DUSK_GAME_DATA JORServer* JORServer::instance;
JORServer* JORServer::create() {
if (instance == NULL) {
libs/JSystem/src/JKernel/JKRAram.cpp
+5 -5
View File
@@ -27,7 +27,7 @@ static int JKRDecompressFromAramToMainRam(u32 src, void* dst, u32 srcLength, u32
u32 offset, u32* resourceSize);
int decompSZS_subroutine(u8* src, u8* dest);
JKRAram* JKRAram::sAramObject;
DUSK_GAME_DATA JKRAram* JKRAram::sAramObject;
JKRAram* JKRAram::create(u32 aram_audio_buffer_size, u32 aram_audio_graph_size, s32 stream_priority,
s32 decomp_priority, s32 piece_priority) {
@@ -48,14 +48,14 @@ void JKRAram::destroy() {
}
#endif
OSMessage JKRAram::sMessageBuffer[4] = {
DUSK_GAME_DATA OSMessage JKRAram::sMessageBuffer[4] = {
NULL,
NULL,
NULL,
NULL,
};
OSMessageQueue JKRAram::sMessageQueue = {0};
DUSK_GAME_DATA OSMessageQueue JKRAram::sMessageQueue = {0};
JKRAram::JKRAram(u32 audio_buffer_size, u32 audio_graph_size, s32 priority)
: JKRThread(stack_size, 0x10, priority) {
@@ -279,11 +279,11 @@ u8* JKRAram::aramToMainRam(u32 address, u8* buf, u32 p3, JKRExpandSwitch expandS
}
}
JSUList<JKRAMCommand> JKRAram::sAramCommandList;
DUSK_GAME_DATA JSUList<JKRAMCommand> JKRAram::sAramCommandList;
static OSMutex decompMutex;
u32 JKRAram::sSZSBufferSize = 0x00000400;
DUSK_GAME_DATA u32 JKRAram::sSZSBufferSize = 0x00000400;
static u8* szpBuf;
libs/JSystem/src/JKernel/JKRAramHeap.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include <climits>
#include "os_report.h"
JSUList<JKRAramBlock> JKRAramHeap::sAramList;
DUSK_GAME_DATA JSUList<JKRAramBlock> JKRAramHeap::sAramList;
JKRAramHeap::JKRAramHeap(u32 startAddress, u32 size) {
OSInitMutex(&mMutex);
libs/JSystem/src/JKernel/JKRAramPiece.cpp
+3 -3
View File
@@ -23,12 +23,12 @@ void JKRAramPiece::sendCommand(JKRAMCommand* command) {
startDMA(command);
}
JSUList<JKRAMCommand> JKRAramPiece::sAramPieceCommandList;
DUSK_GAME_DATA JSUList<JKRAMCommand> JKRAramPiece::sAramPieceCommandList;
OSMutex JKRAramPiece::mMutex;
DUSK_GAME_DATA OSMutex JKRAramPiece::mMutex;
#if DEBUG && TARGET_PC
volatile u8 forceRead;
DUSK_GAME_DATA volatile u8 forceRead;
#endif
JKRAMCommand* JKRAramPiece::orderAsync(int direction, uintptr_t source, uintptr_t destination, u32 length,
libs/JSystem/src/JKernel/JKRAramStream.cpp
+6 -6
View File
@@ -12,7 +12,7 @@ const u32 stack_size = 0xc00;
const u32 stack_size = 0x4000;
#endif
JKRAramStream* JKRAramStream::sAramStreamObject;
DUSK_GAME_DATA JKRAramStream* JKRAramStream::sAramStreamObject;
JKRAramStream* JKRAramStream::create(s32 priority) {
if (!sAramStreamObject) {
@@ -23,14 +23,14 @@ JKRAramStream* JKRAramStream::create(s32 priority) {
return sAramStreamObject;
}
void* JKRAramStream::sMessageBuffer[4] = {
DUSK_GAME_DATA void* JKRAramStream::sMessageBuffer[4] = {
NULL,
NULL,
NULL,
NULL,
};
OSMessageQueue JKRAramStream::sMessageQueue = {0};
DUSK_GAME_DATA OSMessageQueue JKRAramStream::sMessageQueue = {0};
JKRAramStream::JKRAramStream(s32 priority) : JKRThread(stack_size, 0x10, priority) {
resume();
@@ -141,11 +141,11 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) {
return writtenLength;
}
u8* JKRAramStream::transBuffer;
DUSK_GAME_DATA u8* JKRAramStream::transBuffer;
u32 JKRAramStream::transSize;
DUSK_GAME_DATA u32 JKRAramStream::transSize;
JKRHeap* JKRAramStream::transHeap;
DUSK_GAME_DATA JKRHeap* JKRAramStream::transHeap;
JKRAramStreamCommand* JKRAramStream::write_StreamToAram_Async(JSUFileInputStream* stream, u32 addr,
u32 size, u32 offset,
libs/JSystem/src/JKernel/JKRArchivePri.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include <cassert>
#endif
u32 JKRArchive::sCurrentDirID;
DUSK_GAME_DATA u32 JKRArchive::sCurrentDirID;
JKRArchive::JKRArchive() {
mIsMounted = false;
libs/JSystem/src/JKernel/JKRDecomp.cpp
+3 -3
View File
@@ -10,7 +10,7 @@ const u32 stack_size = 0x800;
const u32 stack_size = 0x4000;
#endif
JKRDecomp* JKRDecomp::sDecompObject;
DUSK_GAME_DATA JKRDecomp* JKRDecomp::sDecompObject;
JKRDecomp* JKRDecomp::create(s32 priority) {
if (!sDecompObject) {
@@ -29,9 +29,9 @@ void JKRDecomp::destroy() {
}
#endif
OSMessage JKRDecomp::sMessageBuffer[8] = {0};
DUSK_GAME_DATA OSMessage JKRDecomp::sMessageBuffer[8] = {0};
OSMessageQueue JKRDecomp::sMessageQueue = {0};
DUSK_GAME_DATA OSMessageQueue JKRDecomp::sMessageQueue = {0};
JKRDecomp::JKRDecomp(s32 priority) : JKRThread(stack_size, 0x10, priority) {
resume();
libs/JSystem/src/JKernel/JKRDvdAramRipper.cpp
+3 -3
View File
@@ -75,9 +75,9 @@ JKRADCommand* JKRDvdAramRipper::loadToAram_Async(JKRDvdFile* dvdFile, u32 addres
return command;
}
JSUList<JKRADCommand> JKRDvdAramRipper::sDvdAramAsyncList;
DUSK_GAME_DATA JSUList<JKRADCommand> JKRDvdAramRipper::sDvdAramAsyncList;
bool JKRDvdAramRipper::errorRetry = true;
DUSK_GAME_DATA bool JKRDvdAramRipper::errorRetry = true;
JKRADCommand* JKRDvdAramRipper::callCommand_Async(JKRADCommand* command) {
s32 compression;
@@ -228,7 +228,7 @@ JKRADCommand::~JKRADCommand() {
static OSMutex decompMutex;
u32 JKRDvdAramRipper::sSZSBufferSize = 0x00000400;
DUSK_GAME_DATA u32 JKRDvdAramRipper::sSZSBufferSize = 0x00000400;
static u8* szpBuf;
libs/JSystem/src/JKernel/JKRDvdFile.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "JSystem/JUtility/JUTException.h"
#include <stdint.h>
JSUList<JKRDvdFile> JKRDvdFile::sDvdList;
DUSK_GAME_DATA JSUList<JKRDvdFile> JKRDvdFile::sDvdList;
JKRDvdFile::JKRDvdFile() : mDvdLink(this) {
initiate();
libs/JSystem/src/JKernel/JKRDvdRipper.cpp
+4 -4
View File
@@ -44,7 +44,7 @@ void* JKRDvdRipper::loadToMainRAM(s32 entryNumber, u8* dst, JKRExpandSwitch expa
pCompression, param_8);
}
bool JKRDvdRipper::errorRetry = true;
DUSK_GAME_DATA bool JKRDvdRipper::errorRetry = true;
void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch expandSwitch,
u32 dstLength, JKRHeap* heap,
@@ -236,13 +236,13 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch
static u8 lit_491[12];
JSUList<JKRDMCommand> JKRDvdRipper::sDvdAsyncList;
DUSK_GAME_DATA JSUList<JKRDMCommand> JKRDvdRipper::sDvdAsyncList;
static OSMutex decompMutex;
u32 JKRDvdRipper::sSZSBufferSize = 0x00000400;
DUSK_GAME_DATA u32 JKRDvdRipper::sSZSBufferSize = 0x00000400;
JKRHeap* JKRDvdRipper::sHeap = NULL;
DUSK_GAME_DATA JKRHeap* JKRDvdRipper::sHeap = NULL;
static u8* szpBuf;
libs/JSystem/src/JKernel/JKRFileLoader.cpp
+2 -2
View File
@@ -11,8 +11,8 @@
#include "dusk/string.hpp"
#include "global.h"
JKRFileLoader* JKRFileLoader::sCurrentVolume;
JSUList<JKRFileLoader> JKRFileLoader::sVolumeList;
DUSK_GAME_DATA JKRFileLoader* JKRFileLoader::sCurrentVolume;
DUSK_GAME_DATA JSUList<JKRFileLoader> JKRFileLoader::sVolumeList;
JKRFileLoader::JKRFileLoader(void)
: mFileLoaderLink(this), mVolumeName(NULL), mVolumeType(0), mMountCount(0) {}
libs/JSystem/src/JKernel/JKRHeap.cpp
+17 -17
View File
@@ -28,14 +28,14 @@
#include "os_report.h"
#if DEBUG
u8 JKRValue_DEBUGFILL_NOTUSE = 0xFD;
u8 JKRValue_DEBUGFILL_NEW = 0xCD;
u8 JKRValue_DEBUGFILL_DELETE = 0xDD;
DUSK_GAME_DATA u8 JKRValue_DEBUGFILL_NOTUSE = 0xFD;
DUSK_GAME_DATA u8 JKRValue_DEBUGFILL_NEW = 0xCD;
DUSK_GAME_DATA u8 JKRValue_DEBUGFILL_DELETE = 0xDD;
#endif
bool JKRHeap::sDefaultFillFlag = true;
DUSK_GAME_DATA bool JKRHeap::sDefaultFillFlag = true;
JKRHeap* JKRHeap::sSystemHeap;
DUSK_GAME_DATA JKRHeap* JKRHeap::sSystemHeap;
#if TARGET_PC
// JSystem normally has a thread switch callback to track the correct heap.
@@ -52,13 +52,13 @@ static thread_local TLS_GLOBAL_DYNAMIC JKRHeap* sCurrentHeap;
JKRHeap* JKRHeap::sCurrentHeap;
#endif
JKRHeap* JKRHeap::sRootHeap;
DUSK_GAME_DATA JKRHeap* JKRHeap::sRootHeap;
#if PLATFORM_WII || PLATFORM_SHIELD
JKRHeap* JKRHeap::sRootHeap2;
#endif
JKRErrorHandler JKRHeap::mErrorHandler;
DUSK_GAME_DATA JKRErrorHandler JKRHeap::mErrorHandler;
static bool data_80451380;
@@ -111,19 +111,19 @@ JKRHeap::~JKRHeap() {
}
}
void* JKRHeap::mCodeStart;
DUSK_GAME_DATA void* JKRHeap::mCodeStart;
void* JKRHeap::mCodeEnd;
DUSK_GAME_DATA void* JKRHeap::mCodeEnd;
void* JKRHeap::mUserRamStart;
DUSK_GAME_DATA void* JKRHeap::mUserRamStart;
void* JKRHeap::mUserRamEnd;
DUSK_GAME_DATA void* JKRHeap::mUserRamEnd;
u32 JKRHeap::mMemorySize;
DUSK_GAME_DATA u32 JKRHeap::mMemorySize;
JKRHeap::JKRAllocCallback JKRHeap::sAllocCallback;
DUSK_GAME_DATA JKRHeap::JKRAllocCallback JKRHeap::sAllocCallback;
JKRHeap::JKRFreeCallback JKRHeap::sFreeCallback;
DUSK_GAME_DATA JKRHeap::JKRFreeCallback JKRHeap::sFreeCallback;
bool JKRHeap::initArena(char** memory, u32* size, int maxHeaps) {
void* arenaLo = OSGetArenaLo();
@@ -661,8 +661,8 @@ void operator delete[](void* ptr JKR_HEAP_TOKEN_PARAM) IF_DUSK(noexcept) {
}
#endif
s32 fillcheck_dispcount = 100;
bool data_8074A8D0_debug = true;
DUSK_GAME_DATA s32 fillcheck_dispcount = 100;
DUSK_GAME_DATA bool data_8074A8D0_debug = true;
void JKRHeap::state_register(JKRHeap::TState* p, u32 id) const {
JUT_ASSERT(1213, p != NULL);
@@ -680,7 +680,7 @@ void JKRHeap::state_dump(const JKRHeap::TState& p) const {
JUT_LOG(1248, "used size : %u", p.getUsedSize());
}
void* ARALT_AramStartAdr = (void*)0x90000000;
DUSK_GAME_DATA void* ARALT_AramStartAdr = (void*)0x90000000;
void* JKRHeap::getAltAramStartAdr() { return ARALT_AramStartAdr; }
libs/JSystem/src/JKernel/JKRThread.cpp
+9 -9
View File
@@ -13,19 +13,19 @@
#include "dusk/os.h"
#endif
JSUList<JKRThread> JKRThread::sThreadList(0);
DUSK_GAME_DATA JSUList<JKRThread> JKRThread::sThreadList(0);
void* JKRIdleThread::sThread;
DUSK_GAME_DATA void* JKRIdleThread::sThread;
JKRThreadSwitch* JKRThreadSwitch::sManager;
DUSK_GAME_DATA JKRThreadSwitch* JKRThreadSwitch::sManager;
u32 JKRThreadSwitch::sTotalCount;
DUSK_GAME_DATA u32 JKRThreadSwitch::sTotalCount;
u64 JKRThreadSwitch::sTotalStart;
DUSK_GAME_DATA u64 JKRThreadSwitch::sTotalStart;
JKRThreadSwitch_PreCallback JKRThreadSwitch::mUserPreCallback;
DUSK_GAME_DATA JKRThreadSwitch_PreCallback JKRThreadSwitch::mUserPreCallback;
JKRThreadSwitch_PostCallback JKRThreadSwitch::mUserPostCallback;
DUSK_GAME_DATA JKRThreadSwitch_PostCallback JKRThreadSwitch::mUserPostCallback;
JKRThread::JKRThread(u32 stack_size, int message_count, int param_3) : mThreadListLink(this) {
JKRHeap* heap = JKRHeap::findFromRoot(this);
@@ -358,10 +358,10 @@ static void dummy(JKRIdleThread* thread) {
#pragma push
#pragma force_active on
JSUList<JKRTask> JKRTask::sTaskList;
DUSK_GAME_DATA JSUList<JKRTask> JKRTask::sTaskList;
#pragma pop
#pragma push
#pragma force_active on
u8 JKRTask::sEndMesgQueue[32];
DUSK_GAME_DATA u8 JKRTask::sEndMesgQueue[32];
#pragma pop
libs/JSystem/src/JMath/JMATrigonometric.cpp
+3 -3
View File
@@ -16,10 +16,10 @@ inline f64 getConst2() {
return 9.765625E-4;
}
TSinCosTable<13, f32> sincosTable_ ATTRIBUTE_ALIGN(32);
DUSK_GAME_DATA TSinCosTable<13, f32> sincosTable_ ATTRIBUTE_ALIGN(32);
TAtanTable<1024, f32> atanTable_ ATTRIBUTE_ALIGN(32);
DUSK_GAME_DATA TAtanTable<1024, f32> atanTable_ ATTRIBUTE_ALIGN(32);
TAsinAcosTable<1024, f32> asinAcosTable_ ATTRIBUTE_ALIGN(32);
DUSK_GAME_DATA TAsinAcosTable<1024, f32> asinAcosTable_ ATTRIBUTE_ALIGN(32);
} // namespace JMath
libs/JSystem/src/JMessage/data.cpp
+2 -2
View File
@@ -2,6 +2,6 @@
#include "JSystem/JMessage/data.h"
const BE(u32) JMessage::data::ga4cSignature = 'MESG';
DUSK_GAME_DATA const BE(u32) JMessage::data::ga4cSignature = 'MESG';
const BE(u32) JMessage::data::ga4cSignature_color = 'MGCL';
DUSK_GAME_DATA const BE(u32) JMessage::data::ga4cSignature_color = 'MGCL';
libs/JSystem/src/JMessage/resource.cpp
+1 -1
View File
@@ -89,7 +89,7 @@ u16 JMessage::TResource::toMessageIndex_messageID(u32 uMsgID, u32 upperHalf, boo
return nIndex;
}
JMessage::locale::parseCharacter_function JMessage::TResourceContainer::sapfnParseCharacter_[5] = {
DUSK_GAME_DATA JMessage::locale::parseCharacter_function JMessage::TResourceContainer::sapfnParseCharacter_[5] = {
NULL,
JMessage::locale::parseCharacter_1Byte,
JMessage::locale::parseCharacter_2Byte,
libs/JSystem/src/JParticle/JPABaseShape.cpp
+7 -7
View File
@@ -1580,36 +1580,36 @@ static void makeColorTable(GXColor** o_color_table, JPAClrAnmKeyData const* i_da
*o_color_table = p_clr_tbl;
}
GXBlendMode JPABaseShape::st_bm[3] = {
DUSK_GAME_DATA GXBlendMode JPABaseShape::st_bm[3] = {
GX_BM_NONE,
GX_BM_BLEND,
GX_BM_LOGIC,
};
GXBlendFactor JPABaseShape::st_bf[10] = {
DUSK_GAME_DATA GXBlendFactor JPABaseShape::st_bf[10] = {
GX_BL_ZERO, GX_BL_ONE, GX_BL_SRCCLR, GX_BL_INVSRCCLR,
GX_BL_DSTCLR, GX_BL_INVDSTCLR, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA,
GX_BL_DSTALPHA, GX_BL_INVDSTALPHA,
};
GXLogicOp JPABaseShape::st_lo[16] = {
DUSK_GAME_DATA GXLogicOp JPABaseShape::st_lo[16] = {
GX_LO_CLEAR, GX_LO_SET, GX_LO_COPY, GX_LO_INVCOPY, GX_LO_NOOP, GX_LO_INV,
GX_LO_AND, GX_LO_NAND, GX_LO_OR, GX_LO_NOR, GX_LO_XOR, GX_LO_EQUIV,
GX_LO_REVAND, GX_LO_INVAND, GX_LO_REVOR, GX_LO_INVOR,
};
GXCompare JPABaseShape::st_c[8] = {
DUSK_GAME_DATA GXCompare JPABaseShape::st_c[8] = {
GX_NEVER, GX_LESS, GX_LEQUAL, GX_EQUAL, GX_NEQUAL, GX_GEQUAL, GX_GREATER, GX_ALWAYS,
};
GXAlphaOp JPABaseShape::st_ao[4] = {
DUSK_GAME_DATA GXAlphaOp JPABaseShape::st_ao[4] = {
GX_AOP_AND,
GX_AOP_OR,
GX_AOP_XOR,
GX_AOP_XNOR,
};
GXTevColorArg JPABaseShape::st_ca[6][4] = {
DUSK_GAME_DATA GXTevColorArg JPABaseShape::st_ca[6][4] = {
{
GX_CC_ZERO,
GX_CC_TEXC,
@@ -1648,7 +1648,7 @@ GXTevColorArg JPABaseShape::st_ca[6][4] = {
},
};
GXTevAlphaArg JPABaseShape::st_aa[2][4] = {
DUSK_GAME_DATA GXTevAlphaArg JPABaseShape::st_aa[2][4] = {
{
GX_CA_ZERO,
GX_CA_TEXA,
libs/JSystem/src/JStudio/JStudio/ctb-data.cpp
+1 -1
View File
@@ -2,4 +2,4 @@
#include "JSystem/JStudio/JStudio/ctb.h"
const u32 JStudio::ctb::data::ga4cSignature = BSWAP32('CTB\0');
DUSK_GAME_DATA const u32 JStudio::ctb::data::ga4cSignature = BSWAP32('CTB\0');
libs/JSystem/src/JStudio/JStudio/fvb-data.cpp
+1 -1
View File
@@ -2,4 +2,4 @@
#include "JSystem/JStudio/JStudio/fvb-data.h"
const char JStudio::fvb::data::ga4cSignature[4] = "FVB";
DUSK_GAME_DATA const char JStudio::fvb::data::ga4cSignature[4] = "FVB";
libs/JSystem/src/JStudio/JStudio/jstudio-data.cpp
+1 -1
View File
@@ -2,4 +2,4 @@
#include "JSystem/JStudio/JStudio/jstudio-data.h"
const char JStudio::data::ga8cSignature[8] = "jstudio";
DUSK_GAME_DATA const char JStudio::data::ga8cSignature[8] = "jstudio";
libs/JSystem/src/JStudio/JStudio/jstudio-object.cpp
+25 -25
View File
@@ -326,19 +326,19 @@ JStudio::TObject_actor::TObject_actor(JStudio::stb::data::TParse_TBlock_object c
}
u32 const JStudio::TAdaptor_actor::sauVariableValue_3_TRANSLATION_XYZ[3] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_actor::sauVariableValue_3_TRANSLATION_XYZ[3] = {
3, 4, 5,
};
u32 const JStudio::TAdaptor_actor::sauVariableValue_3_ROTATION_XYZ[3] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_actor::sauVariableValue_3_ROTATION_XYZ[3] = {
6, 7, 8,
};
u32 const JStudio::TAdaptor_actor::sauVariableValue_3_SCALING_XYZ[3] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_actor::sauVariableValue_3_SCALING_XYZ[3] = {
9, 10, 11,
};
JStudio::TVariableValue::TOutput_none_ JStudio::TVariableValue::soOutput_none_;
DUSK_GAME_DATA JStudio::TVariableValue::TOutput_none_ JStudio::TVariableValue::soOutput_none_;
void JStudio::TObject_actor::do_paragraph(u32 param_1, void const* param_2, u32 param_3) {
TAdaptor* adaptor = getAdaptor();
@@ -479,11 +479,11 @@ JStudio::TObject_ambientLight::TObject_ambientLight(
JStudio::TAdaptor_ambientLight* param_1) : TObject(param_0, param_1) {
}
u32 const JStudio::TAdaptor_ambientLight::sauVariableValue_3_COLOR_RGB[3] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_ambientLight::sauVariableValue_3_COLOR_RGB[3] = {
0, 1, 2,
};
u32 const JStudio::TAdaptor_ambientLight::sauVariableValue_4_COLOR_RGBA[4] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_ambientLight::sauVariableValue_4_COLOR_RGBA[4] = {
0, 1, 2, 3,
};
@@ -540,15 +540,15 @@ JStudio::TObject_camera::TObject_camera(JStudio::stb::data::TParse_TBlock_object
JStudio::TAdaptor_camera* param_1)
: TObject(param_0, param_1) {}
u32 const JStudio::TAdaptor_camera::sauVariableValue_3_POSITION_XYZ[3] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_camera::sauVariableValue_3_POSITION_XYZ[3] = {
0, 1, 2,
};
u32 const JStudio::TAdaptor_camera::sauVariableValue_3_TARGET_POSITION_XYZ[3] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_camera::sauVariableValue_3_TARGET_POSITION_XYZ[3] = {
3, 4, 5,
};
u32 const JStudio::TAdaptor_camera::sauVariableValue_2_DISTANCE_NEAR_FAR[2] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_camera::sauVariableValue_2_DISTANCE_NEAR_FAR[2] = {
8, 9,
};
@@ -686,15 +686,15 @@ JStudio::TAdaptor_fog::~TAdaptor_fog() {}
JStudio::TObject_fog::TObject_fog(JStudio::stb::data::TParse_TBlock_object const& param_0,
JStudio::TAdaptor_fog* param_1) : TObject(param_0, param_1) {}
u32 const JStudio::TAdaptor_fog::sauVariableValue_3_COLOR_RGB[3] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_fog::sauVariableValue_3_COLOR_RGB[3] = {
0, 1, 2,
};
u32 const JStudio::TAdaptor_fog::sauVariableValue_4_COLOR_RGBA[4] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_fog::sauVariableValue_4_COLOR_RGBA[4] = {
0, 1, 2, 3,
};
u32 const JStudio::TAdaptor_fog::sauVariableValue_2_RANGE_BEGIN_END[2] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_fog::sauVariableValue_2_RANGE_BEGIN_END[2] = {
4, 5,
};
@@ -759,23 +759,23 @@ JStudio::TAdaptor_light::~TAdaptor_light() {}
JStudio::TObject_light::TObject_light(JStudio::stb::data::TParse_TBlock_object const& param_0,
JStudio::TAdaptor_light* param_1) : TObject(param_0, param_1) {}
u32 const JStudio::TAdaptor_light::sauVariableValue_2_DIRECTION_THETA_PHI[2] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_light::sauVariableValue_2_DIRECTION_THETA_PHI[2] = {
10, 11,
};
u32 const JStudio::TAdaptor_light::sauVariableValue_3_COLOR_RGB[3] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_light::sauVariableValue_3_COLOR_RGB[3] = {
0, 1, 2,
};
u32 const JStudio::TAdaptor_light::sauVariableValue_4_COLOR_RGBA[4] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_light::sauVariableValue_4_COLOR_RGBA[4] = {
0, 1, 2, 3,
};
u32 const JStudio::TAdaptor_light::sauVariableValue_3_POSITION_XYZ[3] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_light::sauVariableValue_3_POSITION_XYZ[3] = {
4, 5, 6,
};
u32 const JStudio::TAdaptor_light::sauVariableValue_3_TARGET_POSITION_XYZ[3] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_light::sauVariableValue_3_TARGET_POSITION_XYZ[3] = {
7, 8, 9,
};
@@ -921,31 +921,31 @@ JStudio::TAdaptor_particle::~TAdaptor_particle() {}
JStudio::TObject_particle::TObject_particle(
JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_particle* param_1) : TObject(param_0, param_1) {}
u32 const JStudio::TAdaptor_particle::sauVariableValue_3_TRANSLATION_XYZ[3] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_particle::sauVariableValue_3_TRANSLATION_XYZ[3] = {
0, 1, 2,
};
u32 const JStudio::TAdaptor_particle::sauVariableValue_3_ROTATION_XYZ[3] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_particle::sauVariableValue_3_ROTATION_XYZ[3] = {
3, 4, 5,
};
u32 const JStudio::TAdaptor_particle::sauVariableValue_3_SCALING_XYZ[3] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_particle::sauVariableValue_3_SCALING_XYZ[3] = {
6, 7, 8,
};
u32 const JStudio::TAdaptor_particle::sauVariableValue_3_COLOR_RGB[3] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_particle::sauVariableValue_3_COLOR_RGB[3] = {
9, 10, 11,
};
u32 const JStudio::TAdaptor_particle::sauVariableValue_4_COLOR_RGBA[4] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_particle::sauVariableValue_4_COLOR_RGBA[4] = {
9, 10, 11, 12,
};
u32 const JStudio::TAdaptor_particle::sauVariableValue_3_COLOR1_RGB[3] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_particle::sauVariableValue_3_COLOR1_RGB[3] = {
9, 10, 11,
};
u32 const JStudio::TAdaptor_particle::sauVariableValue_4_COLOR1_RGBA[4] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_particle::sauVariableValue_4_COLOR1_RGBA[4] = {
9, 10, 11, 12,
};
@@ -1119,7 +1119,7 @@ JStudio::TAdaptor_sound::~TAdaptor_sound() {}
JStudio::TObject_sound::TObject_sound(JStudio::stb::data::TParse_TBlock_object const& param_0,
JStudio::TAdaptor_sound* param_1) : TObject(param_0, param_1) {}
u32 const JStudio::TAdaptor_sound::sauVariableValue_3_POSITION_XYZ[3] = {
DUSK_GAME_DATA u32 const JStudio::TAdaptor_sound::sauVariableValue_3_POSITION_XYZ[3] = {
0, 1, 2,
};
libs/JSystem/src/JStudio/JStudio/stb-data.cpp
+2 -2
View File
@@ -2,5 +2,5 @@
#include "dusk/endian.h"
#include "JSystem/JStudio/JStudio/stb-data.h"
const s32 JStudio::stb::data::gauDataSize_TEParagraph_data[8] = {0x0, 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40};
const BE(u32) JStudio::stb::data::ga4cSignature = 'STB\0';
DUSK_GAME_DATA const s32 JStudio::stb::data::gauDataSize_TEParagraph_data[8] = {0x0, 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40};
DUSK_GAME_DATA const BE(u32) JStudio::stb::data::ga4cSignature = 'STB\0';
libs/JSystem/src/JStudio/JStudio_JAudio2/object-sound.cpp
+1 -1
View File
@@ -80,7 +80,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_prepare() {
}
}
JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_ JStudio_JAudio2::TAdaptor_sound::saoVVOSetValue_[6] = {
DUSK_GAME_DATA JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_ JStudio_JAudio2::TAdaptor_sound::saoVVOSetValue_[6] = {
JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_(
JStudio_JAudio2::TAdaptor_sound::UNK_7, setValue_VOLUME_
),
libs/JSystem/src/JStudio/JStudio_JStage/object-actor.cpp
+2 -2
View File
@@ -348,12 +348,12 @@ JStudio_JStage::TAdaptor_actor::TVVOutput_ANIMATION_FRAME_::~TVVOutput_ANIMATION
namespace JStudio_JStage {
const TAdaptor_actor::TVVOutputObject TAdaptor_actor::saoVVOutput_[] = {
DUSK_GAME_DATA const TAdaptor_actor::TVVOutputObject TAdaptor_actor::saoVVOutput_[] = {
TVVOutputObject(TAdaptor_actor::TEACTOR_1, &JStage::TActor::JSGSetAnimationTransition, &JStage::TActor::JSGGetAnimationTransition),
TVVOutputObject()
};
const TAdaptor_actor::TVVOutput_ANIMATION_FRAME_ TAdaptor_actor::saoVVOutput_ANIMATION_FRAME_[] = {
DUSK_GAME_DATA const TAdaptor_actor::TVVOutput_ANIMATION_FRAME_ TAdaptor_actor::saoVVOutput_ANIMATION_FRAME_[] = {
TVVOutput_ANIMATION_FRAME_(0, 305, &JStage::TActor::JSGSetAnimationFrame, &JStage::TActor::JSGGetAnimationFrame, &JStage::TActor::JSGGetAnimationFrameMax),
TVVOutput_ANIMATION_FRAME_(2, 309, &JStage::TActor::JSGSetTextureAnimationFrame, &JStage::TActor::JSGGetTextureAnimationFrame, &JStage::TActor::JSGGetTextureAnimationFrameMax),
TVVOutput_ANIMATION_FRAME_()
libs/JSystem/src/JStudio/JStudio_JStage/object-camera.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ JStudio_JStage::TAdaptor_camera::~TAdaptor_camera() {
adaptor_do_end();
}
JStudio_JStage::TAdaptor_camera::TVVOutput JStudio_JStage::TAdaptor_camera::saoVVOutput_[5] = {
DUSK_GAME_DATA JStudio_JStage::TAdaptor_camera::TVVOutput JStudio_JStage::TAdaptor_camera::saoVVOutput_[5] = {
TVVOutput(JStudio_JStage::TAdaptor_camera::TECAMERA_7, &JStage::TCamera::JSGSetViewRoll,
&JStage::TCamera::JSGGetViewRoll),
TVVOutput(JStudio_JStage::TAdaptor_camera::TECAMERA_6, &JStage::TCamera::JSGSetProjectionFovy,
libs/JSystem/src/JStudio/JStudio_JStage/object-fog.cpp
+1 -1
View File
@@ -13,7 +13,7 @@ JStudio_JStage::TAdaptor_fog::~TAdaptor_fog() {
adaptor_do_end();
}
JStudio_JStage::TVariableValueOutput_object_<JStudio_JStage::TAdaptor_fog, JStage::TFog> JStudio_JStage::TAdaptor_fog::saoVVOutput_[3] = {
DUSK_GAME_DATA JStudio_JStage::TVariableValueOutput_object_<JStudio_JStage::TAdaptor_fog, JStage::TFog> JStudio_JStage::TAdaptor_fog::saoVVOutput_[3] = {
JStudio_JStage::TVariableValueOutput_object_<JStudio_JStage::TAdaptor_fog, JStage::TFog>(JStudio_JStage::TAdaptor_fog::TEFOG_4, &JStage::TFog::JSGSetStartZ, &JStage::TFog::JSGGetStartZ),
JStudio_JStage::TVariableValueOutput_object_<JStudio_JStage::TAdaptor_fog, JStage::TFog>(JStudio_JStage::TAdaptor_fog::TEFOG_5, &JStage::TFog::JSGSetEndZ, &JStage::TFog::JSGGetEndZ),
JStudio_JStage::TVariableValueOutput_object_<JStudio_JStage::TAdaptor_fog, JStage::TFog>(),
libs/JSystem/src/JStudio/JStudio_JStage/object-light.cpp
+1 -1
View File
@@ -12,7 +12,7 @@ JStudio_JStage::TAdaptor_light::~TAdaptor_light() {
adaptor_do_end();
}
JStudio_JStage::TAdaptor_light::TVVOutput_direction_
DUSK_GAME_DATA JStudio_JStage::TAdaptor_light::TVVOutput_direction_
JStudio_JStage::TAdaptor_light::saoVVOutput_direction_[6] = {
JStudio_JStage::TAdaptor_light::TVVOutput_direction_(
JStudio_JStage::TAdaptor_light::TE_VALUE_10,
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++) {