mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-01 15:59:45 -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
include/m_Do/m_Do_MemCard.h
+1 -1
View File
@@ -130,7 +130,7 @@ STATIC_ASSERT(sizeof(mDoMemCd_Ctrl_c) == 8192);
static int mDoMemCd_main(void*);
extern mDoMemCd_Ctrl_c g_mDoMemCd_control;
DUSK_GAME_EXTERN mDoMemCd_Ctrl_c g_mDoMemCd_control;
inline bool mDoMemCd_isCardCommNone() {
return g_mDoMemCd_control.isCardCommNone();
include/m_Do/m_Do_Reset.h
+2 -2
View File
@@ -54,9 +54,9 @@ public:
static mDoRstData* getResetData() { return mResetData; }
static void setResetData(mDoRstData* rstData) { mResetData = rstData; }
static mDoRstData* mResetData;
static DUSK_GAME_DATA mDoRstData* mResetData;
};
extern bool mDoDvdErr_initialized;
DUSK_GAME_EXTERN bool mDoDvdErr_initialized;
#endif /* M_DO_M_DO_RESET_H */
include/m_Do/m_Do_audio.h
+4 -4
View File
@@ -33,12 +33,12 @@ public:
static void onBgmSet() { mBgmSet = true; }
static void offBgmSet() { mBgmSet = false; }
static u8 mInitFlag;
static u8 mResetFlag;
static u8 mBgmSet;
static DUSK_GAME_DATA u8 mInitFlag;
static DUSK_GAME_DATA u8 mResetFlag;
static DUSK_GAME_DATA u8 mBgmSet;
};
extern JKRSolidHeap* g_mDoAud_audioHeap;
DUSK_GAME_EXTERN JKRSolidHeap* g_mDoAud_audioHeap;
void mDoAud_Execute();
void mDoAud_resetProcess();
include/m_Do/m_Do_controller_pad.h
+3 -3
View File
@@ -93,9 +93,9 @@ public:
static void stopMotorHard(u32 pad) { return m_gamePad[pad]->stopMotorHard(); }
static void stopMotorWaveHard(u32 pad) { return m_gamePad[pad]->stopMotorWaveHard(); }
static JUTGamePad* m_gamePad[4];
static interface_of_controller_pad m_cpadInfo[4];
static interface_of_controller_pad m_debugCpadInfo[4];
static DUSK_GAME_DATA JUTGamePad* m_gamePad[4];
static DUSK_GAME_DATA interface_of_controller_pad m_cpadInfo[4];
static DUSK_GAME_DATA interface_of_controller_pad m_debugCpadInfo[4];
};
inline void mDoCPd_ANALOG_CONV(u8 analog, f32& param_1) {
include/m_Do/m_Do_dvd_thread.h
+5 -5
View File
@@ -142,13 +142,13 @@ struct mDoDvdThd {
static void create(s32);
static void suspend();
static OSThread l_thread;
static mDoDvdThdStack l_threadStack;
static mDoDvdThd_param_c l_param;
static DUSK_GAME_DATA OSThread l_thread;
static DUSK_GAME_DATA mDoDvdThdStack l_threadStack;
static DUSK_GAME_DATA mDoDvdThd_param_c l_param;
static u8 verbose;
static u8 DVDLogoMode;
static bool SyncWidthSound;
static DUSK_GAME_DATA u8 DVDLogoMode;
static DUSK_GAME_DATA bool SyncWidthSound;
static u8 Report_DVDRead;
};
include/m_Do/m_Do_ext.h
+9 -9
View File
@@ -19,9 +19,9 @@ class Z2Creature;
struct cXy;
namespace mDoExt {
extern u8 CurrentHeapAdjustVerbose;
extern u8 HeapAdjustVerbose;
extern u8 HeapAdjustQuiet;
DUSK_GAME_EXTERN u8 CurrentHeapAdjustVerbose;
DUSK_GAME_EXTERN u8 HeapAdjustVerbose;
DUSK_GAME_EXTERN u8 HeapAdjustQuiet;
};
class mDoExt_baseAnm {
@@ -840,7 +840,7 @@ void mDoExt_modelUpdateDL(J3DModel* i_model);
J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag,
u32 i_differedDlistFlag);
extern u32 aram_cache_size;
DUSK_GAME_EXTERN u32 aram_cache_size;
u32 mDoExt_getAraCacheSize();
void mDoExt_setAraCacheSize(u32 size);
@@ -889,10 +889,10 @@ int DummyCheckHeap_isVirgin();
void DummyCheckHeap_check();
extern JKRExpHeap* zeldaHeap;
extern JKRExpHeap* gameHeap;
extern JKRExpHeap* archiveHeap;
extern JKRExpHeap* commandHeap;
extern DummyCheckHeap* dch;
DUSK_GAME_EXTERN JKRExpHeap* zeldaHeap;
DUSK_GAME_EXTERN JKRExpHeap* gameHeap;
DUSK_GAME_EXTERN JKRExpHeap* archiveHeap;
DUSK_GAME_EXTERN JKRExpHeap* commandHeap;
DUSK_GAME_EXTERN DummyCheckHeap* dch;
#endif /* M_DO_M_DO_EXT_H */
include/m_Do/m_Do_graphic.h
+45 -45
View File
@@ -123,8 +123,8 @@ public:
static void waitBlanking(int wait) { JFWDisplay::getManager()->waitBlanking(wait); }
#if TARGET_PC
static f32 hudAspectScaleDown;
static f32 hudAspectScaleUp;
static DUSK_GAME_DATA f32 hudAspectScaleDown;
static DUSK_GAME_DATA f32 hudAspectScaleUp;
static void updateSafeAreaBounds();
static f32 getSafeMinXF() { return m_safeMinXF; }
static f32 getSafeMinYF() { return m_safeMinYF; }
@@ -302,23 +302,23 @@ public:
static void updateRenderSize();
#endif
static TGXTexObj mFrameBufferTexObj;
static TGXTexObj mZbufferTexObj;
static bloom_c m_bloom;
static Mtx mBlureMtx;
static GXColor mBackColor;
static GXColor mFadeColor;
static JUTFader* mFader;
static ResTIMG* mFrameBufferTimg;
static void* mFrameBufferTex;
static ResTIMG* mZbufferTimg;
static void* mZbufferTex;
static f32 mFadeRate;
static f32 mFadeSpeed;
static u8 mBlureFlag;
static u8 mBlureRate;
static u8 mFade;
static bool mAutoForcus;
static DUSK_GAME_DATA TGXTexObj mFrameBufferTexObj;
static DUSK_GAME_DATA TGXTexObj mZbufferTexObj;
static DUSK_GAME_DATA bloom_c m_bloom;
static DUSK_GAME_DATA Mtx mBlureMtx;
static DUSK_GAME_DATA GXColor mBackColor;
static DUSK_GAME_DATA GXColor mFadeColor;
static DUSK_GAME_DATA JUTFader* mFader;
static DUSK_GAME_DATA ResTIMG* mFrameBufferTimg;
static DUSK_GAME_DATA void* mFrameBufferTex;
static DUSK_GAME_DATA ResTIMG* mZbufferTimg;
static DUSK_GAME_DATA void* mZbufferTex;
static DUSK_GAME_DATA f32 mFadeRate;
static DUSK_GAME_DATA f32 mFadeSpeed;
static DUSK_GAME_DATA u8 mBlureFlag;
static DUSK_GAME_DATA u8 mBlureRate;
static DUSK_GAME_DATA u8 mFade;
static DUSK_GAME_DATA bool mAutoForcus;
#if PLATFORM_SHIELD
static JKRHeap* getHeap() {
@@ -333,9 +333,9 @@ public:
#endif
#if PLATFORM_WII || PLATFORM_SHIELD || TARGET_PC
static ResTIMG* m_fullFrameBufferTimg;
static void* m_fullFrameBufferTex;
static TGXTexObj m_fullFrameBufferTexObj;
static DUSK_GAME_DATA ResTIMG* m_fullFrameBufferTimg;
static DUSK_GAME_DATA void* m_fullFrameBufferTex;
static DUSK_GAME_DATA TGXTexObj m_fullFrameBufferTexObj;
#endif
#if PLATFORM_WII || PLATFORM_SHIELD
@@ -350,35 +350,35 @@ public:
#endif
#if WIDESCREEN_SUPPORT
static u8 mWide;
static u8 mWideZoom;
static DUSK_GAME_DATA u8 mWide;
static DUSK_GAME_DATA u8 mWideZoom;
static f32 m_aspect;
static f32 m_scale;
static f32 m_invScale;
static DUSK_GAME_DATA f32 m_aspect;
static DUSK_GAME_DATA f32 m_scale;
static DUSK_GAME_DATA f32 m_invScale;
static f32 m_minXF;
static f32 m_minYF;
static int m_minX;
static int m_minY;
static DUSK_GAME_DATA f32 m_minXF;
static DUSK_GAME_DATA f32 m_minYF;
static DUSK_GAME_DATA int m_minX;
static DUSK_GAME_DATA int m_minY;
static f32 m_maxXF;
static f32 m_maxYF;
static int m_maxX;
static int m_maxY;
static DUSK_GAME_DATA f32 m_maxXF;
static DUSK_GAME_DATA f32 m_maxYF;
static DUSK_GAME_DATA int m_maxX;
static DUSK_GAME_DATA int m_maxY;
static int m_width;
static int m_height;
static f32 m_heightF;
static f32 m_widthF;
static DUSK_GAME_DATA int m_width;
static DUSK_GAME_DATA int m_height;
static DUSK_GAME_DATA f32 m_heightF;
static DUSK_GAME_DATA f32 m_widthF;
#if TARGET_PC
static f32 m_safeMinXF;
static f32 m_safeMinYF;
static f32 m_safeMaxXF;
static f32 m_safeMaxYF;
static f32 m_safeWidthF;
static f32 m_safeHeightF;
static DUSK_GAME_DATA f32 m_safeMinXF;
static DUSK_GAME_DATA f32 m_safeMinYF;
static DUSK_GAME_DATA f32 m_safeMaxXF;
static DUSK_GAME_DATA f32 m_safeMaxYF;
static DUSK_GAME_DATA f32 m_safeWidthF;
static DUSK_GAME_DATA f32 m_safeHeightF;
#endif
#endif
};
include/m_Do/m_Do_lib.h
+3 -3
View File
@@ -37,9 +37,9 @@ struct mDoLib_clipper {
mClipper.calcViewFrustum();
}
static J3DUClipper mClipper;
static f32 mSystemFar;
static f32 mFovyRate;
static DUSK_GAME_DATA J3DUClipper mClipper;
static DUSK_GAME_DATA f32 mSystemFar;
static DUSK_GAME_DATA f32 mFovyRate;
};
void mDoLib_project(Vec* src, Vec* dst);
include/m_Do/m_Do_machine.h
+3 -3
View File
@@ -19,7 +19,7 @@ int mDoMch_Create();
void mDoMch_Destroy();
#endif
extern GXRenderModeObj g_ntscZeldaProg;
DUSK_GAME_EXTERN GXRenderModeObj g_ntscZeldaProg;
class mDoMch_render_c {
public:
@@ -30,11 +30,11 @@ public:
static GXRenderModeObj* getRenderModeObj() { return mRenderModeObj; }
static GXRenderModeObj* mRenderModeObj;
static DUSK_GAME_DATA GXRenderModeObj* mRenderModeObj;
};
namespace mDoMch {
extern u8 mDebugFill;
DUSK_GAME_EXTERN u8 mDebugFill;
extern u8 mDebugFillNotUse;
extern u8 mDebugFillNew;
extern u8 mDebugFillDelete;
include/m_Do/m_Do_main.h
+7 -7
View File
@@ -6,12 +6,12 @@
class JKRExpHeap;
extern OSThread mainThread;
DUSK_GAME_EXTERN OSThread mainThread;
void version_check();
s32 LOAD_COPYDATE(void*);
extern OSThread mainThread;
DUSK_GAME_EXTERN OSThread mainThread;
const int HeapCheckTableNum = 8;
class HeapCheck {
@@ -70,11 +70,11 @@ struct mDoMain {
static u32 archiveHeapSize;
static u32 gameHeapSize;
static char COPYDATE_STRING[18];
static u32 memMargin;
static OSTime sPowerOnTime;
static OSTime sHungUpTime;
static s8 developmentMode;
static DUSK_GAME_DATA char COPYDATE_STRING[18];
static DUSK_GAME_DATA u32 memMargin;
static DUSK_GAME_DATA OSTime sPowerOnTime;
static DUSK_GAME_DATA OSTime sHungUpTime;
static DUSK_GAME_DATA s8 developmentMode;
};
#endif /* M_DO_M_DO_MAIN_H */
include/m_Do/m_Do_mtx.h
+6 -6
View File
@@ -9,7 +9,7 @@
#include "dusk/endian.h"
extern u8 g_printCurrentHeapDebug;
extern u8 g_printOtherHeapDebug;
DUSK_GAME_EXTERN u8 g_printOtherHeapDebug;
void mDoMtx_XYZrotS(Mtx, s16, s16, s16);
void mDoMtx_XYZrotM(Mtx, s16, s16, s16);
@@ -373,13 +373,13 @@ public:
PSMTXIdentity(now);
}
static Mtx now;
static Mtx buffer[16];
static Mtx* next;
static Mtx* end;
static DUSK_GAME_DATA Mtx now;
static DUSK_GAME_DATA Mtx buffer[16];
static DUSK_GAME_DATA Mtx* next;
static DUSK_GAME_DATA Mtx* end;
};
extern Mtx g_mDoMtx_identity;
DUSK_GAME_EXTERN Mtx g_mDoMtx_identity;
inline MtxP mDoMtx_getIdentity() {
return g_mDoMtx_identity;