mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-25 05:58:42 -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-15 01:08:32 -07:00
parent 0b23015ddb 0f2a00cd1f
commit 7766739df1
243 changed files with 2746 additions and 1741 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_movie_player.h
-6
View File
@@ -95,12 +95,6 @@ static void __THPAudioInitialize(THPAudioDecodeInfo* info, u8* ptr);
#define THP_TEXTURE_SET_COUNT 3
#endif
#if TARGET_PC
namespace dusk {
void MoviePlayerShutdown();
}
#endif
struct daMP_THPPlayer {
/* 0x000 */ DVDFileInfo fileInfo;
/* 0x03C */ THPHeader header;
include/d/actor/d_flower.h
+6 -6
View File
@@ -5,7 +5,7 @@
#include "SSystem/SComponent/c_xyz.h"
#if TARGET_PC
#include "dusk/batch.hpp"
#include "helpers/batch.hpp"
#endif
class cCcD_Obj;
@@ -112,11 +112,11 @@ public:
TGXTexObj mTexObj_l_J_Ohana00_64TEX;
TGXTexObj mTexObj_l_J_Ohana01_64128_0419TEX;
dusk::batch::LeafTemplate mTplHana00; // l_J_hana00DL
dusk::batch::LeafTemplate mTplHana00Cut; // l_J_hana00_cDL
dusk::batch::LeafTemplate mTplHana01; // l_J_hana01DL
dusk::batch::LeafTemplate mTplHana01Cut00; // l_J_hana01_c_00DL
dusk::batch::LeafTemplate mTplHana01Cut; // l_J_hana01_c_01DL
batch::LeafTemplate mTplHana00; // l_J_hana00DL
batch::LeafTemplate mTplHana00Cut; // l_J_hana00_cDL
batch::LeafTemplate mTplHana01; // l_J_hana01DL
batch::LeafTemplate mTplHana01Cut00; // l_J_hana01_c_00DL
batch::LeafTemplate mTplHana01Cut; // l_J_hana01_c_01DL
#endif
}; // Size: 0x12A54
include/d/actor/d_grass.h
+4 -4
View File
@@ -5,7 +5,7 @@
#include "SSystem/SComponent/c_xyz.h"
#if TARGET_PC
#include "../../../src/dusk/batch.hpp"
#include <helpers/batch.hpp>
#endif
class cCcD_Obj;
@@ -115,9 +115,9 @@ public:
TGXTexObj mTexObj_l_M_Hijiki00TEX;
TGXTexObj mTexObj_l_M_kusa05_RGBATEX;
dusk::batch::LeafTemplate mTplKusa9q; // l_M_Kusa_9qDL
dusk::batch::LeafTemplate mTplKusa9qCut; // l_M_Kusa_9q_cDL
dusk::batch::LeafTemplate mTplTengusa; // l_M_TenGusaDL
batch::LeafTemplate mTplKusa9q; // l_M_Kusa_9qDL
batch::LeafTemplate mTplKusa9qCut; // l_M_Kusa_9q_cDL
batch::LeafTemplate mTplTengusa; // l_M_TenGusaDL
#endif
}; // Size: 0x1D718
include/d/d_bg_w.h
+3 -3
View File
@@ -6,9 +6,9 @@
#include "d/d_bg_w_base.h"
#include <mtx.h>
#include <types.h>
#include "dusk/offset_ptr.h"
#include "dusk/endian.h"
#include "dusk/endian_ssystem.h"
#include "helpers/offset_ptr.h"
#include "helpers/endian.h"
#include "helpers/endian_ssystem.h"
class cBgS_GrpPassChk;
class cBgS_PolyPassChk;
include/d/d_bg_w_kcol.h
+1 -1
View File
@@ -6,7 +6,7 @@
#include "d/d_bg_plc.h"
#include "d/d_bg_s_sph_chk.h"
#include "d/d_bg_w_base.h"
#include "dusk/offset_ptr.h"
#include "helpers/offset_ptr.h"
class cBgS_GrpPassChk;
class cBgS_PolyPassChk;
include/d/d_com_inf_game.h
+18 -16
View File
@@ -17,8 +17,14 @@
#include "m_Do/m_Do_graphic.h"
#include <cstring>
#if TARGET_PC
#include "dusk/profiling.hpp"
#if defined(DUSK_BUILDING_GAME)
#include <tracy/Tracy.hpp>
#include "dusk/settings.h"
#else
#ifndef ZoneScoped
#define ZoneScoped
#define ZoneScopedN(name)
#endif
#endif
enum dComIfG_ButtonStatus {
@@ -4907,27 +4913,23 @@ inline void dComIfGd_drawXluListDark() {
g_dComIfG_gameInfo.drawlist.drawXluListDark();
}
#if TARGET_PC
void dComIfGd_drawXluListInvisible();
#else
inline void dComIfGd_drawXluListInvisible() {
ZoneScoped;
#ifdef TARGET_PC
if (!dusk::getSettings().game.disableWaterRefraction) {
#endif
g_dComIfG_gameInfo.drawlist.drawXluListInvisible();
#ifdef TARGET_PC
}
#endif
g_dComIfG_gameInfo.drawlist.drawXluListInvisible();
}
#endif
#if TARGET_PC
void dComIfGd_drawOpaListInvisible();
#else
inline void dComIfGd_drawOpaListInvisible() {
ZoneScoped;
#ifdef TARGET_PC
if (!dusk::getSettings().game.disableWaterRefraction) {
#endif
g_dComIfG_gameInfo.drawlist.drawOpaListInvisible();
#ifdef TARGET_PC
}
#endif
g_dComIfG_gameInfo.drawlist.drawOpaListInvisible();
}
#endif
inline void dComIfGd_drawXluListZxlu() {
ZoneScoped;
include/d/d_drawlist.h
+1 -1
View File
@@ -5,7 +5,7 @@
#include "JSystem/J2DGraph/J2DScreen.h"
#include "JSystem/J3DGraphBase/J3DSys.h"
#include "SSystem/SComponent/c_m3d_g_pla.h"
#include "dusk/gx_helper.h"
#include "helpers/gx_helper.h"
#include "f_op/f_op_view.h"
#include "global.h"
#include "m_Do/m_Do_ext.h"
include/d/d_event_data.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "global.h"
#include "f_pc/f_pc_base.h"
#include "dusk/endian.h"
#include "helpers/endian.h"
struct msg_class;
include/d/d_msg_class.h
+2 -2
View File
@@ -4,8 +4,8 @@
#include "JSystem/JMessage/control.h"
#include "JSystem/JMessage/JMessage.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dusk/endian.h"
#include "dusk/string.hpp"
#include "helpers/endian.h"
#include "helpers/string.hpp"
#if REGION_JPN
#define D_MSG_CLASS_PAGE_CNT_MAX 30
include/d/d_msg_flow.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define D_MSG_D_MSG_FLOW_H
#include <types.h>
#include "dusk/endian.h"
#include "helpers/endian.h"
enum {
NODETYPE_MESSAGE_e = 1,
include/d/d_save.h
+3 -3
View File
@@ -8,7 +8,7 @@
#include "d/d_item_data.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/JHostIO/JORReflexible.h"
#include "dusk/endian.h"
#include "helpers/endian.h"
#if TARGET_PC
#include <unordered_map>
@@ -522,7 +522,7 @@ public:
#endif
void setPlayerName(const char* i_name) {
#if AVOID_UB
dusk::SafeStringCopyTruncate(mPlayerName, i_name);
SafeStringCopyTruncate(mPlayerName, i_name);
#else
strcpy(mPlayerName, i_name);
#endif
@@ -534,7 +534,7 @@ public:
#endif
void setHorseName(const char* i_name) {
#if AVOID_UB
dusk::SafeStringCopyTruncate(mHorseName, i_name);
SafeStringCopyTruncate(mHorseName, i_name);
#else
strcpy(mHorseName, i_name);
#endif
include/d/d_stage.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "SSystem/SComponent/c_lib.h"
#include "d/d_kankyo.h"
#include "d/d_kankyo_data.h"
#include "dusk/offset_ptr.h"
#include "helpers/offset_ptr.h"
#include "f_op/f_op_actor_mng.h"
#include "global.h"
#include "os_report.h"
include/d/d_tresure.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define D_D_TRESURE_H
#include <mtx.h>
#include "dusk/offset_ptr.h"
#include "helpers/offset_ptr.h"
class dTres_c {
public:
include/d/dolzel.h
+1 -1
View File
@@ -8,7 +8,7 @@
#endif
#ifndef __MWERKS__
#include "dusk/math.h"
#include "helpers/math.h"
#endif
#endif // dolzel.h