mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-08 18:13:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into pjb-audio

Browse Source
This commit is contained in:
PJB3005
2026-03-25 16:43:59 +01:00
parent 3ad7e70963 acf3844f1f
commit 7ac96d0251
61 changed files with 1574 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/src/J3DGraphLoader/J3DModelLoader.cpp
+1 -1
View File
@@ -264,7 +264,7 @@ void J3DModelLoader::setupBBoardInfo() {
mpModelData->getJointNodePointer(i)->setMtxType(0);
break;
default:
OSReport("WRONG SHAPE MATRIX TYPE (__FILE__)\n");
OSReport("WRONG SHAPE MATRIX TYPE (%d)\n", r26->mShapeMtxType);
break;
}
}
libs/JSystem/src/JFramework/JFWSystem.cpp
-1
View File
@@ -45,7 +45,6 @@ void JFWSystem::firstInit() {
OSInit();
DVDInit();
rootHeap = JKRExpHeap::createRoot(CSetUpParam::maxStdHeaps, false);
JKRHEAP_NAME(rootHeap, "Root");
systemHeap = JKRExpHeap::create(CSetUpParam::sysHeapSize, rootHeap, false);
JKRHEAP_NAME(systemHeap, "System");
}
libs/JSystem/src/JKernel/JKRExpHeap.cpp
+1
View File
@@ -51,6 +51,7 @@ JKRExpHeap* JKRExpHeap::createRoot(int maxHeaps, bool errorFlag) {
#endif
heap = JKR_NEW_ARGS (mem1) JKRExpHeap(start1, alignedSize, NULL, errorFlag);
sRootHeap = heap;
JKRHEAP_NAME(sRootHeap, "Root");
}
heap->field_0x6e = true;
return heap;
libs/JSystem/src/JKernel/JKRHeap.cpp
+8
View File
@@ -699,6 +699,14 @@ void JKRHeap::setName(const char* name) {
strncpy(mName, name, sizeof(mName) - 1);
mName[sizeof(mName) - 1] = '\0';
}
void JKRHeap::setNamef(const char* fmt, ...) {
va_list args;
va_start(args, fmt);
vsnprintf(mName, sizeof(mName), fmt, args);
va_end(args);
}
const char* JKRHeap::getName() const {
return mName;
}
libs/JSystem/src/JStudio/JStudio/ctb-data.cpp
+1 -1
View File
@@ -2,4 +2,4 @@
#include "JSystem/JStudio/JStudio/ctb.h"
const u32 JStudio::ctb::data::ga4cSignature = 'CTB\0';
const u32 JStudio::ctb::data::ga4cSignature = BSWAP32('CTB\0');
libs/JSystem/src/JStudio/JStudio/ctb.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ JStudio::ctb::TObject* JStudio::ctb::TControl::getObject_index(u32 param_0) {
JStudio::ctb::TFactory::~TFactory() {}
JStudio::ctb::TObject* JStudio::ctb::TFactory::create(JStudio::ctb::data::TParse_TBlock const& param_0) {
switch(param_0.get_scheme()) {
switch(BSWAP16(param_0.get_scheme())) {
case 1:
return JKR_NEW TObject_TxyzRy(param_0);
default: