mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-08 20:24:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make it build with 100% Aurora dolphin headers

Browse Source
This commit is contained in:
PJB3005
2026-03-02 13:26:35 +01:00
parent ea890d4064
commit d762e1d8ec
16 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1
View File
@@ -64,6 +64,7 @@ target_include_directories(game_debug PUBLIC
src
assets/${DUSK_TP_VERSION}
libs/JSystem/include
extern/aurora/include/dolphin
${CMAKE_BINARY_DIR}/../${DUSK_TP_VERSION}/include
build/${DUSK_TP_VERSION}/include)
target_link_libraries(game_debug PUBLIC aurora::core aurora::gx aurora::si aurora::vi aurora::pad aurora::mtx)
include/m_Do/m_Do_dvd_thread.h
+3 -3
View File
@@ -149,9 +149,9 @@ struct mDoDvdThd {
namespace mDoDvdHack {
typedef struct FSTEntry {
/* 0x00 */ uint isDirAndStringOff;
/* 0x04 */ uint parentOrPosition;
/* 0x08 */ uint nextEntryOrLength;
/* 0x00 */ u32 isDirAndStringOff;
/* 0x04 */ u32 parentOrPosition;
/* 0x08 */ u32 nextEntryOrLength;
} FSTEntry;
extern OSBootInfo* BootInfo;
libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/control.h
+3 -3
View File
@@ -18,10 +18,10 @@
namespace JStudioCameraEditor {
struct TControl : public JORReflexible, public JOREventCallbackListNode {
struct TSWValueWidth_ {
TSWValueWidth_(uint, uint);
TSWValueWidth_(u32, u32);
/* 0x0 */ uint field_0x0;
/* 0x4 */ uint field_0x4;
/* 0x0 */ u32 field_0x0;
/* 0x4 */ u32 field_0x4;
};
struct TOptionSet_ : public csb::TValueSet {
libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/csb.h
+1 -1
View File
@@ -31,7 +31,7 @@ namespace JStudioCameraEditor {
void getVector_position_relativeTargetPosition(Vec*) const;
void setVector_targetPosition_relativePosition(const Vec&);
void addValue(data::TEValue, f32);
void set(const TValueSet&, uint);
void set(const TValueSet&, u32);
bool isApplied(data::TEValue) const;
/* 0x00 */ f32 fValue_[8];
libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/console.h
+12 -12
View File
@@ -22,24 +22,24 @@ namespace JStudioToolLibrary {
void control_enable(u32, bool);
void control_setStyle(u32, u32);
void control_generateRadioButton(JORMContext*, u32, const char*, const char*, int);
void control_generateSelectList(JORMContext*, u32, const char*, uint, const char*, int);
void control_generateSelectList(JORMContext*, u32, const char*, u32, const char*, int);
void control_generateLabel(JORMContext*, u32, const char*);
void control_getRadioButton(const JORValPrpEvent*);
void control_isCheckBox(const JORValPrpEvent*);
void control_getSelectList(const JORValPrpEvent*);
void control_generateEditBox_float(JORMContext*, u32, const char*, const f32&);
void control_generateEditBox_uint(JORMContext*, u32, const char*, const uint&);
void control_generateEditBox_uint(JORMContext*, u32, const char*, const u32&);
void control_generateTitle(JORMContext*, const char*) const;
void control_generateSeparator(JORMContext*, const char*);
void control_setCheckBox(u32, bool);
void control_generateRadioButton_style(JORMContext*, u32, u32, const char*, const char**, int);
void control_setRadioButton(u32, int);
void control_generateSelectList_style(JORMContext*, u32, u32, const char*, uint, const char**, int);
void control_generateSelectList_style(JORMContext*, u32, u32, const char*, u32, const char**, int);
void control_setSelectList(u32, int);
void control_generateLabel_style(JORMContext*, u32, u32, const char*);
void control_generateEditBox_style(JORMContext*, u32, u32, const char*, const char*);
void control_generateEditBox_style_int(JORMContext*, u32, u32, const char*, const int&);
void control_generateEditBox_style_uint(JORMContext*, u32, u32, const char*, const uint&);
void control_generateEditBox_style_uint(JORMContext*, u32, u32, const char*, const u32&);
void control_generateEditBox_style_float(JORMContext*, u32, u32, const char*, const f32&);
void control_generateEditBox_style_RGBA(JORMContext*, u32, u32, const char*, JUtility::TColor);
void control_generateEditBox_int(JORMContext*, u32, const char*, const int&);
@@ -47,11 +47,11 @@ namespace JStudioToolLibrary {
void control_setEditBox_f(u32, const char*, ...);
void control_setEditBox_f_va(u32, const char*, va_list);
void control_setEditBox_int(u32, const int&);
void control_setEditBox_uint(u32, const uint&);
void control_setEditBox_uint(u32, const u32&);
void control_setEditBox_float(u32, const f32&);
void control_setEditBox_RGBA(u32, const JUtility::TColor&);
void control_replyEditBox_int(const JORStrValPrpEvent*, int*);
void control_replyEditBox_uint(const JORStrValPrpEvent*, uint*);
void control_replyEditBox_uint(const JORStrValPrpEvent*, u32*);
void control_replyEditBox_float(const JORStrValPrpEvent*, f32*);
void control_replyEditBox_float_not(const JORStrValPrpEvent*, f32*, const f32&);
void control_replyEditBox_float_greaterEqual(const JORStrValPrpEvent*, f32*, const f32&);
@@ -59,23 +59,23 @@ namespace JStudioToolLibrary {
void control_forceEditBox(u32, const char*, const char*);
void control_replyEditBox_float_range(const JORStrValPrpEvent*, f32*, const f32&, const f32&);
void control_replyEditBox_uint_range(const JORStrValPrpEvent*, uint*, const uint&, const uint&);
void control_replyEditBox_uint_range(const JORStrValPrpEvent*, u32*, const u32&, const u32&);
bool parseValue_int(const char*, int*);
bool parseValue_uint(const char*, uint*);
bool parseValue_uint(const char*, u32*);
bool parseValue_float(const char*, f32*);
bool parseValue_double(const char*, double*);
bool parseValue_RGBA(const char*, JUtility::TColor*);
bool parseValueList_float(const char*, char, f32*, f32*);
int openMessageBox(uint, const char*);
int openMessageBox_f(uint, const char*, ...);
int openMessageBox_f_va(uint, const char*, va_list);
int openMessageBox(u32, const char*);
int openMessageBox_f(u32, const char*, ...);
int openMessageBox_f_va(u32, const char*, va_list);
bool openBrowser(const char*);
void toValue_style_(u32);
void getValueString_int(char*, u32, int);
void getValueString_uint(char*, u32, uint);
void getValueString_uint(char*, u32, u32);
void getValueString_float(char*, u32, f32);
void getValueString_RGBA(char*, u32, const JUtility::TColor&);
libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/controlset-preview.h
+1 -1
View File
@@ -14,7 +14,7 @@ namespace JStudioToolLibrary {
enum TEPreview {};
TControlSet_preview(TConsole*, u32, uint, TAdaptor*);
TControlSet_preview(TConsole*, u32, u32, TAdaptor*);
void preview_start();
void preview_stop();
libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/visual.h
+4 -4
View File
@@ -62,11 +62,11 @@ namespace JStudioToolLibrary {
void drawAxis_color();
void setGXState_position1x8_color1x8();
void drawAxis_color_arrow();
void drawGrid_xyz(uint);
void drawGrid_xyz(u32);
void setGXState_position3s16();
void drawGrid_xy(uint);
void drawGrid_xz(uint);
void drawGrid_yz(uint);
void drawGrid_xy(u32);
void drawGrid_xz(u32);
void drawGrid_yz(u32);
/* 0x0 */ f32 fLineWidth_;
/* 0x4 */ GXColor oColor_;
libs/JSystem/src/JHostIO/JHIMccBuf.cpp
+4
View File
@@ -3,7 +3,11 @@
#include "JSystem/JHostIO/JHIMccBuf.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JHostIO/JHIRMcc.h"
#if TARGET_PC
#include <dolphin/hio2.h>
#else
#include <revolution/hio2.h>
#endif
#include <cstring>
void JHIReport(const char* fmt, ...) {}
libs/JSystem/src/JHostIO/JHIRMcc.cpp
+4
View File
@@ -1,7 +1,11 @@
#include "JSystem/JSystem.h" // IWYU pragma: keep
#include "JSystem/JHostIO/JHIMccBuf.h"
#if TARGET_PC
#include <dolphin/hio2.h>
#else
#include <revolution/hio2.h>
#endif
HIO2DeviceType gExiDevice = HIO2_DEVICE_INVALID;
u8 data_8074bd04 = 1;
src/d/actor/d_a_mg_fish.cpp
+1 -1
View File
@@ -4061,7 +4061,7 @@ static actor_method_class l_daMg_Fish_Method = {
};
actor_process_profile_definition g_profile_MG_FISH = {
(uint)fpcLy_CURRENT_e, // mLayerID
(u32)fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_MG_FISH, // mProcName
src/d/actor/d_a_npc_hanjo.cpp
+1 -1
View File
@@ -199,7 +199,7 @@ int daNpc_Hanjo_c::create() {
mTwilight = 0;
int rv = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (rv == cPhs_COMPLEATE_e) {
OS_REPORT("\t(%s:%d) flowNo:%d, PathID:%02x<%08x> ", fopAcM_getProcNameString(this), (uint)mType,
OS_REPORT("\t(%s:%d) flowNo:%d, PathID:%02x<%08x> ", fopAcM_getProcNameString(this), (u32)mType,
mFlowNodeNo, getPathID(), fopAcM_GetParam(this));
if (isDelete()) {
OS_REPORT("===>isDelete:TRUE\n");
src/d/actor/d_a_obj_dmelevator.cpp
+1 -1
View File
@@ -609,7 +609,7 @@ int daObjDmElevator_c::moveProc() {
if (field_0x5e0 + (int)(char)field_0x5e1 == 1) {
const float fVar6 = current.pos.abs(path_point);
uVar1 = ((uint)(char)((fVar6 < 200.0f) << 3) << 0x1c) >> 0x1f;
uVar1 = ((u32)(char)((fVar6 < 200.0f) << 3) << 0x1c) >> 0x1f;
}
int ret;
src/d/actor/d_a_obj_hakai_ftr.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ static u32 const l_bmdIdx[3] = {4, 4, 4};
static u32 const l_dzbIdx[3] = {7, 7, 7};
int daObjHFtr_c::createHeap() {
uint nameId = getNameId();
u32 nameId = getNameId();
J3DModelData* a_model_data_p =
(J3DModelData*)dComIfG_getObjectRes(l_arcName[nameId], l_bmdIdx[nameId]);
src/dusk/stubs.cpp
+1 -1
View File
@@ -1713,7 +1713,7 @@ void dMsgObject_c::setSelectWord(int i_no, const char* i_word) {
#pragma mark HIO
#include <dolphin/hio.h>
#include <revolution/hio2.h>
#include <dolphin/hio2.h>
BOOL HIO2Close(s32 handle) {
STUB_LOG("HIO2Close is a stub");
return FALSE;
src/m_Do/m_Do_ext.cpp
+1 -1
View File
@@ -2700,7 +2700,7 @@ void mDoExt_3DlineMat1_c::draw() {
for (s32 i = 0; i < mNumLines; i++) {
GXSETARRAY(GX_VA_POS, ((mDoExt_3Dline_c*)((intptr_t)lines + (mIsDrawn << 2)))->field_0x8, vert_num * sizeof(cXyz), sizeof(cXyz));
GXSETARRAY(GX_VA_NRM, ((mDoExt_3Dline_c*)((intptr_t) lines + (mIsDrawn << 2)))->field_0x10, vert_num * sizeof(mDoExt_3Dline_field_0x10_c), sizeof(mDoExt_3Dline_field_0x10_c));
GXSETARRAY(GX_VA_TEX0, ((mDoExt_3Dline_c*)((intptr_t)lines + (mIsDrawn << 2)))->field_0x18, vert_num * sizeof(mDoExt_3Dline_field_0x18_c), sizeof(mDoExt_3Dline_field_0x18_c));
GXSETARRAY(GX_VA_TEX0, ((mDoExt_3Dline_c*)((intptr_t)lines + (mIsDrawn << 2)))->field_0x18, vert_num * sizeof(cXy), sizeof(cXy));
GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, vert_num);
u16 j = 0;
src/m_Do/m_Do_printf.cpp
+3
View File
@@ -7,6 +7,9 @@
#include <cstdio>
#include <base/PPCArch.h>
#include "m_Do/m_Do_ext.h"
#if TARGET_PC
#include <cstdarg>
#endif
u8 __OSReport_disable;