mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-10 12:55:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc fixes (#2830)

Browse Source 
* Replace DANPCF_C_HACK with a better fakematch

* d_a_obj_item OK

* Fix ninja diff

* Misc debug/nonmatching fixes

* Fix ninja diff for PAL

* Fix bad PAL split
This commit is contained in:
LagoLunatic
2025-11-19 17:10:03 -05:00
committed by GitHub
parent 8956be538e
commit 4cf2c7e37d
35 changed files with 187 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/J2DGraph/J2DWindowEx.cpp
+1 -4
View File
@@ -658,10 +658,7 @@ bool J2DWindowEx::setBlackWhite(JUtility::TColor black, JUtility::TColor white)
return false;
}
bool bVar1 = false;
if ((u32)black != 0 || (u32)white != 0xffffffff) {
bVar1 = true;
}
bool bVar1 = (u32)black != 0 || (u32)white != 0xffffffff;
u8 uVar3 = bVar1 ? 2 : 1;
for (int i = 0; i < 4; i++) {
mFrameMaterial[i]->getTevBlock()->setTevStageNum(uVar3);
src/JSystem/JAudio2/JASHeapCtrl.cpp
+1 -1
View File
@@ -118,7 +118,7 @@ bool JASHeap::free() {
JSUTreeIterator<JASHeap> stack_20;
for (JSUTreeIterator<JASHeap> it(mTree.getFirstChild()); it != mTree.getEndChild(); it = stack_20) {
stack_20 = it;
stack_20++;
++stack_20;
it->free();
}
JSUTree<JASHeap>* parentTree = mTree.getParent();
src/JSystem/JStudio/JStudio/fvb.cpp
+3 -3
View File
@@ -155,7 +155,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
JGADGET_WARNMSG(211, "unknown paragraph : " << u32Type);
}
pData = dat.next;
JUT_ASSERT(214, pData!=0);
JUT_ASSERT(214, pData!=NULL);
}
end:
JGADGET_ASSERTWARN(216, pData==pNext);
@@ -414,7 +414,7 @@ bool TParse::parseHeader_next(void const** ppData_inout, u32* puBlock_out, u32 f
ASSERT(puBlock_out != 0);
const void* pData = *ppData_inout;
ASSERT(pData != 0);
ASSERT(pData != NULL);
const data::TParse_THeader header(pData);
*ppData_inout = header.getContent();
@@ -449,7 +449,7 @@ bool TParse::parseBlock_next(void const** ppData_inout, u32* puData_out, u32 fla
ASSERT(puData_out != 0);
const void* pData = *ppData_inout;
ASSERT(pData != 0);
ASSERT(pData != NULL);
data::TParse_TBlock blk(pData);
*ppData_inout = blk.getNext();
*puData_out = blk.get_size();
src/JSystem/JStudio/JStudio/stb-data-parse.cpp
+2 -2
View File
@@ -14,7 +14,7 @@ namespace stb {
namespace data {
void TParse_TSequence::getData(TData* pData) const {
ASSERT(pData != 0);
ASSERT(pData != NULL);
pData->content = NULL;
pData->next = NULL;
@@ -35,7 +35,7 @@ void TParse_TSequence::getData(TData* pData) const {
}
void TParse_TParagraph::getData(TData* pData) const {
ASSERT(pData != 0);
ASSERT(pData != NULL);
const void* data = getRaw();
u32 result;
src/JSystem/JStudio/JStudio/stb.cpp
+30 -25
View File
@@ -198,29 +198,31 @@ void TObject::process_sequence_() {
switch (type) {
case 0:
JUT_EXPECT(u32Value == 0);
JUT_EXPECT(pContent == 0);
JUT_EXPECT(pContent == NULL);
break;
case 1:
JUT_EXPECT(pContent == 0);
JUT_EXPECT(pContent == NULL);
setFlag_operation_(u32Value);
break;
case 2:
JUT_EXPECT(pContent == 0);
JUT_EXPECT(pContent == NULL);
setWait(u32Value);
break;
case 3:
JUT_EXPECT(pContent == 0);
case 3: {
JUT_EXPECT(pContent == NULL);
s32 off = toInt32FromUInt24_(u32Value);
void* nextseq = (void*)getSequence_offset(off);
setSequence_next(nextseq);
break;
case 4:
JUT_EXPECT(pContent == 0);
}
case 4: {
JUT_EXPECT(pContent == NULL);
u32 val = toInt32FromUInt24_(u32Value);
suspend(val);
break;
case 0x80:
ASSERT(pContent != 0);
}
case 0x80: {
ASSERT(pContent != NULL);
void* p = (void*)pContent;
data::TParse_TParagraph para(NULL);
while (p < pNext) {
@@ -234,10 +236,11 @@ void TObject::process_sequence_() {
on_paragraph(para_dat.type, para_dat.content, para_dat.param);
}
p = (void*)para_dat.next;
ASSERT(p != 0);
ASSERT(p != NULL);
}
JUT_EXPECT(p == pNext);
break;
}
default:
JUTWarn w;
w << "unknown sequence : " << dat.type;
@@ -248,32 +251,34 @@ void TObject::process_sequence_() {
void TObject::process_paragraph_reserved_(u32 arg1, const void* pContent, u32 uSize) {
switch (arg1) {
case 0x1:
ASSERT(pContent != 0);
ASSERT(pContent != NULL);
ASSERT(uSize == 4);
setFlag_operation_(*(u32*)pContent);
break;
case 0x2:
ASSERT(pContent != 0);
ASSERT(pContent != NULL);
ASSERT(uSize == 4);
setWait(*(u32*)pContent);
break;
case 0x3:
ASSERT(pContent != 0);
case 0x3: {
ASSERT(pContent != NULL);
ASSERT(uSize == 4);
const void* seq = getSequence_offset(*(s32*)pContent);
setSequence_next(seq);
break;
}
case 0x80:
on_data(NULL, 0, pContent, uSize);
break;
case 0x81:
case 0x81: {
data::TParse_TParagraph_dataID dataID(pContent);
const void* temp = dataID.getContent();
on_data(dataID.get_ID(), dataID.get_IDSize(), temp,
uSize - ((uintptr_t)temp - (uintptr_t)dataID.getRaw()));
break;
}
case 0x82:
ASSERT(pContent != 0);
ASSERT(pContent != NULL);
break;
}
}
@@ -300,7 +305,7 @@ void TControl::appendObject(TObject* p) {
}
void TControl::removeObject(TObject* p) {
ASSERT(p != 0);
ASSERT(p != NULL);
ASSERT(p->getControl() == this);
p->setControl_(NULL);
mObjectContainer.Erase(p);
@@ -308,7 +313,7 @@ void TControl::removeObject(TObject* p) {
void TControl::destroyObject(TObject* p) {
removeObject(p);
ASSERT(pFactory != 0);
ASSERT(pFactory != NULL);
pFactory->destroy(p);
}
@@ -376,11 +381,11 @@ TParse::TParse(TControl* pControl) : pControl(pControl) {}
TParse::~TParse() {}
bool TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32 flags) {
ASSERT(ppData_inout != 0);
ASSERT(puBlock_out != 0);
ASSERT(ppData_inout != NULL);
ASSERT(puBlock_out != NULL);
const void* pData = *ppData_inout;
ASSERT(pData != 0);
ASSERT(pData != NULL);
const data::TParse_THeader header(pData);
*ppData_inout = header.getContent();
@@ -411,11 +416,11 @@ bool TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32 f
}
bool TParse::parseBlock_next(void const** ppData_inout, u32* puData_out, u32 flags) {
ASSERT(ppData_inout != 0);
ASSERT(puData_out != 0);
ASSERT(ppData_inout != NULL);
ASSERT(puData_out != NULL);
const void* pData = *ppData_inout;
ASSERT(pData != 0);
ASSERT(pData != NULL);
data::TParse_TBlock blk(pData);
*ppData_inout = blk.getNext();
@@ -433,7 +438,7 @@ bool TParse::parseBlock_block(const data::TParse_TBlock& ppBlock, u32 flags) {
bool TParse::parseBlock_object(const data::TParse_TBlock_object& ppObject, u32 flags) {
TControl* pControl = getControl();
ASSERT(pControl != 0);
ASSERT(pControl != NULL);
if (ppObject.get_type() == data::BLOCK_NONE) {
TObject_control& ref = pControl->referObject_control();