mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-07 02:10:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into 26-02-27-pjb-dev-2

Browse Source
This commit is contained in:
PJB3005
2026-03-01 15:08:52 +01:00
parent c24d2cf8cd b14eaf7a4c
commit 3750e7cfee
3940 changed files with 243894 additions and 20306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/m_Do/m_Do_MemCard.cpp
+1
View File
@@ -13,6 +13,7 @@
#if PLATFORM_WII || PLATFORM_SHIELD
#include <revolution/nand.h>
#include <revolution/sc.h>
#include <cstring>
#endif
#define SLOT_A 0
src/m_Do/m_Do_MemCardRWmng.cpp
+1
View File
@@ -9,6 +9,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_save.h"
#include <cstdio>
#include <cstring>
#if VERSION == VERSION_GCN_JPN
#define HEADER_TITLE "ゼルダの伝説 ﾄﾜｲﾗｲﾄﾌﾟﾘﾝｾｽ"
src/m_Do/m_Do_Reset.cpp
+1 -1
View File
@@ -99,7 +99,7 @@ void mDoRst_reset(int reset, u32 resetCode, int forceMenu) {
}
void checkDiskCallback(s32 result, DVDCommandBlock* block) {
block->userData = (void*)result;
block->userData = (void*)(intptr_t)result;
}
void mDoRst_resetCallBack(int port, void*) {
src/m_Do/m_Do_audio.cpp
+1 -1
View File
@@ -8,13 +8,13 @@
#include "JSystem/JKernel/JKRMemArchive.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "JSystem/JUtility/JUTConsole.h"
#include "Z2AudioLib/Z2AudioCS.h"
#include "d/d_com_inf_game.h"
#include "d/d_debug_viewer.h"
#include "m_Do/m_Do_Reset.h"
#include "m_Do/m_Do_dvd_thread.h"
#if PLATFORM_WII || PLATFORM_SHIELD
#include "Z2AudioCS/Z2AudioCS.h"
#include <revolution/sc.h>
#endif
src/m_Do/m_Do_ext.cpp
+2 -1
View File
@@ -23,6 +23,7 @@
#include "m_Do/m_Do_main.h"
#include "m_Do/m_Do_mtx.h"
#include <cstdio>
#include <cstring>
u8 mDoExt::CurrentHeapAdjustVerbose;
u8 mDoExt::HeapAdjustVerbose;
@@ -3716,7 +3717,7 @@ J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u3
bool hasSharedDlistObj =
i_modelData->getMaterialNodePointer(0)->getSharedDisplayListObj() != NULL;
// Update the modelFlag if the model data passed in has a shared dlist object
if (hasSharedDlistObj != NULL) {
if (hasSharedDlistObj != false) {
if (i_modelData->isLocked()) {
i_modelFlag = J3DMdlFlag_UseSharedDL;
} else if (i_modelFlag == J3DMdlFlag_UseSharedDL) {
src/m_Do/m_Do_ext2.cpp
+1
View File
@@ -2,6 +2,7 @@
#include "d/dolzel.h" // IWYU pragma: keep
#include "m_Do/m_Do_ext2.h"
#include <cstring>
FixedMemoryCheck* FixedMemoryCheck::sFirst;
src/m_Do/m_Do_graphic.cpp
+9
View File
@@ -33,6 +33,7 @@
#include "d/d_meter2_info.h"
#include "d/d_s_play.h"
#include "DynamicLink.h"
#include <cstring>
#include "dusk/endian.h"
#if PLATFORM_WII || PLATFORM_SHIELD
@@ -680,6 +681,14 @@ void mDoGph_gInf_c::entryBaseCsr(mDoGph_gInf_c::csr_c* i_entry) {
m_baseCsr = i_entry;
m_csr = i_entry;
}
void mDoGph_gInf_c::entryCsr(mDoGph_gInf_c::csr_c* i_csr) {
m_csr = i_csr;
}
void mDoGph_gInf_c::releaseCsr(void) {
m_csr = m_baseCsr;
}
#endif
void mDoGph_BlankingON() {}
src/m_Do/m_Do_lib.cpp
+20
View File
@@ -118,6 +118,26 @@ void mDoLib_pos2camera(Vec* src, Vec* dst) {
cMtx_multVec(dComIfGd_getView()->viewMtx, src, dst);
}
#if PLATFORM_WII
void mDoLib_2Dto3D(f32 i_x, f32 i_y, f32 i_z, Vec* o_dst) {
if (dComIfGd_getView() == NULL) {
o_dst->x = 0.0f;
o_dst->y = 0.0f;
o_dst->z = 0.0f;
return;
}
f32 fovy = dComIfGd_getView()->fovy;
f32 aspect = dComIfGd_getView()->aspect;
f32 temp_f3 = tan(DEG_TO_RAD(0.5f * fovy));
Vec sp8;
sp8.x = (-i_x * i_z) * (temp_f3 * aspect);
sp8.y = (i_y * -i_z) * temp_f3;
sp8.z = -i_z;
PSMTXMultVec(dComIfGd_getInvViewMtx(), &sp8, o_dst);
}
#endif
static void dummy() {
std::tan(0.0f);
J3DAlphaComp* alphaComp = NULL;
src/m_Do/m_Do_machine.cpp
+1 -1
View File
@@ -586,7 +586,7 @@ static void fault_callback_scroll(u16, OSContext* p_context, u32, u32) {
JUTException* manager = JUTException::getManager();
JUTConsole* exConsole = manager->getConsole();
u32 srr0 = p_context->srr0 & -4;
uintptr_t srr0 = p_context->srr0 & -4;
if (srr0 >= 0x8000000C && srr0 < 0x82FFFFFF) {
exConsole->print_f("(SRR0-3):%08X %08X %08X %08X\n", *(u32*)(srr0 - 0xC),
*(u32*)(srr0 - 0x8), *(u32*)(srr0 - 0x4), *(u32*)srr0);
src/m_Do/m_Do_main.cpp
+53 -47
View File
@@ -6,9 +6,10 @@
#include "m_Do/m_Do_main.h"
#include <dolphin/vi.h>
#include <string>
#include <cstring>
#include "DynamicLink.h"
#include "JSystem/JAudio2/JASAudioThread.h"
#include "JSystem/JAudio2/JAUSectionHeap.h"
#include "JSystem/JAudio2/JAUSoundTable.h"
#include "JSystem/JFramework/JFWSystem.h"
#include "JSystem/JHostIO/JORServer.h"
@@ -36,6 +37,9 @@
#include "m_Do/m_Do_graphic.h"
#include "m_Do/m_Do_machine.h"
#include "m_Do/m_Do_printf.h"
#include "m_Do/m_Do_ext2.h"
#include "SSystem/SComponent/c_counter.h"
#include <cstring>
#include <chrono>
#include <thread>
@@ -268,71 +272,73 @@ JHIComPortManager<T>* JHIComPortManager<T>::instance = nullptr;
template <>
JHIComPortManager<JHICmnMem>* JHIComPortManager<JHICmnMem>::instance = nullptr;
template <>
Z2WolfHowlMgr* JASGlobalInstance<Z2WolfHowlMgr>::sInstance;
#ifdef __MWERKS__
template<>
Z2WolfHowlMgr* JASGlobalInstance<Z2WolfHowlMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
Z2EnvSeMgr* JASGlobalInstance<Z2EnvSeMgr>::sInstance;
template<>
Z2EnvSeMgr* JASGlobalInstance<Z2EnvSeMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
Z2FxLineMgr* JASGlobalInstance<Z2FxLineMgr>::sInstance;
template<>
Z2FxLineMgr* JASGlobalInstance<Z2FxLineMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
Z2Audience* JASGlobalInstance<Z2Audience>::sInstance;
template<>
Z2Audience* JASGlobalInstance<Z2Audience>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
Z2SoundObjMgr* JASGlobalInstance<Z2SoundObjMgr>::sInstance;
template<>
Z2SoundObjMgr* JASGlobalInstance<Z2SoundObjMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
Z2SoundInfo* JASGlobalInstance<Z2SoundInfo>::sInstance;
template<>
Z2SoundInfo* JASGlobalInstance<Z2SoundInfo>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
JAUSoundInfo* JASGlobalInstance<JAUSoundInfo>::sInstance;
template<>
JAUSoundInfo* JASGlobalInstance<JAUSoundInfo>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
JAUSoundNameTable* JASGlobalInstance<JAUSoundNameTable>::sInstance;
template<>
JAUSoundNameTable* JASGlobalInstance<JAUSoundNameTable>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
JAUSoundTable* JASGlobalInstance<JAUSoundTable>::sInstance;
template<>
JAUSoundTable* JASGlobalInstance<JAUSoundTable>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
JAISoundInfo* JASGlobalInstance<JAISoundInfo>::sInstance;
template<>
JAISoundInfo* JASGlobalInstance<JAISoundInfo>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
Z2SoundMgr* JASGlobalInstance<Z2SoundMgr>::sInstance;
template<>
Z2SoundMgr* JASGlobalInstance<Z2SoundMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
JAIStreamMgr* JASGlobalInstance<JAIStreamMgr>::sInstance;
template<>
JAIStreamMgr* JASGlobalInstance<JAIStreamMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
JAISeqMgr* JASGlobalInstance<JAISeqMgr>::sInstance;
template<>
JAISeqMgr* JASGlobalInstance<JAISeqMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
JAISeMgr* JASGlobalInstance<JAISeMgr>::sInstance;
template<>
JAISeMgr* JASGlobalInstance<JAISeMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
Z2SpeechMgr2* JASGlobalInstance<Z2SpeechMgr2>::sInstance;
template<>
Z2SpeechMgr2* JASGlobalInstance<Z2SpeechMgr2>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
Z2SoundStarter* JASGlobalInstance<Z2SoundStarter>::sInstance;
template<>
Z2SoundStarter* JASGlobalInstance<Z2SoundStarter>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
JAISoundStarter* JASGlobalInstance<JAISoundStarter>::sInstance;
template<>
JAISoundStarter* JASGlobalInstance<JAISoundStarter>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
Z2StatusMgr* JASGlobalInstance<Z2StatusMgr>::sInstance;
template<>
Z2StatusMgr* JASGlobalInstance<Z2StatusMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
Z2SceneMgr* JASGlobalInstance<Z2SceneMgr>::sInstance;
template<>
Z2SceneMgr* JASGlobalInstance<Z2SceneMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
Z2SeqMgr* JASGlobalInstance<Z2SeqMgr>::sInstance;
template<>
Z2SeqMgr* JASGlobalInstance<Z2SeqMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
Z2SeMgr* JASGlobalInstance<Z2SeMgr>::sInstance;
template<>
Z2SeMgr* JASGlobalInstance<Z2SeMgr>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
JASAudioThread* JASGlobalInstance<JASAudioThread>::sInstance;
template<>
JASAudioThread* JASGlobalInstance<JASAudioThread>::sInstance JAS_GLOBAL_INSTANCE_INIT;
template <>
JASDefaultBankTable* JASGlobalInstance<JASDefaultBankTable>::sInstance;
template<>
JASDefaultBankTable* JASGlobalInstance<JASDefaultBankTable>::sInstance JAS_GLOBAL_INSTANCE_INIT;
#endif // __MWERKS__
src/m_Do/m_Re_controller_pad.cpp
-350
View File
@@ -1,350 +0,0 @@
#include "m_Do/m_Re_controller_pad.h"
#include "Z2AudioLib/Z2AudioCS.h"
mReCPd::Pad mReCPd::m_pad[4];
WPADInfo mReCPd::m_pad_info[4];
void mReCPd::Pad::Acc::clean() {
}
void mReCPd::Pad::Acc::changeStts(u32, bool) {
}
void mReCPd::Pad::Acc::calcSwingVec() {
}
void mReCPd::Pad::Acc::calcSttsRem() {
}
void mReCPd::Pad::Acc::calcSttsFs() {
}
void mReCPd::Pad::clean() {
}
void mReCPd::Pad::cleanOneTime() {
}
void mReCPd::Pad::copyRemAcc() {
}
void mReCPd::Pad::copyFSAcc() {
}
void mReCPd::Pad::cleanTrig() {
m_remAcc.m_swing = 0;
m_FSAcc.m_swing = 0;
for (int i = 0; i < 10; i++) {
field_0x4[i].trig = 0;
}
}
void mReCPd::Pad::cleanHold() {
for (int i = 0; i < 10; i++) {
field_0x4[i].hold = 0;
}
}
void mReCPd::Pad::cleanRelease() {
for (int i = 0; i < 10; i++) {
field_0x4[i].release = 0;
}
}
void mReCPd::Pad::clearUpDown() {
}
void mReCPd::Pad::calcDpdBox(Vec2*, Vec2*, f32, f32) {
}
void mReCPd::Pad::calcDpdOld() {
}
void mReCPd::enableDpd(u32 param_0) {
KPADEnableDPD(param_0);
}
void mReCPd::disableDpd(u32 param_0) {
KPADDisableDPD(param_0);
}
void mReCPd::Pad::calcDpd2DPos() {
}
void mReCPd::Pad::calcDpdRatioPos() {
}
void mReCPd::Pad::calcDpdPlayCirPos() {
}
void mReCPd::Pad::calcDpdPlayBoxPos() {
}
void mReCPd::onConnect(u32 i_padNo) {
m_pad[i_padNo].field_0x1dd4 = 1;
m_pad[i_padNo].field_0x1e04 = 1;
}
static void l_mReCPd_extensionCallback(s32 i_padNo, s32 param_1) {
Z2AudioCS::extensionProcess(i_padNo, param_1);
mReCPd::m_pad[i_padNo].field_0x1dec = param_1;
mReCPd::m_pad[i_padNo].field_0x1df0 = 1;
}
void mReCPd::setExtensionCallback() {
WPADSetExtensionCallback(0, l_mReCPd_extensionCallback);
}
void mReCPd::onGetInfoAsync(u32 i_padNo) {
m_pad[i_padNo].field_0x1ddd = 1;
m_pad[i_padNo].field_0x1de0 = 1800;
}
void mReCPd::create() {
}
void mReCPd::startMoterWave(motorWave_t*, u8*, bool) {
}
void mReCPd::startMoterWave(int, u8*, bool) {
}
void mReCPd::stopMoterWave(motorWave_t*) {
}
void mReCPd::stopMoterWave(int) {
}
void mReCPd::updateMoterWave() {
}
void mReCPd::stopMoter() {
}
void mReCPd::getLowBat(u32) {
}
void mReCPd::setLowBat(u32, int) {
}
void mReCPd::onLowBatChk(u32) {
}
void mReCPd::procNoData(u32) {
}
void mReCPd::read() {
}
void mReCPd::calibrateDist(int) {
}
void mReCPd::getDpd2DPos(u32) {
}
void mReCPd::getDpdRatioPos(u32) {
}
void mReCPd::getDpdRatioBoxPos(u32) {
}
void mReCPd::chkDpdOk(u32) {
}
void mReCPd::chkDpdValid(u32) {
}
void mReCPd::chkDpdPosIn(u32) {
}
void mReCPd::getKPADAcc(u32, Vec*, int) {
}
void mReCPd::getAngleXy(u32) {
}
void mReCPd::getAngleZy(u32) {
}
void mReCPd::getKPADAccValue(u32, int) {
}
void mReCPd::getKPADAccValueMax(u32) {
}
void mReCPd::getKPADAccSpeed(u32, int) {
}
void mReCPd::getKPADAccSpeedMax(u32) {
}
void mReCPd::getKPADFsAccValue(u32, int) {
}
void mReCPd::getKPADFsAccValueMax(u32) {
}
s16 mReCPd::getFSStickAngle3DRev(u32) {
}
void mReCPd::calcUnderVec(Pad::Acc*, f32) {
}
u32 mReCPd::getHoldB(u32 i_padNo) {
return m_pad[i_padNo].field_0x4[0].hold & WPAD_BUTTON_B;
}
u32 mReCPd::getHoldMinus(u32 i_padNo) {
if (chkSwingBlock(i_padNo)) {
return 0;
} else {
return m_pad[i_padNo].field_0x4[0].hold & WPAD_BUTTON_MINUS;
}
}
u32 mReCPd::getHoldPlus(u32 i_padNo) {
if (chkSwingBlock(i_padNo)) {
return 0;
} else {
return m_pad[i_padNo].field_0x4[0].hold & WPAD_BUTTON_PLUS;
}
}
u32 mReCPd::getHoldZ1(u32 i_padNo) {
return m_pad[i_padNo].field_0x4[0].hold & WPAD_BUTTON_Z;
}
u32 mReCPd::getTrigB(u32 i_padNo) {
return m_pad[i_padNo].field_0x4[0].trig & WPAD_BUTTON_B;
}
u32 mReCPd::getTrigMinus(u32 i_padNo) {
if (chkSwingBlock(i_padNo)) {
return 0;
} else {
return m_pad[i_padNo].field_0x4[0].trig & WPAD_BUTTON_MINUS;
}
}
u32 mReCPd::getTrigHome(u32 i_padNo) {
if (chkSwingBlock(i_padNo)) {
return 0;
} else {
return m_pad[i_padNo].field_0x4[0].trig & WPAD_BUTTON_HOME;
}
}
u32 mReCPd::getTrigPlus(u32 i_padNo) {
if (chkSwingBlock(i_padNo)) {
return 0;
} else {
return m_pad[i_padNo].field_0x4[0].trig & WPAD_BUTTON_PLUS;
}
}
u32 mReCPd::getTrigZ1(u32 i_padNo) {
return m_pad[i_padNo].field_0x4[0].trig & WPAD_BUTTON_Z;
}
u32 mReCPd::chkSwingBlock(u32 i_padNo) {
return m_pad[i_padNo].m_swingBlock > 0;
}
u32 mReCPd::getTrigSwing(u32 i_padNo) {
return m_pad[i_padNo].m_remAcc.m_swing;
}
Vec2& mReCPd::getSwingVec(u32 i_padNo) {
return m_pad[i_padNo].m_remAcc.m_swingVec;
}
u32 mReCPd::chkSimpleProbe(u32 i_padNo) {
if (m_pad[i_padNo].field_0x1dd4 == 0) {
return 0;
} else if (m_pad[i_padNo].field_0x1dfc + 3 <= 2) {
return 0;
} else if (m_pad[i_padNo].field_0x1df8 == 0xFD || m_pad[i_padNo].field_0x1df8 == 0xFF) {
return 0;
} else {
return 1;
}
}
BOOL mReCPd::chkDevTypeValid(u32 i_padNo) {
if (!chkSimpleProbe(i_padNo)) {
return FALSE;
}
if (m_pad[i_padNo].field_0x1df4 < 20 && m_pad[i_padNo].field_0x1de4 == 0xFF && m_pad[i_padNo].field_0x1de8 != 0) {
return FALSE;
}
return TRUE;
}
u32 mReCPd::getFSTrigSwing(u32 i_padNo) {
return m_pad[i_padNo].m_FSAcc.m_swing;
}
int mReCPd::m_cal_value;
void mReCPd::plusCalValue() {
m_cal_value++;
if (m_cal_value >= 2) {
m_cal_value = 2;
}
}
void mReCPd::minusCalValue() {
m_cal_value--;
if (m_cal_value <= -2) {
m_cal_value = -2;
}
}