From 050ebb447137e7077903e208b41deccbf0ee23f6 Mon Sep 17 00:00:00 2001 From: Max Roncace Date: Thu, 29 Jan 2026 17:18:08 -0500 Subject: Add missing TUs for Wii/Shield retail (+ filename cleanup) (#3072) * Fix GCN_mem_alloc.c filename capitalization * Fix up TRK file names in Wii/Shield splits * Add string_TRK * Add cc_gdev * Add Shield-only wstring TUs * Implement NdevExi2A * Add missing JSystem TUs (more are still missing from ShieldD) * Clean up includes --- include/JSystem/J3DGraphAnimator/J3DJoint.h | 13 +++++- include/JSystem/J3DU/J3DUFur.h | 6 +++ include/JSystem/J3DU/J3DUMotion.h | 6 +++ include/JSystem/J3DU/J3DUShadow.h | 6 +++ include/JSystem/JAudio2/JAUAudience.h | 6 +++ include/JSystem/JAudio2/JAUSoundObject.h | 6 +++ include/NdevExi2A/DebuggerDriver.h | 54 ++++++++++++++++++++++ include/NdevExi2A/exi2.h | 34 ++++++++++++++ .../MetroTRK/Portable/string_TRK.h | 6 +++ include/odemuexi2/DebuggerDriver.h | 22 +++++++++ 10 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 include/JSystem/J3DU/J3DUFur.h create mode 100644 include/JSystem/J3DU/J3DUMotion.h create mode 100644 include/JSystem/J3DU/J3DUShadow.h create mode 100644 include/JSystem/JAudio2/JAUAudience.h create mode 100644 include/JSystem/JAudio2/JAUSoundObject.h create mode 100644 include/NdevExi2A/DebuggerDriver.h create mode 100644 include/NdevExi2A/exi2.h create mode 100644 include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/string_TRK.h create mode 100644 include/odemuexi2/DebuggerDriver.h (limited to 'include') diff --git a/include/JSystem/J3DGraphAnimator/J3DJoint.h b/include/JSystem/J3DGraphAnimator/J3DJoint.h index 4482e5d618..0a10f035be 100644 --- a/include/JSystem/J3DGraphAnimator/J3DJoint.h +++ b/include/JSystem/J3DGraphAnimator/J3DJoint.h @@ -43,7 +43,10 @@ public: virtual void init(const Vec& param_0, const Mtx&) = 0; virtual void calc() = 0; - static J3DMtxBuffer* getMtxBuffer() { return mMtxBuffer; } + static J3DMtxBuffer* getMtxBuffer() { + J3D_ASSERT_NULLPTR(174, mMtxBuffer != NULL) + return mMtxBuffer; + } static J3DJoint* getJoint() { J3D_ASSERT_NULLPTR(185, mJoint != NULL) return mJoint; @@ -234,4 +237,12 @@ struct J3DMtxCalcCalcTransformBasic { static void calcTransform(J3DTransformInfo const&); }; +inline s32 checkScaleOne(const Vec& param_0) { + if (param_0.x == 1.0f && param_0.y == 1.0f && param_0.z == 1.0f) { + return true; + } else { + return false; + } +} + #endif /* J3DJOINT_H */ diff --git a/include/JSystem/J3DU/J3DUFur.h b/include/JSystem/J3DU/J3DUFur.h new file mode 100644 index 0000000000..1d54b1cce9 --- /dev/null +++ b/include/JSystem/J3DU/J3DUFur.h @@ -0,0 +1,6 @@ +#ifndef J3DUFUR_H +#define J3DUFUR_H + +// NONMATCHING + +#endif /* J3DUFUR_H */ diff --git a/include/JSystem/J3DU/J3DUMotion.h b/include/JSystem/J3DU/J3DUMotion.h new file mode 100644 index 0000000000..f2bd2d5dd1 --- /dev/null +++ b/include/JSystem/J3DU/J3DUMotion.h @@ -0,0 +1,6 @@ +#ifndef J3DUMOTION_H +#define J3DUMOTION_H + +// NONMATCHING + +#endif /* J3DUMOTION_H */ diff --git a/include/JSystem/J3DU/J3DUShadow.h b/include/JSystem/J3DU/J3DUShadow.h new file mode 100644 index 0000000000..fa6876829b --- /dev/null +++ b/include/JSystem/J3DU/J3DUShadow.h @@ -0,0 +1,6 @@ +#ifndef J3DUSHADOW_H +#define J3DUSHADOW_H + +// NONMATCHING + +#endif /* J3DUSHADOW_H */ diff --git a/include/JSystem/JAudio2/JAUAudience.h b/include/JSystem/JAudio2/JAUAudience.h new file mode 100644 index 0000000000..3ce3a105df --- /dev/null +++ b/include/JSystem/JAudio2/JAUAudience.h @@ -0,0 +1,6 @@ +#ifndef JAUAUDIENCE_H +#define JAUAUDIENCE_H + +// NONMATCHING + +#endif /* JAUAUDIENCE_H */ diff --git a/include/JSystem/JAudio2/JAUSoundObject.h b/include/JSystem/JAudio2/JAUSoundObject.h new file mode 100644 index 0000000000..76684eb251 --- /dev/null +++ b/include/JSystem/JAudio2/JAUSoundObject.h @@ -0,0 +1,6 @@ +#ifndef JAUSOUNDOBJECT_H +#define JAUSOUNDOBJECT_H + +// NONMATCHING + +#endif /* JAUSOUNDOBJECT_H */ diff --git a/include/NdevExi2A/DebuggerDriver.h b/include/NdevExi2A/DebuggerDriver.h new file mode 100644 index 0000000000..44cf7daad7 --- /dev/null +++ b/include/NdevExi2A/DebuggerDriver.h @@ -0,0 +1,54 @@ +#ifndef NDEVEXI2A_DEBUGGERDRIVER_H +#define NDEVEXI2A_DEBUGGERDRIVER_H + +#include +#include "types.h" + +typedef void (*MtrCallback)(s32, OSContext*); +typedef void (*IntrCallback)(s16, OSContext*); + +#include + +static u32 ODEMUGetSize(u32 mail); + +static void __DBMtrHandler(s32 param_0, OSContext* ctx); + +static void __DBIntrHandler(s16 param_0, OSContext* ctx); + +u8 __DBReadUSB_CSR(); + +void __DBReadMailbox(u32* out); + +void __DBCheckMailBox(void); + +BOOL __DBWriteMailbox(u32 val); + +BOOL __DBRead(u32 param_0, void* dst, u32 count); + +BOOL __DBWrite(u32 param_0, void* src, u32 count); + +void DBInitComm(u8** a, MtrCallback callback); + +void DBInitInterrupts(void); + +BOOL ODEMUIsValidMail(u32 mail); + +u32 DBQueryData(void); + +u32 ODEMUGetPage(u32 v); + +u32 ODEMUGetPc2NngcOffset(u32 v); + +BOOL DBRead(u32* buffer, s32 count); + +void __DBWaitForSendMail(); + +u32 ODEMUGenMailData(u32 v, u32 size); + +BOOL DBWrite(void* src, u32 size); + +void DBOpen(void); + +void DBClose(void); + +#endif /* NDEVEXI2A_DEBUGGERDRIVER_H */ diff --git a/include/NdevExi2A/exi2.h b/include/NdevExi2A/exi2.h new file mode 100644 index 0000000000..3781ab50d5 --- /dev/null +++ b/include/NdevExi2A/exi2.h @@ -0,0 +1,34 @@ +#ifndef NDEVEXI2A_EXI2_H +#define NDEVEXI2A_EXI2_H + +#include "types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +BOOL __EXI2Select(); + +BOOL __EXI2Deselect(); + +BOOL __EXI2Sync(); + +BOOL __EXI2Imm(u32* param_0, int width, int param_2); + +void __DBEXIInit(); + +BOOL __DBEXIReadReg(u32 param_0, void* dst, u32 param_2); + +BOOL __DBEXIWriteReg(u32 param_0, void* src, u32 width); + +BOOL __DBEXIReadRam(u32 param_0, void* dst, int count); + +BOOL __DBEXIWriteRam(u32 param_0, void* src, int count); + +u32 __EXISwap32(u32 v); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* NDEVEXI2A_EXI2_H */ diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/string_TRK.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/string_TRK.h new file mode 100644 index 0000000000..63714ad7d9 --- /dev/null +++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/string_TRK.h @@ -0,0 +1,6 @@ +#ifndef METROTRK_PORTABLE_STRING_TRK_H +#define METROTRK_PORTABLE_STRING_TRK_H + +int TRK_strlen(const char* str); + +#endif /* METROTRK_PORTABLE_STRING_TRK_H */ diff --git a/include/odemuexi2/DebuggerDriver.h b/include/odemuexi2/DebuggerDriver.h new file mode 100644 index 0000000000..b9a1ca2c1d --- /dev/null +++ b/include/odemuexi2/DebuggerDriver.h @@ -0,0 +1,22 @@ +#ifndef ODEMUEXI_DEBUGGERDRIVER_H +#define ODEMUEXI_DEBUGGERDRIVER_H + +#include "types.h" + +typedef void (*MTRCallbackType)(int); + +void DBInitComm(u8** a, MTRCallbackType b); + +void DBInitInterrupts(void); + +u32 DBQueryData(void); + +BOOL DBRead(u32* buffer, s32 count); + +BOOL DBWrite(void* src, u32 size); + +void DBOpen(void); + +void DBClose(void); + +#endif /* ODEMUEXI_DEBUGGERDRIVER_H */ -- cgit v1.2.3