mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-10 10:43:41 -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
src/m_Do/m_Do_DVDError.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ const int stack_size = 3072;
const int stack_size = 8192;
#endif
bool mDoDvdErr_initialized;
DUSK_GAME_DATA bool mDoDvdErr_initialized;
static OSThread DvdErr_thread;
src/m_Do/m_Do_MemCard.cpp
+1 -1
View File
@@ -881,7 +881,7 @@ s32 mDoMemCd_Ctrl_c::checkspaceNAND() {
}
#endif
mDoMemCd_Ctrl_c g_mDoMemCd_control;
DUSK_GAME_DATA mDoMemCd_Ctrl_c g_mDoMemCd_control;
static int mDoMemCd_main(void*) {
JKRThread(OSGetCurrentThread(), 0);
src/m_Do/m_Do_Reset.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ static void destroyVideo() {
return;
}
mDoRstData* mDoRst::mResetData;
DUSK_GAME_DATA mDoRstData* mDoRst::mResetData;
void mDoRst_reset(int reset, u32 resetCode, int forceMenu) {
JUT_ASSERT(83, mDoExt_GetCurrentRunningThread() != 0);
src/m_Do/m_Do_audio.cpp
+4 -4
View File
@@ -19,11 +19,11 @@
#include <revolution/sc.h>
#endif
u8 mDoAud_zelAudio_c::mInitFlag;
DUSK_GAME_DATA u8 mDoAud_zelAudio_c::mInitFlag;
u8 mDoAud_zelAudio_c::mResetFlag;
DUSK_GAME_DATA u8 mDoAud_zelAudio_c::mResetFlag;
u8 mDoAud_zelAudio_c::mBgmSet;
DUSK_GAME_DATA u8 mDoAud_zelAudio_c::mBgmSet;
void mDoAud_zelAudio_c::reset() {
mBgmSet = false;
@@ -31,7 +31,7 @@ void mDoAud_zelAudio_c::reset() {
static mDoAud_zelAudio_c g_mDoAud_zelAudio;
JKRSolidHeap* g_mDoAud_audioHeap;
DUSK_GAME_DATA JKRSolidHeap* g_mDoAud_audioHeap;
static mDoDvdThd_toMainRam_c* l_affCommand;
src/m_Do/m_Do_controller_pad.cpp
+3 -3
View File
@@ -17,10 +17,10 @@
#include "dusk/ui/touch_controls.hpp"
#endif
JUTGamePad* mDoCPd_c::m_gamePad[4];
DUSK_GAME_DATA JUTGamePad* mDoCPd_c::m_gamePad[4];
interface_of_controller_pad mDoCPd_c::m_cpadInfo[4];
interface_of_controller_pad mDoCPd_c::m_debugCpadInfo[4];
DUSK_GAME_DATA interface_of_controller_pad mDoCPd_c::m_cpadInfo[4];
DUSK_GAME_DATA interface_of_controller_pad mDoCPd_c::m_debugCpadInfo[4];
void mDoCPd_c::create() {
#if PLATFORM_GCN || PLATFORM_SHIELD
src/m_Do/m_Do_dvd_thread.cpp
+5 -5
View File
@@ -31,11 +31,11 @@ s32 mDoDvdThd::main(void* param_0) {
return 0;
}
OSThread mDoDvdThd::l_thread;
DUSK_GAME_DATA OSThread mDoDvdThd::l_thread;
mDoDvdThdStack mDoDvdThd::l_threadStack;
DUSK_GAME_DATA mDoDvdThdStack mDoDvdThd::l_threadStack;
mDoDvdThd_param_c mDoDvdThd::l_param;
DUSK_GAME_DATA mDoDvdThd_param_c mDoDvdThd::l_param;
#if DEBUG
u8 mDoDvdThd::verbose;
@@ -48,10 +48,10 @@ const char* mDoDvdHack::FstStringStart;
u32 mDoDvdHack::MaxEntryNum;
mDoDvdHack::Manager mDoDvdHack::Manager::sManager;
#else
bool mDoDvdThd::SyncWidthSound;
DUSK_GAME_DATA bool mDoDvdThd::SyncWidthSound;
#endif
u8 sDefaultDirection;
DUSK_GAME_DATA u8 sDefaultDirection;
#pragma push
#pragma force_active on
src/m_Do/m_Do_ext.cpp
+13 -13
View File
@@ -27,9 +27,9 @@
#include "dusk/logging.h"
#include "dusk/frame_interpolation.h"
u8 mDoExt::CurrentHeapAdjustVerbose;
u8 mDoExt::HeapAdjustVerbose;
u8 mDoExt::HeapAdjustQuiet;
DUSK_GAME_DATA u8 mDoExt::CurrentHeapAdjustVerbose;
DUSK_GAME_DATA u8 mDoExt::HeapAdjustVerbose;
DUSK_GAME_DATA u8 mDoExt::HeapAdjustQuiet;
static void mDoExt_setJ3DData(Mtx mtx, const J3DTransformInfo* transformInfo, u16 param_2) {
bool local_28;
@@ -691,7 +691,7 @@ JKRExpHeap* mDoExt_getDbPrintHeap() {
return DbPrintHeap;
}
JKRExpHeap* gameHeap;
DUSK_GAME_DATA JKRExpHeap* gameHeap;
static intptr_t safeGameHeapSize = -1;
JKRExpHeap* mDoExt_createGameHeap(u32 heapSize, JKRHeap* parentHeap) {
@@ -724,8 +724,8 @@ size_t mDoExt_getSafeGameHeapSize() {
return safeGameHeapSize;
}
JKRExpHeap* zeldaHeap;
intptr_t safeZeldaHeapSize = -1;
DUSK_GAME_DATA JKRExpHeap* zeldaHeap;
DUSK_GAME_DATA intptr_t safeZeldaHeapSize = -1;
JKRExpHeap* mDoExt_createZeldaHeap(u32 heapSize, JKRHeap* parentHeap) {
JUT_ASSERT(1815, zeldaHeap == NULL || heapSize == 0);
@@ -758,8 +758,8 @@ intptr_t mDoExt_getSafeZeldaHeapSize() {
return safeZeldaHeapSize;
}
JKRExpHeap* commandHeap;
intptr_t safeCommandHeapSize = -1;
DUSK_GAME_DATA JKRExpHeap* commandHeap;
DUSK_GAME_DATA intptr_t safeCommandHeapSize = -1;
JKRExpHeap* mDoExt_createCommandHeap(u32 heapSize, JKRHeap* parentHeap) {
JUT_ASSERT(1894, commandHeap == 0 || heapSize == 0);
@@ -785,8 +785,8 @@ intptr_t mDoExt_getSafeCommandHeapSize() {
return safeCommandHeapSize;
}
JKRExpHeap* archiveHeap;
intptr_t safeArchiveHeapSize = -1;
DUSK_GAME_DATA JKRExpHeap* archiveHeap;
DUSK_GAME_DATA intptr_t safeArchiveHeapSize = -1;
JKRExpHeap* mDoExt_createArchiveHeap(u32 heapSize, JKRHeap* parentHeap) {
JUT_ASSERT(1966, archiveHeap == 0 || heapSize == 0);
@@ -824,7 +824,7 @@ JKRExpHeap* mDoExt_getArchiveHeapPtr() {
}
static JKRExpHeap* j2dHeap;
intptr_t safeJ2dHeapSize = -1;
DUSK_GAME_DATA intptr_t safeJ2dHeapSize = -1;
JKRExpHeap* mDoExt_createJ2dHeap(u32 heapSize, JKRHeap* parentHeap) {
JUT_ASSERT(2059, j2dHeap == 0 || heapSize == 0);
@@ -3850,7 +3850,7 @@ J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u3
return NULL;
}
DummyCheckHeap* dch;
DUSK_GAME_DATA DummyCheckHeap* dch;
DummyCheckHeap::DummyCheckHeap() {
mAlloc = NULL;
@@ -3958,7 +3958,7 @@ void DummyCheckHeap_check() {
}
}
u32 aram_cache_size;
DUSK_GAME_DATA u32 aram_cache_size;
u32 mDoExt_getAraCacheSize() {
return aram_cache_size;
src/m_Do/m_Do_graphic.cpp
+46 -46
View File
@@ -266,36 +266,36 @@ static ResTIMG* createTimg(u16 width, u16 height, u32 format) {
return timg;
}
JUTFader* mDoGph_gInf_c::mFader;
DUSK_GAME_DATA JUTFader* mDoGph_gInf_c::mFader;
#if PLATFORM_WII || PLATFORM_SHIELD || TARGET_PC
ResTIMG* mDoGph_gInf_c::m_fullFrameBufferTimg;
void* mDoGph_gInf_c::m_fullFrameBufferTex;
DUSK_GAME_DATA ResTIMG* mDoGph_gInf_c::m_fullFrameBufferTimg;
DUSK_GAME_DATA void* mDoGph_gInf_c::m_fullFrameBufferTex;
#endif
ResTIMG* mDoGph_gInf_c::mFrameBufferTimg;
DUSK_GAME_DATA ResTIMG* mDoGph_gInf_c::mFrameBufferTimg;
void* mDoGph_gInf_c::mFrameBufferTex;
DUSK_GAME_DATA void* mDoGph_gInf_c::mFrameBufferTex;
ResTIMG* mDoGph_gInf_c::mZbufferTimg;
DUSK_GAME_DATA ResTIMG* mDoGph_gInf_c::mZbufferTimg;
void* mDoGph_gInf_c::mZbufferTex;
DUSK_GAME_DATA void* mDoGph_gInf_c::mZbufferTex;
f32 mDoGph_gInf_c::mFadeRate;
DUSK_GAME_DATA f32 mDoGph_gInf_c::mFadeRate;
f32 mDoGph_gInf_c::mFadeSpeed;
DUSK_GAME_DATA f32 mDoGph_gInf_c::mFadeSpeed;
GXColor mDoGph_gInf_c::mBackColor = {0, 0, 0, 0};
DUSK_GAME_DATA GXColor mDoGph_gInf_c::mBackColor = {0, 0, 0, 0};
GXColor mDoGph_gInf_c::mFadeColor = {0, 0, 0, 0};
DUSK_GAME_DATA GXColor mDoGph_gInf_c::mFadeColor = {0, 0, 0, 0};
u8 mDoGph_gInf_c::mBlureFlag;
DUSK_GAME_DATA u8 mDoGph_gInf_c::mBlureFlag;
u8 mDoGph_gInf_c::mBlureRate;
DUSK_GAME_DATA u8 mDoGph_gInf_c::mBlureRate;
u8 mDoGph_gInf_c::mFade;
DUSK_GAME_DATA u8 mDoGph_gInf_c::mFade;
bool mDoGph_gInf_c::mAutoForcus;
DUSK_GAME_DATA bool mDoGph_gInf_c::mAutoForcus;
void mDoGph_gInf_c::create() {
#if PLATFORM_WII || PLATFORM_SHIELD
@@ -400,16 +400,16 @@ void mDoGph_gInf_c::onBlure() {
}
#if PLATFORM_WII || PLATFORM_SHIELD || TARGET_PC
TGXTexObj mDoGph_gInf_c::m_fullFrameBufferTexObj;
DUSK_GAME_DATA TGXTexObj mDoGph_gInf_c::m_fullFrameBufferTexObj;
#endif
TGXTexObj mDoGph_gInf_c::mFrameBufferTexObj;
DUSK_GAME_DATA TGXTexObj mDoGph_gInf_c::mFrameBufferTexObj;
TGXTexObj mDoGph_gInf_c::mZbufferTexObj;
DUSK_GAME_DATA TGXTexObj mDoGph_gInf_c::mZbufferTexObj;
mDoGph_gInf_c::bloom_c mDoGph_gInf_c::m_bloom;
DUSK_GAME_DATA mDoGph_gInf_c::bloom_c mDoGph_gInf_c::m_bloom;
Mtx mDoGph_gInf_c::mBlureMtx;
DUSK_GAME_DATA Mtx mDoGph_gInf_c::mBlureMtx;
#if !PLATFORM_GCN
cXyz mDoGph_gInf_c::csr_c::m_nowEffPos(0.0f, 0.0f, 0.0f);
@@ -524,15 +524,15 @@ void mDoGph_gInf_c::csr_c::particleExecute() {
#endif
#if WIDESCREEN_SUPPORT
u8 mDoGph_gInf_c::mWideZoom;
DUSK_GAME_DATA u8 mDoGph_gInf_c::mWideZoom;
int mDoGph_gInf_c::m_minX;
DUSK_GAME_DATA int mDoGph_gInf_c::m_minX;
int mDoGph_gInf_c::m_minY;
DUSK_GAME_DATA int mDoGph_gInf_c::m_minY;
f32 mDoGph_gInf_c::m_minXF;
DUSK_GAME_DATA f32 mDoGph_gInf_c::m_minXF;
f32 mDoGph_gInf_c::m_minYF;
DUSK_GAME_DATA f32 mDoGph_gInf_c::m_minYF;
#if PLATFORM_WII || PLATFORM_SHIELD
mDoGph_gInf_c::csr_c* mDoGph_gInf_c::m_baseCsr;
@@ -544,29 +544,29 @@ mDoGph_gInf_c::csr_c* mDoGph_gInf_c::m_csr;
JKRHeap* mDoGph_gInf_c::m_heap;
#endif
u8 mDoGph_gInf_c::mWide = 1;
DUSK_GAME_DATA u8 mDoGph_gInf_c::mWide = 1;
f32 mDoGph_gInf_c::m_aspect = 1.3571428f;
DUSK_GAME_DATA f32 mDoGph_gInf_c::m_aspect = 1.3571428f;
f32 mDoGph_gInf_c::m_scale = 1.0f;
DUSK_GAME_DATA f32 mDoGph_gInf_c::m_scale = 1.0f;
f32 mDoGph_gInf_c::m_invScale = 1.0f;
DUSK_GAME_DATA f32 mDoGph_gInf_c::m_invScale = 1.0f;
int mDoGph_gInf_c::m_maxX = FB_WIDTH_BASE - 1;
DUSK_GAME_DATA int mDoGph_gInf_c::m_maxX = FB_WIDTH_BASE - 1;
int mDoGph_gInf_c::m_maxY = FB_HEIGHT_BASE - 1;
DUSK_GAME_DATA int mDoGph_gInf_c::m_maxY = FB_HEIGHT_BASE - 1;
int mDoGph_gInf_c::m_width = FB_WIDTH_BASE;
DUSK_GAME_DATA int mDoGph_gInf_c::m_width = FB_WIDTH_BASE;
int mDoGph_gInf_c::m_height = FB_HEIGHT_BASE;
DUSK_GAME_DATA int mDoGph_gInf_c::m_height = FB_HEIGHT_BASE;
f32 mDoGph_gInf_c::m_maxXF = FB_WIDTH_BASE - 1;
DUSK_GAME_DATA f32 mDoGph_gInf_c::m_maxXF = FB_WIDTH_BASE - 1;
f32 mDoGph_gInf_c::m_maxYF = FB_HEIGHT_BASE - 1;
DUSK_GAME_DATA f32 mDoGph_gInf_c::m_maxYF = FB_HEIGHT_BASE - 1;
f32 mDoGph_gInf_c::m_widthF = FB_WIDTH_BASE;
DUSK_GAME_DATA f32 mDoGph_gInf_c::m_widthF = FB_WIDTH_BASE;
f32 mDoGph_gInf_c::m_heightF = FB_HEIGHT_BASE;
DUSK_GAME_DATA f32 mDoGph_gInf_c::m_heightF = FB_HEIGHT_BASE;
struct tvSize {
u16 width;
@@ -575,7 +575,7 @@ struct tvSize {
#ifndef TARGET_PC
const
#endif
tvSize l_tvSize[2] = {
DUSK_GAME_DATA tvSize l_tvSize[2] = {
{FB_WIDTH_BASE, FB_HEIGHT_BASE},
{808, FB_HEIGHT_BASE},
};
@@ -720,14 +720,14 @@ void mDoGph_gInf_c::setWideZoomLightProjection(Mtx& m) {
#endif
#if TARGET_PC
f32 mDoGph_gInf_c::hudAspectScaleDown = 1.0f;
f32 mDoGph_gInf_c::hudAspectScaleUp = 1.0f;
f32 mDoGph_gInf_c::m_safeMinXF = 0.0f;
f32 mDoGph_gInf_c::m_safeMinYF = 0.0f;
f32 mDoGph_gInf_c::m_safeMaxXF = FB_WIDTH_BASE;
f32 mDoGph_gInf_c::m_safeMaxYF = FB_HEIGHT_BASE;
f32 mDoGph_gInf_c::m_safeWidthF = FB_WIDTH_BASE;
f32 mDoGph_gInf_c::m_safeHeightF = FB_HEIGHT_BASE;
DUSK_GAME_DATA f32 mDoGph_gInf_c::hudAspectScaleDown = 1.0f;
DUSK_GAME_DATA f32 mDoGph_gInf_c::hudAspectScaleUp = 1.0f;
DUSK_GAME_DATA f32 mDoGph_gInf_c::m_safeMinXF = 0.0f;
DUSK_GAME_DATA f32 mDoGph_gInf_c::m_safeMinYF = 0.0f;
DUSK_GAME_DATA f32 mDoGph_gInf_c::m_safeMaxXF = FB_WIDTH_BASE;
DUSK_GAME_DATA f32 mDoGph_gInf_c::m_safeMaxYF = FB_HEIGHT_BASE;
DUSK_GAME_DATA f32 mDoGph_gInf_c::m_safeWidthF = FB_WIDTH_BASE;
DUSK_GAME_DATA f32 mDoGph_gInf_c::m_safeHeightF = FB_HEIGHT_BASE;
void mDoGph_gInf_c::updateSafeAreaBounds() {
m_safeMinXF = m_minXF;
src/m_Do/m_Do_lib.cpp
+3 -3
View File
@@ -38,11 +38,11 @@ u32 mDoLib_setResTimgObj(ResTIMG const* i_img, TGXTexObj* o_texObj, u32 tlut_nam
return i_img->indexTexture;
}
J3DUClipper mDoLib_clipper::mClipper;
DUSK_GAME_DATA J3DUClipper mDoLib_clipper::mClipper;
f32 mDoLib_clipper::mSystemFar;
DUSK_GAME_DATA f32 mDoLib_clipper::mSystemFar;
f32 mDoLib_clipper::mFovyRate;
DUSK_GAME_DATA f32 mDoLib_clipper::mFovyRate;
void mDoLib_clipper::setup(f32 fovy, f32 aspect, f32 near_, f32 far_) {
mClipper.setFovy(fovy);
src/m_Do/m_Do_machine.cpp
+4 -4
View File
@@ -73,7 +73,7 @@ u8 mDoMch::FpscrEnableBits;
u8 mDoMch::GXWarningLevel;
u8 mDoMch::GXWarningExecuteFrame;
#else
u8 mDoMch::mDebugFill;
DUSK_GAME_DATA u8 mDoMch::mDebugFill;
#endif
static int solidHeapErrors;
@@ -91,7 +91,7 @@ static int unknownHeapErrors;
static u32 heapErrors;
#if VERSION == VERSION_GCN_USA || VERSION == VERSION_GCN_JPN
GXRenderModeObj g_ntscZeldaIntDf = {
DUSK_GAME_DATA GXRenderModeObj g_ntscZeldaIntDf = {
VI_TVMODE_NTSC_INT,
608,
448,
@@ -118,7 +118,7 @@ GXRenderModeObj g_ntscZeldaIntDf = {
{8, 8, 10, 12, 10, 8, 8},
};
GXRenderModeObj g_ntscZeldaProg = {
DUSK_GAME_DATA GXRenderModeObj g_ntscZeldaProg = {
VI_TVMODE_NTSC_PROG,
608,
448,
@@ -277,7 +277,7 @@ GXRenderModeObj g_palZeldaProg60 = {
};
#endif
GXRenderModeObj* mDoMch_render_c::mRenderModeObj = &g_ntscZeldaIntDf;
DUSK_GAME_DATA GXRenderModeObj* mDoMch_render_c::mRenderModeObj = &g_ntscZeldaIntDf;
static const char* myGetHeapTypeByString(JKRHeap* p_heap) {
static char tmpString[5];
src/m_Do/m_Do_main.cpp
+16 -16
View File
@@ -112,11 +112,11 @@
#endif
// --- GLOBALS ---
s8 mDoMain::developmentMode = -1;
OSTime mDoMain::sPowerOnTime;
OSTime mDoMain::sHungUpTime;
u32 mDoMain::memMargin = 0xFFFFFFFF;
char mDoMain::COPYDATE_STRING[18] = "??/??/?? ??:??:??";
DUSK_GAME_DATA s8 mDoMain::developmentMode = -1;
DUSK_GAME_DATA OSTime mDoMain::sPowerOnTime;
DUSK_GAME_DATA OSTime mDoMain::sHungUpTime;
DUSK_GAME_DATA u32 mDoMain::memMargin = 0xFFFFFFFF;
DUSK_GAME_DATA char mDoMain::COPYDATE_STRING[18] = "??/??/?? ??:??:??";
#if TARGET_PC
const int audioHeapSize = 0x14D800 * 2;
#else
@@ -129,14 +129,14 @@ const int audioHeapSize = 0x14D800;
#define COPYDATE_PATH "/str/Final/Release/COPYDATE"
#if TARGET_PC
bool dusk::IsRunning = true;
bool dusk::IsShuttingDown = false;
bool dusk::IsGameLaunched = false;
bool dusk::RestartRequested = false;
uint8_t dusk::SaveRequested = 0;
dusk::StageRequest dusk::StageRequested = {"",false};
std::filesystem::path dusk::ConfigPath;
std::filesystem::path dusk::CachePath;
DUSK_GAME_DATA bool dusk::IsRunning = true;
DUSK_GAME_DATA bool dusk::IsShuttingDown = false;
DUSK_GAME_DATA bool dusk::IsGameLaunched = false;
DUSK_GAME_DATA bool dusk::RestartRequested = false;
DUSK_GAME_DATA uint8_t dusk::SaveRequested = 0;
DUSK_GAME_DATA dusk::StageRequest dusk::StageRequested = {"",false};
DUSK_GAME_DATA std::filesystem::path dusk::ConfigPath;
DUSK_GAME_DATA std::filesystem::path dusk::CachePath;
#endif
void dusk::RequestRestart() noexcept {
@@ -171,9 +171,9 @@ s32 LOAD_COPYDATE(void*) {
return 1;
}
AuroraInfo auroraInfo;
AuroraStats dusk::lastFrameAuroraStats;
float dusk::frameUsagePct = 0.0f;
DUSK_GAME_DATA AuroraInfo auroraInfo;
DUSK_GAME_DATA AuroraStats dusk::lastFrameAuroraStats;
DUSK_GAME_DATA float dusk::frameUsagePct = 0.0f;
bool launchUILoop() {
while (dusk::IsRunning && !dusk::IsGameLaunched) {
src/m_Do/m_Do_mtx.cpp
+5 -5
View File
@@ -12,19 +12,19 @@
#include "global.h"
#include "os_report.h"
Mtx mDoMtx_stack_c::now;
DUSK_GAME_DATA Mtx mDoMtx_stack_c::now;
Mtx mDoMtx_stack_c::buffer[16];
DUSK_GAME_DATA Mtx mDoMtx_stack_c::buffer[16];
Mtx* mDoMtx_stack_c::next = mDoMtx_stack_c::buffer;
DUSK_GAME_DATA Mtx* mDoMtx_stack_c::next = mDoMtx_stack_c::buffer;
Mtx* mDoMtx_stack_c::end = mDoMtx_stack_c::buffer + 16;
DUSK_GAME_DATA Mtx* mDoMtx_stack_c::end = mDoMtx_stack_c::buffer + 16;
static mDoMtx_stack_c mDoMtx_stack;
static mDoMtx_quatStack_c mDoMtx_quatStack;
Mtx g_mDoMtx_identity = {
DUSK_GAME_DATA Mtx g_mDoMtx_identity = {
{1.0f, 0.0f, 0.0f, 0.0f},
{0.0f, 1.0f, 0.0f, 0.0f},
{0.0f, 0.0f, 1.0f, 0.0f},