mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-07 13:23:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use NULL macro in asserts, fix NULL macro to match

Browse Source
This commit is contained in:
LagoLunatic
2024-06-22 11:07:16 -04:00
parent c836c5ca1f
commit f9d40ebad8
159 changed files with 462 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JFramework/JFWSystem.h
+6 -6
View File
@@ -34,27 +34,27 @@ struct JFWSystem {
static JKRExpHeap* getSystemHeap() { return systemHeap; }
static JUTResFont* getSystemFont() { return systemFont; }
static void setMaxStdHeap(int max) {
JUT_ASSERT(47, sInitCalled == 0);
JUT_ASSERT(47, sInitCalled == FALSE);
CSetUpParam::maxStdHeaps = max;
}
static void setSysHeapSize(u32 size) {
JUT_ASSERT(50, sInitCalled == 0);
JUT_ASSERT(50, sInitCalled == FALSE);
CSetUpParam::sysHeapSize = size;
}
static void setFifoBufSize(u32 size) {
JUT_ASSERT(53, sInitCalled == 0);
JUT_ASSERT(53, sInitCalled == FALSE);
CSetUpParam::fifoBufSize = size;
}
static void setAramAudioBufSize(u32 size) {
JUT_ASSERT(58, sInitCalled == 0);
JUT_ASSERT(58, sInitCalled == FALSE);
CSetUpParam::aramAudioBufSize = size;
}
static void setAramGraphBufSize(u32 size) {
JUT_ASSERT(61, sInitCalled == 0);
JUT_ASSERT(61, sInitCalled == FALSE);
CSetUpParam::aramGraphBufSize = size;
}
static void setRenderMode(GXRenderModeObj* p_modeObj) {
JUT_ASSERT(80, sInitCalled == 0);
JUT_ASSERT(80, sInitCalled == FALSE);
CSetUpParam::renderMode = p_modeObj;
}
include/d/d_demo.h
+2 -2
View File
@@ -52,11 +52,11 @@ public:
void JSGSetTextureAnimation(u32);
void JSGSetTextureAnimationFrame(f32);
s32 JSGFindNodeID(const char* name) const {
JUT_ASSERT(0x4d, mModel != 0);
JUT_ASSERT(0x4d, mModel != NULL);
return mModel->getModelData()->getJointName()->getIndex(name);
}
int JSGGetNodeTransformation(u32 no, Mtx dst) const {
JUT_ASSERT(0x52, mModel != 0);
JUT_ASSERT(0x52, mModel != NULL);
cMtx_copy(mModel->getAnmMtx((u16)no), dst);
return 1;
}
src/JSystem/JAudio/JASBNKParser.cpp
+8 -8
View File
@@ -32,7 +32,7 @@ JASystem::TBasicBank* JASystem::BNKParser::createBasicBank(void* stream) {
TInst* instRaw = JSUConvertOffsetToPtr<TInst>(header, header->mInstOffsets[i]);
if (instRaw != NULL) {
TBasicInst* instp = new (heap, 0) TBasicInst();
JUT_ASSERT(56, instp != 0);
JUT_ASSERT(56, instp != NULL);
instp->field_0x4 = instRaw->field_0x8;
instp->field_0x8 = instRaw->field_0xC;
@@ -43,14 +43,14 @@ JASystem::TBasicBank* JASystem::BNKParser::createBasicBank(void* stream) {
TOscillator::Osc_* osc = findOscPtr(bank, header, oscRaw);
if (osc == NULL) {
osc = new (heap, 0) TOscillator::Osc_();
JUT_ASSERT(72, osc != 0);
JUT_ASSERT(72, osc != NULL);
osc->field_0x0 = oscRaw->field_0x0;
osc->field_0x4 = oscRaw->field_0x4;
s16* oscTable = JSUConvertOffsetToPtr<s16>(header, oscRaw->field_0x8);
if (oscTable != NULL) {
s32 tableLength = getOscTableEndPtr(oscTable) - oscTable;
osc->table = new (heap, 0) s16[tableLength];
JUT_ASSERT(82, osc->table != 0);
JUT_ASSERT(82, osc->table != NULL);
Calc::bcopy(oscTable, osc->table, tableLength * sizeof(s16));
} else {
osc->table = NULL;
@@ -59,7 +59,7 @@ JASystem::TBasicBank* JASystem::BNKParser::createBasicBank(void* stream) {
if (oscTable != NULL) {
s32 tableLength = getOscTableEndPtr(oscTable) - oscTable;
osc->rel_table = new (heap, 0) s16[tableLength];
JUT_ASSERT(94, osc->rel_table != 0);
JUT_ASSERT(94, osc->rel_table != NULL);
Calc::bcopy(oscTable, osc->rel_table, tableLength * sizeof(s16));
} else {
osc->rel_table = NULL;
@@ -77,7 +77,7 @@ JASystem::TBasicBank* JASystem::BNKParser::createBasicBank(void* stream) {
TRand* randRaw = JSUConvertOffsetToPtr<TRand>(header, instRaw->mRandOffsets[j]);
if (randRaw != NULL) {
TInstRand* randp = new (heap, 0) TInstRand();
JUT_ASSERT(120, randp != 0);
JUT_ASSERT(120, randp != NULL);
randp->setTarget(randRaw->field_0x0);
randp->field_0x8 = randRaw->field_0x4;
randp->field_0xc = randRaw->field_0x8;
@@ -88,7 +88,7 @@ JASystem::TBasicBank* JASystem::BNKParser::createBasicBank(void* stream) {
TSense* senseRaw = JSUConvertOffsetToPtr<TSense>(header, instRaw->mSenseOffsets[j]);
if (senseRaw != NULL) {
TInstSense* sensep = new (heap, 0) TInstSense();
JUT_ASSERT(133, sensep != 0);
JUT_ASSERT(133, sensep != NULL);
sensep->setTarget(senseRaw->field_0x0);
sensep->setParams(senseRaw->field_0x1, senseRaw->field_0x2, senseRaw->field_0x4, senseRaw->field_0x8);
instp->setEffect(j + 2, sensep);
@@ -118,7 +118,7 @@ JASystem::TBasicBank* JASystem::BNKParser::createBasicBank(void* stream) {
TPerc* percRaw = JSUConvertOffsetToPtr<TPerc>(header, header->mPercOffsets[i]);
if (percRaw != NULL) {
TDrumSet* setp = new (heap, 0) TDrumSet();
JUT_ASSERT(183, setp != 0);
JUT_ASSERT(183, setp != NULL);
for (int j = 0; j < 0x80; j++) {
TPmap* pmapRaw = JSUConvertOffsetToPtr<TPmap>(header, percRaw->mPmapOffsets[j]);
if (pmapRaw != NULL) {
@@ -134,7 +134,7 @@ JASystem::TBasicBank* JASystem::BNKParser::createBasicBank(void* stream) {
TRand* randRaw = JSUConvertOffsetToPtr<TRand>(header, pmapRaw->mRandOffsets[k]);
if (randRaw != NULL) {
TInstRand* randp = new (heap, 0) TInstRand();
JUT_ASSERT(207, randp != 0);
JUT_ASSERT(207, randp != NULL);
randp->setTarget(randRaw->field_0x0);
randp->field_0x8 = randRaw->field_0x4;
randp->field_0xc = randRaw->field_0x8;
src/JSystem/JAudio/JASBankMgr.cpp
+2 -2
View File
@@ -24,9 +24,9 @@ u16* JASystem::BankMgr::sVir2PhyTable;
void JASystem::BankMgr::init(int param_1) {
u32 r31 = param_1 * 4;
sBankArray = (TBank**)new (JASDram, 0) u8[r31];
JUT_ASSERT(69, sBankArray != 0);
JUT_ASSERT(69, sBankArray != NULL);
sVir2PhyTable = new (JASDram, 0) u16[param_1];
JUT_ASSERT(72, sVir2PhyTable != 0);
JUT_ASSERT(72, sVir2PhyTable != NULL);
Calc::bzero(sBankArray, r31);
for (int i = 0; i < param_1; i++) {
sVir2PhyTable[i] = 0xffffffff;
src/JSystem/JAudio/JASBasicBank.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ JASystem::TBasicBank::~TBasicBank() {
void JASystem::TBasicBank::setInstCount(u32 param_1) {
delete[] mInstTable;
mInstTable = new (getCurrentHeap(), 0) TInst*[param_1];
JUT_ASSERT(36, mInstTable != 0);
JUT_ASSERT(36, mInstTable != NULL);
Calc::bzero(mInstTable, param_1 * 4);
mInstCount = param_1;
}
src/JSystem/JAudio/JASBasicInst.cpp
+4 -4
View File
@@ -95,7 +95,7 @@ int JASystem::TBasicInst::getKeymapIndex(int index) const {
void JASystem::TBasicInst::setKeyRegionCount(u32 num) {
delete[] mKeymap;
mKeymap = new (TBank::getCurrentHeap(), 0) TKeymap[num];
JUT_ASSERT(140, mKeymap != 0);
JUT_ASSERT(140, mKeymap != NULL);
mKeyRegionCount = num;
}
@@ -108,7 +108,7 @@ void JASystem::TBasicInst::setEffectCount(u32 num) {
return;
}
mEffect = new (TBank::getCurrentHeap(), 0) TInstEffect*[num];
JUT_ASSERT(157, mEffect != 0);
JUT_ASSERT(157, mEffect != NULL);
Calc::bzero(mEffect, num * 4);
}
@@ -128,7 +128,7 @@ void JASystem::TBasicInst::setOscCount(u32 num) {
return;
}
mOsc = new (TBank::getCurrentHeap(), 0) TOscillator::Osc_*[num];
JUT_ASSERT(193, mOsc != 0);
JUT_ASSERT(193, mOsc != NULL);
Calc::bzero(mOsc, num * 4);
}
@@ -157,7 +157,7 @@ JASystem::TBasicInst::TKeymap::~TKeymap() {
void JASystem::TBasicInst::TKeymap::setVeloRegionCount(u32 num) {
delete[] mVelomap;
mVelomap = new (TBank::getCurrentHeap(), 0) JASystem::TBasicInst::TVeloRegion[num];
JUT_ASSERT(244, mVelomap != 0);
JUT_ASSERT(244, mVelomap != NULL);
mVeloRegionCount = num;
}
src/JSystem/JAudio/JASBasicWaveBank.cpp
+3 -3
View File
@@ -43,7 +43,7 @@ void JASystem::TBasicWaveBank::setGroupCount(u32 param_1) {
delete[] mWaveGroupArray;
mWaveGroupCount = param_1;
mWaveGroupArray = new (getCurrentHeap(), 0) TWaveGroup*[param_1];
JUT_ASSERT(58, mWaveGroupArray != 0);
JUT_ASSERT(58, mWaveGroupArray != NULL);
for (int i = 0; i < mWaveGroupCount; i++) {
mWaveGroupArray[i] = new (getCurrentHeap(), 0) TWaveGroup(this);
}
@@ -53,7 +53,7 @@ void JASystem::TBasicWaveBank::setGroupCount(u32 param_1) {
void JASystem::TBasicWaveBank::setWaveTableSize(u32 param_1) {
delete[] mWaveTable;
mWaveTable = new (getCurrentHeap(), 0) TWaveInfo*[param_1];
JUT_ASSERT(70, mWaveTable != 0);
JUT_ASSERT(70, mWaveTable != NULL);
Calc::bzero(mWaveTable, param_1 * 4);
mWaveCount = param_1;
}
@@ -112,7 +112,7 @@ void JASystem::TBasicWaveBank::TWaveGroup::setWaveCount(u32 num) {
delete[] mCtrlWaveArray;
mWaveCount = num;
mCtrlWaveArray = new (getCurrentHeap(), 0) TWaveInfo[num];
JUT_ASSERT(180, mCtrlWaveArray != 0);
JUT_ASSERT(180, mCtrlWaveArray != NULL);
for (int i = 0; i < num; i++) {
mCtrlWaveArray[i].mWaveHandle.mHeap = &mHeap;
mCtrlWaveArray[i].mWaveHandle.mWaveInfo.field_0x24 = &field_0x4c;
src/JSystem/JAudio/JASCalc.cpp
+2 -2
View File
@@ -15,9 +15,9 @@ f32* JASystem::Calc::JASC_DOL2TABLE;
/* 8027A804-8027A9C8 .text initSinfT__Q28JASystem4CalcFv */
void JASystem::Calc::initSinfT() {
JASC_SINTABLE = new (JASDram, 0) f32[257];
JUT_ASSERT(49, JASC_SINTABLE != 0);
JUT_ASSERT(49, JASC_SINTABLE != NULL);
JASC_DOL2TABLE = new (JASDram, 0) f32[257];
JUT_ASSERT(51, JASC_DOL2TABLE != 0);
JUT_ASSERT(51, JASC_DOL2TABLE != NULL);
for (u32 i = 0; i < 257; i++) {
JASC_SINTABLE[i] = sin((M_PI / 2) * i / 256.0f);
}
src/JSystem/JAudio/JASCallback.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ bool JASystem::Kernel::callbackInit;
void JASystem::Kernel::resetCallback() {
if (callbackInit != true) {
callList = (unk_callList*)new (JASDram, 0) unk_callList[maxCallbacksUser];
JUT_ASSERT(58, callList != 0);
JUT_ASSERT(58, callList != NULL);
BOOL enable = OSDisableInterrupts();
for (int i = 0; i < maxCallbacksUser; i++) {
callList[i].field_0x0 = NULL;
src/JSystem/JAudio/JASCmdStack.cpp
+7 -7
View File
@@ -25,8 +25,8 @@ bool JASystem::Kernel::TPortCmd::addPortCmdOnce() {
/* 8027D730-8027D7E8 .text setPortCmd__Q38JASystem6Kernel8TPortCmdFPFPQ38JASystem6Kernel9TPortArgs_vPQ38JASystem6Kernel9TPortArgs */
bool JASystem::Kernel::TPortCmd::setPortCmd(void (*func)(JASystem::Kernel::TPortArgs*), JASystem::Kernel::TPortArgs* pargs) {
JUT_ASSERT(83, func != 0);
JUT_ASSERT(84, pargs != 0);
JUT_ASSERT(83, func != NULL);
JUT_ASSERT(84, pargs != NULL);
field_0x8 = func;
field_0xc = pargs;
field_0x0 = NULL;
@@ -36,7 +36,7 @@ bool JASystem::Kernel::TPortCmd::setPortCmd(void (*func)(JASystem::Kernel::TPort
/* 8027D7E8-8027D8A4 .text addPortCmd__Q38JASystem6Kernel8TPortCmdFPQ38JASystem6Kernel9TPortHead */
bool JASystem::Kernel::TPortCmd::addPortCmd(JASystem::Kernel::TPortHead* phead) {
/* Nonmatching */
JUT_ASSERT(105, phead != 0);
JUT_ASSERT(105, phead != NULL);
BOOL enable = OSDisableInterrupts();
if (field_0x0) {
OSRestoreInterrupts(enable);
@@ -56,7 +56,7 @@ bool JASystem::Kernel::TPortCmd::addPortCmd(JASystem::Kernel::TPortHead* phead)
/* 8027D8A4-8027D924 .text portCmdProcOnce__Q28JASystem6KernelFPQ38JASystem6Kernel9TPortHead */
void JASystem::Kernel::portCmdProcOnce(JASystem::Kernel::TPortHead* phead) {
JUT_ASSERT(223, phead != 0);
JUT_ASSERT(223, phead != NULL);
while (true) {
TPortCmd* cmd = getPortCmd(phead);
if (!cmd) {
@@ -68,7 +68,7 @@ void JASystem::Kernel::portCmdProcOnce(JASystem::Kernel::TPortHead* phead) {
/* 8027D924-8027D9A4 .text portCmdProcStay__Q28JASystem6KernelFPQ38JASystem6Kernel9TPortHead */
void JASystem::Kernel::portCmdProcStay(JASystem::Kernel::TPortHead* phead) {
JUT_ASSERT(245, phead != 0);
JUT_ASSERT(245, phead != NULL);
TPortCmd* cmd = phead->field_0x0;
while (true) {
if (!cmd) {
@@ -81,7 +81,7 @@ void JASystem::Kernel::portCmdProcStay(JASystem::Kernel::TPortHead* phead) {
/* 8027D9A4-8027DA0C .text portHeadInit__Q28JASystem6KernelFPQ38JASystem6Kernel9TPortHead */
void JASystem::Kernel::portHeadInit(JASystem::Kernel::TPortHead* phead) {
JUT_ASSERT(267, phead != 0);
JUT_ASSERT(267, phead != NULL);
phead->field_0x0 = NULL;
phead->field_0x4 = NULL;
}
@@ -99,7 +99,7 @@ void JASystem::Kernel::portCmdInit() {
JASystem::Kernel::TPortCmd* JASystem::Kernel::getPortCmd(JASystem::Kernel::TPortHead* phead) {
TPortCmd* r31;
TPortCmd* r30 = NULL;
JUT_ASSERT(311, phead != 0);
JUT_ASSERT(311, phead != NULL);
r31 = phead->field_0x0;
if (r31) {
r30 = r31;
src/JSystem/JAudio/JASDSPInterface.cpp
+1 -1
View File
@@ -67,7 +67,7 @@ void JASystem::DSPInterface::setupBuffer() {
void JASystem::DSPInterface::initBuffer() {
CH_BUF = new(JASDram, 0x20) DSPBuffer[64];
FX_BUF = new(JASDram, 0x20) FXBuffer[4];
JUT_ASSERT(163, (CH_BUF != 0) && (FX_BUF != 0));
JUT_ASSERT(163, (CH_BUF != NULL) && (FX_BUF != NULL));
for (u8 i = 0; i < 4; i++) {
FX_BUF[i].setFXLine(NULL, NULL);
}
src/JSystem/JAudio/JASDrumSet.cpp
+2 -2
View File
@@ -107,7 +107,7 @@ void JASystem::TDrumSet::TPerc::setEffectCount(u32 param_1) {
return;
}
mEffect = new (TBank::getCurrentHeap(), 0) TInstEffect*[param_1];
JUT_ASSERT(146, mEffect != 0);
JUT_ASSERT(146, mEffect != NULL);
Calc::bzero(mEffect, param_1 * 4);
}
@@ -115,7 +115,7 @@ void JASystem::TDrumSet::TPerc::setEffectCount(u32 param_1) {
void JASystem::TDrumSet::TPerc::setVeloRegionCount(u32 param_1) {
delete[] mVelomap;
mVelomap = new (TBank::getCurrentHeap(), 0) TBasicInst::TVeloRegion[param_1];
JUT_ASSERT(155, mVelomap != 0);
JUT_ASSERT(155, mVelomap != NULL);
mVelomapCount = param_1;
}
src/JSystem/JAudio/JASHardStream.cpp
+1 -1
View File
@@ -323,7 +323,7 @@ BOOL JASystem::HardStream::TControl::clearListOne() {
/* 8027C67C-8027C710 .text setLastAddr__Q38JASystem10HardStream8TControlFP11DVDFileInfo */
void JASystem::HardStream::TControl::setLastAddr(DVDFileInfo* finfo) {
JUT_ASSERT(906, finfo != 0);
JUT_ASSERT(906, finfo != NULL);
field_0x44[field_0x4c] = finfo->start_address + finfo->length - 0x8000;
field_0x4c ^= 1;
}
src/JSystem/JAudio/JASHeapCtrl.cpp
+3 -3
View File
@@ -30,7 +30,7 @@ void JASystem::Kernel::THeap::initRootHeap(void* ptr, u32 size, Type type) {
/* 8027CD38-8027CF68 .text alloc__Q38JASystem6Kernel5THeapFPQ38JASystem6Kernel5THeapUl */
bool JASystem::Kernel::THeap::alloc(THeap* mother, u32 param_2) {
JUT_ASSERT(118, mother != 0);
JUT_ASSERT(118, mother != NULL);
OSLockMutex(&mMutex);
if (isAllocated()) {
OSReport("[JASHeap::alloc] すでにヒープは確保されています。初期化してからにしてください。\n");
@@ -131,8 +131,8 @@ static void dummy(JASystem::Kernel::TDisposer* disposer) {
/* 8027D088-8027D1FC .text insertChild__Q38JASystem6Kernel5THeapFPQ38JASystem6Kernel5THeapPQ38JASystem6Kernel5THeapPvUlb */
void JASystem::Kernel::THeap::insertChild(THeap* heap, THeap* next, void* param_3, u32 param_4, bool param_5) {
JUT_ASSERT(537, heap != 0);
JUT_ASSERT(538, next == 0 || &mTree == next->mTree.getParent());
JUT_ASSERT(537, heap != NULL);
JUT_ASSERT(538, next == NULL || &mTree == next->mTree.getParent());
OSLockMutex(&mMutex);
if (!param_5) {
JSUTreeIterator<THeap> it;
src/JSystem/JAudio/JASSeqParser.cpp
+2 -2
View File
@@ -107,7 +107,7 @@ int JASystem::TSeqParser::cmdWritePort(TTrack* track, u32* params) {
int JASystem::TSeqParser::cmdParentWritePort(TTrack* track, u32* params) {
/* Nonmatching */
TTrack* parent = track->getParent();
JUT_ASSERT(452, parent != 0);
JUT_ASSERT(452, parent != NULL);
parent->writePortAppDirect(params[0] & 0xf, params[1]);
return 0;
}
@@ -118,7 +118,7 @@ int JASystem::TSeqParser::cmdChildWritePort(TTrack* track, u32* params) {
u8 param1 = JSULoByte(params[0]);
u8 b1 = JSUHiNibble(param1);
TTrack* child = track->getChild(b1);
JUT_ASSERT(462, child != 0);
JUT_ASSERT(462, child != NULL);
child->writePortAppDirect(JSULoNibble(param1), params[1]);
return 0;
}
src/JSystem/JAudio/JASSimpleWaveBank.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ JASystem::TSimpleWaveBank::TWaveHandle::~TWaveHandle() {}
void JASystem::TSimpleWaveBank::setWaveTableSize(u32 size) {
delete[] mWaveTable;
mWaveTable = new (getCurrentHeap(), 0) TWaveHandle[size];
JUT_ASSERT(34, mWaveTable != 0);
JUT_ASSERT(34, mWaveTable != NULL);
mWaveCount = size;
}
src/JSystem/JAudio/JASSystemHeap.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ void* JASystem::Kernel::allocFromSysDram(u32 size) {
void* ptr;
BOOL enable = OSDisableInterrupts();
ptr = new (JASDram, 0x20) u8[size];
JUT_ASSERT(79, ptr != 0);
JUT_ASSERT(79, ptr != NULL);
OSRestoreInterrupts(enable);
return ptr;
}
src/JSystem/JAudio/JASTrack.cpp
+1 -1
View File
@@ -278,7 +278,7 @@ int JASystem::TTrack::noteOn(u8 param_1, s32 param_2, s32 param_3, s32 param_4,
parent = parent->mParent;
}
if (field_0x37b == 4) {
JUT_ASSERT(527, mParent != 0);
JUT_ASSERT(527, mParent != NULL);
if (r31 != &mParent->field_0xf8) {
if (moveFreeChannel(r31, &mParent->field_0xf8, 1) != 1) {
OSReport("in Player (NOTE-MODE) ... ボイス借用に失敗しました！！ (%d)\n", r31->field_0x0);
src/JSystem/JAudio/JASWaveBankMgr.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ JASystem::TWaveBank** JASystem::WaveBankMgr::sWaveBank;
void JASystem::WaveBankMgr::init(int param_1) {
u32 size = param_1 * 4;
sWaveBank = (TWaveBank**) new (JASDram, 0) u8[size];
JUT_ASSERT(39, sWaveBank != 0);
JUT_ASSERT(39, sWaveBank != NULL);
Calc::bzero(sWaveBank, size);
sTableSize = param_1;
}
src/JSystem/JFramework/JFWSystem.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ bool JFWSystem::sInitCalled = false;
/* 80254DD0-80254E54 .text firstInit__9JFWSystemFv */
void JFWSystem::firstInit() {
JUT_ASSERT(80, rootHeap == 0);
JUT_ASSERT(80, rootHeap == NULL);
OSInit();
DVDInit();
src/JSystem/JKernel/JKRAram.cpp
+2 -2
View File
@@ -333,12 +333,12 @@ static int JKRDecompressFromAramToMainRam(u32 src, void* dst, u32 srcLength, u32
u32 szsBufferSize = JKRAram::getSzpBufferSize();
szpBuf = (u8 *)JKRAllocFromSysHeap(szsBufferSize, 32);
JUT_ASSERT(VERSION_SELECT(1091, 1077, 1077), szpBuf != 0);
JUT_ASSERT(VERSION_SELECT(1091, 1077, 1077), szpBuf != NULL);
szpEnd = szpBuf + szsBufferSize;
if (offset != 0) {
refBuf = (u8 *)JKRAllocFromSysHeap(0x1120, 0);
JUT_ASSERT(VERSION_SELECT(1100, 1086, 1086), refBuf != 0);
JUT_ASSERT(VERSION_SELECT(1100, 1086, 1086), refBuf != NULL);
refEnd = refBuf + 0x1120;
refCurrent = refBuf;
}
src/JSystem/JKernel/JKRAramArchive.cpp
+1 -1
View File
@@ -254,7 +254,7 @@ u32 JKRAramArchive::fetchResource_subroutine(u32 entryNum, u32 length, JKRHeap*
case COMPRESSION_NONE:
{
buffer = (u8*)(JKRAllocFromHeap(pHeap, alignedLen, 0x20));
JUT_ASSERT(VERSION_SELECT(676, 662, 662), buffer != 0);
JUT_ASSERT(VERSION_SELECT(676, 662, 662), buffer != NULL);
JKRAramToMainRam(entryNum, buffer, alignedLen, EXPAND_SWITCH_UNKNOWN0, alignedLen, NULL, -1, NULL);
*out = buffer;
return length;
src/JSystem/JKernel/JKRArchivePub.cpp
+3 -3
View File
@@ -271,7 +271,7 @@ void JKRArchive::removeResourceAll() {
/* 802B89B8-802B8A54 .text removeResource__10JKRArchiveFPv */
bool JKRArchive::removeResource(void* resource) {
JUT_ASSERT(VERSION_SELECT(755, 687, 687), resource != 0);
JUT_ASSERT(VERSION_SELECT(755, 687, 687), resource != NULL);
SDIFileEntry* fileEntry = findPtrResource(resource);
if (fileEntry == NULL)
@@ -284,7 +284,7 @@ bool JKRArchive::removeResource(void* resource) {
/* 802B8A54-802B8AE4 .text detachResource__10JKRArchiveFPv */
bool JKRArchive::detachResource(void* resource) {
JUT_ASSERT(VERSION_SELECT(787, 719, 719), resource != 0);
JUT_ASSERT(VERSION_SELECT(787, 719, 719), resource != NULL);
SDIFileEntry* fileEntry = findPtrResource(resource);
if (fileEntry == NULL)
@@ -296,7 +296,7 @@ bool JKRArchive::detachResource(void* resource) {
/* 802B8AE4-802B8B6C .text getResSize__10JKRArchiveCFPCv */
u32 JKRArchive::getResSize(const void* resource) const {
JUT_ASSERT(VERSION_SELECT(814, 746, 746), resource != 0);
JUT_ASSERT(VERSION_SELECT(814, 746, 746), resource != NULL);
SDIFileEntry* fileEntry = findPtrResource(resource);
if (fileEntry == NULL)
src/JSystem/JKernel/JKRDvdAramRipper.cpp
+3 -3
View File
@@ -249,14 +249,14 @@ static int JKRDecompressFromDVDToAram(JKRDvdFile* dvdFile, u32 param_1, u32 file
OSLockMutex(&decompMutex);
u32 bufferSize = JKRDvdAramRipper::getSzpBufferSize();
szpBuf = (u8*)JKRAllocFromSysHeap(bufferSize, 0x20);
JUT_ASSERT(VERSION_SELECT(703, 693, 693), szpBuf != 0);
JUT_ASSERT(VERSION_SELECT(703, 693, 693), szpBuf != NULL);
szpEnd = szpBuf + bufferSize;
refBuf = (u8*)JKRAllocFromSysHeap(0x1120, 0);
JUT_ASSERT(VERSION_SELECT(711, 701, 701), refBuf != 0);
JUT_ASSERT(VERSION_SELECT(711, 701, 701), refBuf != NULL);
refEnd = refBuf + 0x1120;
refCurrent = refBuf;
dmaBuf = (u8*)JKRAllocFromSysHeap(0x100, 0x20);
JUT_ASSERT(VERSION_SELECT(720, 710, 710), dmaBuf != 0);
JUT_ASSERT(VERSION_SELECT(720, 710, 710), dmaBuf != NULL);
dmaEnd = dmaBuf + 0x100;
dmaCurrent = dmaBuf;
srcFile = dvdFile;
src/JSystem/JKernel/JKRDvdArchive.cpp
+1 -1
View File
@@ -281,7 +281,7 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size,
switch (fileCompression) {
case COMPRESSION_NONE:
buffer = (u8*)JKRAllocFromHeap(heap, alignedSize, sizeof(SArcHeader));
JUT_ASSERT(VERSION_SELECT(638, 631, 631), buffer != 0);
JUT_ASSERT(VERSION_SELECT(638, 631, 631), buffer != NULL);
JKRDvdToMainRam(entryNum, buffer, EXPAND_SWITCH_UNKNOWN0, alignedSize, NULL,
JKRDvdRipper::ALLOC_DIRECTION_FORWARD, offset, NULL);
src/JSystem/JKernel/JKRDvdRipper.cpp
+2 -2
View File
@@ -221,12 +221,12 @@ static int JKRDecompressFromDVD(JKRDvdFile* dvdFile, void* dst, u32 fileSize, u3
OSLockMutex(&decompMutex);
int bufSize = JKRDvdRipper::getSzpBufferSize();
szpBuf = (u8 *)JKRAllocFromSysHeap(bufSize, -0x20);
JUT_ASSERT(VERSION_SELECT(913, 884, 884), szpBuf != 0);
JUT_ASSERT(VERSION_SELECT(913, 884, 884), szpBuf != NULL);
szpEnd = szpBuf + bufSize;
if (inFileOffset != 0) {
refBuf = (u8 *)JKRAllocFromSysHeap(0x1120, -4);
JUT_ASSERT(VERSION_SELECT(922, 893, 893), refBuf != 0);
JUT_ASSERT(VERSION_SELECT(922, 893, 893), refBuf != NULL);
refEnd = refBuf + 0x1120;
refCurrent = refBuf;
} else {
src/JSystem/JKernel/JKRExpHeap.cpp
+1 -1
View File
@@ -952,7 +952,7 @@ static void dummy2() {
/* 802B30A4-802B31D4 .text state_register__10JKRExpHeapCFPQ27JKRHeap6TStateUl */
void JKRExpHeap::state_register(TState* p, u32 param_1) const {
JUT_ASSERT(2423, p != 0);
JUT_ASSERT(2423, p != NULL);
JUT_ASSERT(2424, p->getHeap() == this);
p->mId = param_1;
if (param_1 <= 0xff) {
src/JSystem/JKernel/JKRHeap.cpp
+2 -2
View File
@@ -130,7 +130,7 @@ void* JKRHeap::alloc(u32 size, int alignment, JKRHeap* heap) {
}
static void dummy1(JKRHeap* heap) {
JUT_ASSERT(0, heap != 0);
JUT_ASSERT(0, heap != NULL);
}
/* 802B0494-802B0518 .text alloc__7JKRHeapFUli */
@@ -420,7 +420,7 @@ static void dummy3() {
/* 802B0D70-802B0E14 .text state_register__7JKRHeapCFPQ27JKRHeap6TStateUl */
void JKRHeap::state_register(JKRHeap::TState* p, u32 id) const {
JUT_ASSERT(VERSION_SELECT(1034, 1090, 1090), p != 0);
JUT_ASSERT(VERSION_SELECT(1034, 1090, 1090), p != NULL);
JUT_ASSERT(VERSION_SELECT(1035, 1091, 1091), p->getHeap() == this);
}
src/JSystem/JKernel/JKRSolidHeap.cpp
+1 -1
View File
@@ -236,7 +236,7 @@ bool JKRSolidHeap::dump() {
/* 802B3A68-802B3B4C .text state_register__12JKRSolidHeapCFPQ27JKRHeap6TStateUl */
void JKRSolidHeap::state_register(JKRHeap::TState* p, u32 id) const {
JUT_ASSERT(VERSION_SELECT(610, 607, 607), p != 0);
JUT_ASSERT(VERSION_SELECT(610, 607, 607), p != NULL);
JUT_ASSERT(VERSION_SELECT(611, 608, 608), p->getHeap() == this);
getState_(p);
src/JSystem/JKernel/JKRStdHeap.cpp
+1 -1
View File
@@ -125,7 +125,7 @@ void* JKRStdHeap::do_getMaxFreeBlock() {
/* 802B1338-802B13F0 .text state_register__10JKRStdHeapCFPQ27JKRHeap6TStateUl */
void JKRStdHeap::state_register(JKRHeap::TState* p, u32 id) const {
JUT_ASSERT(370, p != 0);
JUT_ASSERT(370, p != NULL);
JUT_ASSERT(371, p->getHeap() == this);
setState_u32ID_(p, id);
setState_uUsedSize_(p, 0);
src/JSystem/JKernel/JKRThread.cpp
+1 -1
View File
@@ -85,7 +85,7 @@ JKRThreadSwitch::JKRThreadSwitch(JKRHeap* param_0) {
/* 802B4050-802B40EC .text createManager__15JKRThreadSwitchFP7JKRHeap */
JKRThreadSwitch* JKRThreadSwitch::createManager(JKRHeap* heap) {
JUT_ASSERT(184, sManager == 0);
JUT_ASSERT(184, sManager == NULL);
if (!heap) {
heap = JKRGetCurrentHeap();
src/JSystem/JParticle/JPAEmitterManager.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ JPABaseEmitter* JPAEmitterManager::createSimpleEmitterID(const JGeometry::TVec3<
/* Nonmatching - regalloc */
JUT_ASSERT(0x56, groupID < 16);
JUT_ASSERT(0x57, rmID < 8);
JUT_ASSERT(0x58, pResMgrArray[rmID] != 0);
JUT_ASSERT(0x58, pResMgrArray[rmID] != NULL);
JPABaseEmitter* emtr;
JPAEmitterData* emtrData;
src/JSystem/JUtility/JUTConsole.cpp
+5 -5
View File
@@ -18,7 +18,7 @@ JUTConsoleManager* JUTConsoleManager::sManager;
/* 802CA2FC-802CA3CC .text create__10JUTConsoleFUiUiP7JKRHeap */
JUTConsole* JUTConsole::create(uint param_0, uint maxLines, JKRHeap* p_heap) {
JUTConsoleManager* pManager = JUTConsoleManager::getManager();
JUT_ASSERT(33, pManager != 0);
JUT_ASSERT(33, pManager != NULL);
void* buffer = JKRAllocFromHeap(p_heap, getObjectSizeFromBufferSize(param_0, maxLines), 0);
u8* tmpBuf = (u8*)buffer;
@@ -34,7 +34,7 @@ JUTConsole* JUTConsole::create(uint param_0, uint maxLines, JKRHeap* p_heap) {
/* 802CA3CC-802CA4C8 .text create__10JUTConsoleFUiPvUl */
JUTConsole* JUTConsole::create(uint param_0, void* buffer, u32 bufferSize) {
JUTConsoleManager* pManager = JUTConsoleManager::getManager();
JUT_ASSERT(59, pManager != 0);
JUT_ASSERT(59, pManager != NULL);
JUT_ASSERT(62, ( (u32)buffer & 0x3 ) == 0);
u32 maxLines = getLineFromObjectSize(bufferSize, param_0);
@@ -353,7 +353,7 @@ static void dummy2() {
/* 802CB2E8-802CB380 .text createManager__17JUTConsoleManagerFP7JKRHeap */
JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) {
JUT_ASSERT(922, sManager == 0);
JUT_ASSERT(922, sManager == NULL);
if (pHeap == NULL) {
pHeap = JKRHeap::sCurrentHeap;
}
@@ -369,7 +369,7 @@ static void dummy3() {
/* 802CB380-802CB4C4 .text appendConsole__17JUTConsoleManagerFP10JUTConsole */
void JUTConsoleManager::appendConsole(JUTConsole* console) {
JUT_ASSERT(0x3bf, sManager != 0 && console != 0);
JUT_ASSERT(0x3bf, sManager != NULL && console != NULL);
JUT_ASSERT(0x3c2, soLink_.Find( console ) == soLink_.end());
@@ -381,7 +381,7 @@ void JUTConsoleManager::appendConsole(JUTConsole* console) {
/* 802CB4C4-802CB674 .text removeConsole__17JUTConsoleManagerFP10JUTConsole */
void JUTConsoleManager::removeConsole(JUTConsole* console) {
JUT_ASSERT(0x3d6, sManager != 0 && console != 0);
JUT_ASSERT(0x3d6, sManager != NULL && console != NULL);
JUT_ASSERT(0x3d9, soLink_.Find( console ) != soLink_.end());
if (mActiveConsole == console) {
src/JSystem/JUtility/JUTGba.cpp
+16 -16
View File
@@ -24,7 +24,7 @@ JUTGba* JUTGba::sManager;
/* 802CBEB4-802CC03C .text create__6JUTGbaFv */
JUTGba* JUTGba::create() {
JUT_ASSERT(61, sManager == 0);
JUT_ASSERT(61, sManager == NULL);
sManager = new JUTGba();
GBAInit();
OSReport(":::GBA: Init()\n");
@@ -82,8 +82,8 @@ int JUTGba::resultStatus_common(int param_1, u32 param_2, u8* oStatus) {
/* 802CC0E8-802CC1F8 .text doJoyBoot__6JUTGbaFillPUcUlPFP11JUTGbaParamPv_vPv */
void JUTGba::doJoyBoot(int param_1, s32 palette_color, s32 palette_speed, u8* program, u32 length, JUTGba_Func param_6, void* param_7) {
JUT_ASSERT(183, sManager != 0);
JUT_ASSERT(184, program != 0 && length != 0);
JUT_ASSERT(183, sManager != NULL);
JUT_ASSERT(184, program != NULL && length != 0);
JUTGbaParam* param = &sManager->mParams[param_1];
param->program = program;
param->length = length;
@@ -97,7 +97,7 @@ void JUTGba::doJoyBoot(int param_1, s32 palette_color, s32 palette_speed, u8* pr
/* 802CC1F8-802CC308 .text resultJoyBoot__6JUTGbaFiPUc */
int JUTGba::resultJoyBoot(int param_1, u8* param_2) {
JUT_ASSERT(212, sManager != 0);
JUT_ASSERT(212, sManager != NULL);
JUTGbaParam* param = &sManager->mParams[param_1];
if (param->field_0x24 != 1) {
return -1;
@@ -124,7 +124,7 @@ int JUTGba::resultJoyBoot(int param_1, u8* param_2) {
/* 802CC308-802CC3A8 .text doInitProbe__6JUTGbaFiPFP11JUTGbaParamPv_vPv */
void JUTGba::doInitProbe(int param_1, JUTGba_Func param_2, void* param_3) {
JUT_ASSERT(255, sManager != 0);
JUT_ASSERT(255, sManager != NULL);
JUTGbaParam* param = &sManager->mParams[param_1];
param->field_0x4c = param_2;
param->field_0x50 = param_3;
@@ -134,13 +134,13 @@ void JUTGba::doInitProbe(int param_1, JUTGba_Func param_2, void* param_3) {
/* 802CC3A8-802CC430 .text resultInitProbe__6JUTGbaFiPUl */
int JUTGba::resultInitProbe(int param_1, u32* param_2) {
JUT_ASSERT(278, sManager != 0);
JUT_ASSERT(278, sManager != NULL);
return result_common(param_1, 2, param_2);
}
/* 802CC430-802CC4D0 .text doProbe__6JUTGbaFiPFP11JUTGbaParamPv_vPv */
void JUTGba::doProbe(int param_1, JUTGba_Func param_2, void* param_3) {
JUT_ASSERT(287, sManager != 0);
JUT_ASSERT(287, sManager != NULL);
JUTGbaParam* param = &sManager->mParams[param_1];
param->field_0x4c = param_2;
param->field_0x50 = param_3;
@@ -150,13 +150,13 @@ void JUTGba::doProbe(int param_1, JUTGba_Func param_2, void* param_3) {
/* 802CC4D0-802CC558 .text resultProbe__6JUTGbaFiPUl */
BOOL JUTGba::resultProbe(int param_1, u32* param_2) {
JUT_ASSERT(310, sManager != 0);
JUT_ASSERT(310, sManager != NULL);
return result_common(param_1, 3, param_2);
}
/* 802CC558-802CC5F8 .text doReset__6JUTGbaFiPFP11JUTGbaParamPv_vPv */
void JUTGba::doReset(int param_1, JUTGba_Func param_2, void* param_3) {
JUT_ASSERT(320, sManager != 0);
JUT_ASSERT(320, sManager != NULL);
JUTGbaParam* param = &sManager->mParams[param_1];
param->field_0x4c = param_2;
param->field_0x50 = param_3;
@@ -166,13 +166,13 @@ void JUTGba::doReset(int param_1, JUTGba_Func param_2, void* param_3) {
/* 802CC5F8-802CC680 .text resultReset__6JUTGbaFiPUc */
BOOL JUTGba::resultReset(int param_1, u8* param_2) {
JUT_ASSERT(340, sManager != 0);
JUT_ASSERT(340, sManager != NULL);
return resultStatus_common(param_1, 4, param_2);
}
/* 802CC680-802CC728 .text doRead__6JUTGbaFiPUcPFP11JUTGbaParamPv_vPv */
void JUTGba::doRead(int param_1, u8* param_2, JUTGba_Func param_3, void* param_4) {
JUT_ASSERT(350, sManager != 0);
JUT_ASSERT(350, sManager != NULL);
JUTGbaParam* param = &sManager->mParams[param_1];
param->field_0x4c = param_3;
param->field_0x50 = param_4;
@@ -183,13 +183,13 @@ void JUTGba::doRead(int param_1, u8* param_2, JUTGba_Func param_3, void* param_4
/* 802CC728-802CC7B0 .text resultRead__6JUTGbaFiPUc */
BOOL JUTGba::resultRead(int param_1, u8* param_2) {
JUT_ASSERT(371, sManager != 0);
JUT_ASSERT(371, sManager != NULL);
return resultStatus_common(param_1, 5, param_2);
}
/* 802CC7B0-802CC858 .text doWrite__6JUTGbaFiPUcPFP11JUTGbaParamPv_vPv */
void JUTGba::doWrite(int param_1, u8* param_2, JUTGba_Func param_3, void* param_4) {
JUT_ASSERT(381, sManager != 0);
JUT_ASSERT(381, sManager != NULL);
JUTGbaParam* param = &sManager->mParams[param_1];
param->field_0x4c = param_3;
param->field_0x50 = param_4;
@@ -200,13 +200,13 @@ void JUTGba::doWrite(int param_1, u8* param_2, JUTGba_Func param_3, void* param_
/* 802CC858-802CC8E0 .text resultWrite__6JUTGbaFiPUc */
BOOL JUTGba::resultWrite(int param_1, u8* param_2) {
JUT_ASSERT(403, sManager != 0);
JUT_ASSERT(403, sManager != NULL);
return resultStatus_common(param_1, 6, param_2);
}
/* 802CC8E0-802CC980 .text doGetStatus__6JUTGbaFiPFP11JUTGbaParamPv_vPv */
void JUTGba::doGetStatus(int param_1, JUTGba_Func param_2, void* param_3) {
JUT_ASSERT(413, sManager != 0);
JUT_ASSERT(413, sManager != NULL);
JUTGbaParam* param = &sManager->mParams[param_1];
param->field_0x4c = param_2;
param->field_0x50 = param_3;
@@ -216,7 +216,7 @@ void JUTGba::doGetStatus(int param_1, JUTGba_Func param_2, void* param_3) {
/* 802CC980-802CCA08 .text resultGetStatus__6JUTGbaFiPUc */
BOOL JUTGba::resultGetStatus(int param_1, u8* param_2) {
JUT_ASSERT(434, sManager != 0);
JUT_ASSERT(434, sManager != NULL);
return resultStatus_common(param_1, 7, param_2);
}
src/JSystem/JUtility/JUTNameTab.cpp
+2 -2
View File
@@ -28,7 +28,7 @@ void JUTNameTab::setResource(const ResNTAB* pNameTable) {
}
s32 JUTNameTab::getIndex(const char* pName) const {
JUT_ASSERT(101, mNameTable != 0);
JUT_ASSERT(101, mNameTable != NULL);
const ResNTAB::Entry* pEntry = mNameTable->mEntries;
u16 keyCode = calcKeyCode(pName);
@@ -42,7 +42,7 @@ s32 JUTNameTab::getIndex(const char* pName) const {
}
const char* JUTNameTab::getName(u16 index) const {
JUT_ASSERT(138, mNameTable != 0);
JUT_ASSERT(138, mNameTable != NULL);
if (index < mNameNum)
return mNameTable->getName(index);
src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h
+1 -1
View File
@@ -16,7 +16,7 @@ typedef long ptrdiff_t;
#define offsetof(type, member) ((size_t)&(((type*)0)->member))
#ifndef NULL
#define NULL (0)
#define NULL 0
#endif
#ifdef __cplusplus
src/SSystem/SComponent/c_bg_w.cpp
+1 -1
View File
@@ -752,7 +752,7 @@ void cBgW::GetTrans(cXyz* dst) const {
/* 80249A58-80249B64 .text GetTriPnt__4cBgWCFiP4cXyzP4cXyzP4cXyz */
void cBgW::GetTriPnt(int i_no, cXyz* p0, cXyz* p1, cXyz* p2) const {
JUT_ASSERT(0xcb3, pm_bgd != 0);
JUT_ASSERT(0xcb3, pm_bgd != NULL);
cBgD_Tri_t * tri = &pm_bgd->m_t_tbl[i_no];
p0->set(pm_vtx_tbl[tri->vtx0]);
src/SSystem/SComponent/c_xyz.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ cXyz cXyz::normZC(void) const {
/* 80245ADC-80245B80 .text normalize__4cXyzFv */
cXyz cXyz::normalize(void) {
JUT_ASSERT(267, isNearZeroSquare() == 0);
JUT_ASSERT(267, isNearZeroSquare() == FALSE);
VECNormalize(this, this);
return *this;
}
src/c/c_dylink.cpp
+2 -2
View File
@@ -470,7 +470,7 @@ s32 cCc_Init() {
continue;
JUT_ASSERT(0x39, d.mKey < ARRAY_SIZE(DMC));
JUT_ASSERT(0x3a, DMC[d.mKey] == 0);
JUT_ASSERT(0x3a, DMC[d.mKey] == NULL);
for (int j = 0; j < ARRAY_SIZE(DMC); j++) {
if (DMC[j] != NULL) {
@@ -568,7 +568,7 @@ BOOL cDyl_InitCallback(void*) {
void cDyl_InitAsync() {
cCc_Init();
JUT_ASSERT(0x145, cDyl_DVD == 0);
JUT_ASSERT(0x145, cDyl_DVD == NULL);
cDyl_DVD = mDoDvdThd_callback_c::create((mDoDvdThd_callback_func) cDyl_InitCallback, NULL);
}
src/d/actor/d_a_agb.cpp
+5 -5
View File
@@ -380,7 +380,7 @@ int daAgb_c::uploadSelect() {
strcat(path, ".bin");
l_gbaCommand = mDoDvdThd_toMainRam_c::create(path, 0, dMsg_getAgbWorkArea());
#endif
JUT_ASSERT(VERSION_SELECT(591, 860, 861), l_gbaCommand != 0);
JUT_ASSERT(VERSION_SELECT(591, 860, 861), l_gbaCommand != NULL);
mDoGaC_GbaReboot();
mDoGaC_setPortNo(mPortNo);
@@ -396,7 +396,7 @@ int daAgb_c::uploadSelect() {
int daAgb_c::uploadJoyboot1() {
if (l_gbaCommand->sync()) {
void* programp = l_gbaCommand->getMemAddress();
JUT_ASSERT(VERSION_SELECT(622, 891, 892), programp != 0);
JUT_ASSERT(VERSION_SELECT(622, 891, 892), programp != NULL);
JUTGba::getManager()->doJoyBoot(mDoGaC_getPortNo(), 3, -1, (u8*)programp,
l_gbaCommand->getMemSize() - 4, NULL, NULL);
@@ -456,7 +456,7 @@ int daAgb_c::uploadMessageLoad() {
strcat(path, ".bin");
l_gbaCommand = mDoDvdThd_toMainRam_c::create(path, 0, NULL);
#endif
JUT_ASSERT(VERSION_SELECT(715, 1000, 1001), l_gbaCommand != 0);
JUT_ASSERT(VERSION_SELECT(715, 1000, 1001), l_gbaCommand != NULL);
mUploadAction = UpAct_UNK7;
mDoGaC_onComEnable();
@@ -479,7 +479,7 @@ int daAgb_c::uploadMessageLoad2() {
int daAgb_c::uploadConnect() {
if (mDoGaC_getComEnable() && mDoGaC_GbaLink()) {
void* programp = l_gbaCommand->getMemAddress();
JUT_ASSERT(VERSION_SELECT(760, 1045, 1046), programp != 0);
JUT_ASSERT(VERSION_SELECT(760, 1045, 1046), programp != NULL);
mDoGac_SendDataSet((u32*)programp, l_gbaCommand->getMemSize(), 0, 0);
mUploadAction = UpAct_UNK8;
@@ -1720,7 +1720,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
/* 800D396C-800D3B58 .text createHeap__7daAgb_cFv */
int daAgb_c::createHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Agb", AGB_BDL_AGBCURSOR);
JUT_ASSERT(VERSION_SELECT(2960, 3277, 3286), modelData != 0);
JUT_ASSERT(VERSION_SELECT(2960, 3277, 3286), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
if (mpModel == NULL) {
src/d/actor/d_a_arrow.cpp
+1 -1
View File
@@ -105,7 +105,7 @@ BOOL daArrow_c::_createHeap() {
modelFileIndex = LINK_BDL_ARROW;
}
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, modelFileIndex);
JUT_ASSERT(190, modelData != 0);
JUT_ASSERT(190, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x00080000, 0x11000022);
if (!mpModel) {
src/d/actor/d_a_arrow_iceeff.cpp
+3 -3
View File
@@ -20,7 +20,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
BOOL daArrow_Iceeff_c::CreateHeap() {
if(field_0xA38 == 0) {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", LINK_BDL_GICER00));
JUT_ASSERT(87, modelData != 0);
JUT_ASSERT(87, modelData != NULL);
for(int i = 0; i < 30; i++) {
field_0x298[i] = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if(field_0x298[i] == 0) {
@@ -30,14 +30,14 @@ BOOL daArrow_Iceeff_c::CreateHeap() {
}
else {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", LINK_BDL_GICER01));
JUT_ASSERT(98, modelData != 0);
JUT_ASSERT(98, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if(mpModel == NULL) {
return false;
}
J3DAnmTransform* bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Link", LINK_BCK_GICER01));
JUT_ASSERT(107, bck != 0);
JUT_ASSERT(107, bck != NULL);
if(!mBck.init(modelData, bck, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) {
return false;
}
src/d/actor/d_a_arrow_lighteff.cpp
+3 -3
View File
@@ -89,7 +89,7 @@ BOOL daArrow_Lighteff_c::CreateHeap() {
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", LINK_BDL_GARWG00));
}
JUT_ASSERT(187, modelData != 0);
JUT_ASSERT(187, modelData != NULL);
field_0x298 = mDoExt_J3DModel__create(modelData, 0x80000, 0x3F441422);
if(field_0x298 == 0) {
@@ -111,8 +111,8 @@ BOOL daArrow_Lighteff_c::CreateHeap() {
brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Link", LINK_BRK_GARWG00));
}
JUT_ASSERT(216, btk != 0);
JUT_ASSERT(217, brk != 0);
JUT_ASSERT(216, btk != NULL);
JUT_ASSERT(217, brk != NULL);
if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) {
return false;
src/d/actor/d_a_bflower.cpp
+6 -6
View File
@@ -122,7 +122,7 @@ BOOL daBFlower_c::CreateHeap() {
}
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arcname, VBAKH_BDL_VBAKH));
JUT_ASSERT(0x1B2, modelData != 0);
JUT_ASSERT(0x1B2, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
if (mpModel == NULL) {
@@ -130,7 +130,7 @@ BOOL daBFlower_c::CreateHeap() {
}
J3DAnmTransform* pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_arcname, VBAKH_BCK_VBAHX));
JUT_ASSERT(0x1C3, pbck != 0);
JUT_ASSERT(0x1C3, pbck != NULL);
if (!mBck1.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_ONCE_RESET_e, 1.0f, 0, -1, false)) {
return FALSE;
@@ -138,7 +138,7 @@ BOOL daBFlower_c::CreateHeap() {
mBck1.setFrame(mBck1.getEndFrame());
J3DAnmTevRegKey* pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_arcname, VBAKH_BRK_VBAHX));
JUT_ASSERT(0x1D9, pbrk != 0);
JUT_ASSERT(0x1D9, pbrk != NULL);
if (!mBrk1.init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) {
return FALSE;
@@ -146,7 +146,7 @@ BOOL daBFlower_c::CreateHeap() {
mBrk1.setPlaySpeed(0.0f);
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arcname, VBAKH_BDL_VBAKM));
JUT_ASSERT(0x1E7, modelData != 0);
JUT_ASSERT(0x1E7, modelData != NULL);
mpModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
if (mpModel2 == NULL) {
@@ -154,7 +154,7 @@ BOOL daBFlower_c::CreateHeap() {
}
pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_arcname, VBAKH_BCK_VBAMX));
JUT_ASSERT(0x1F7, pbck != 0);
JUT_ASSERT(0x1F7, pbck != NULL);
if (!mBck2.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) {
return FALSE;
@@ -162,7 +162,7 @@ BOOL daBFlower_c::CreateHeap() {
mBck2.setPlaySpeed(0.0f);
pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_arcname, VBAKH_BRK_VBAMX));
JUT_ASSERT(0x208, pbrk != 0);
JUT_ASSERT(0x208, pbrk != NULL);
if (!mBrk2.init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) {
return FALSE;
src/d/actor/d_a_bg.cpp
+1 -1
View File
@@ -344,7 +344,7 @@ s32 daBg_c::create() {
JKRExpHeap * roomHeap = dStage_roomControl_c::getMemoryBlock(roomNo);
if (roomHeap != NULL) {
heap = JKRSolidHeap::create(-1, roomHeap, false);
JUT_ASSERT(0x2fd, heap != 0);
JUT_ASSERT(0x2fd, heap != NULL);
JKRHeap * oldHeap = mDoExt_setCurrentHeap(heap);
s32 rt = createHeap();
JUT_ASSERT(0x302, rt == 1);
src/d/actor/d_a_bita.cpp
+2 -2
View File
@@ -186,14 +186,14 @@ static BOOL useHeapInit(fopAc_ac_c* i_ac) {
type = 1;
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Bita", ita_bmd[type]);
JUT_ASSERT(0x23b, modelData != 0);
JUT_ASSERT(0x23b, modelData != NULL);
J3DModel* model = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (model == NULL)
return FALSE;
i_this->mpModel = model;
modelData = (J3DModelData*)dComIfG_getObjectRes("Bita", ita_Ef_bmd[type]);
JUT_ASSERT(0x247, modelData != 0);
JUT_ASSERT(0x247, modelData != NULL);
model = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (model == NULL)
return FALSE;
src/d/actor/d_a_bk.cpp
+4 -4
View File
@@ -1068,7 +1068,7 @@ static void jyunkai(bk_class* i_this) {
}
if ((i_this->ppd->mNextPathId & 0xFFFF) != 0xFFFF) {
i_this->ppd = dPath_GetRoomPath(i_this->ppd->mNextPathId, fopAcM_GetRoomNo(i_this));
JUT_ASSERT(2924, i_this->ppd != 0);
JUT_ASSERT(2924, i_this->ppd != NULL);
}
} else if (i_this->m1216 < 0) {
i_this->m1217 = 1;
@@ -2489,7 +2489,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
J3DModelData* modelData;
modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BMD_BK_KB);
JUT_ASSERT(9418, modelData != 0);
JUT_ASSERT(9418, modelData != NULL);
if (i_this->m02D5 & 0x40) {
J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_BK_KEN);
modelData->setMaterialTable(bmt, J3DMatCopyFlag_Material);
@@ -2508,13 +2508,13 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
if (i_this->m02D4 != 0) {
modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BMD_BK_TATE);
i_this->m02D0 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
JUT_ASSERT(9445, modelData != 0);
JUT_ASSERT(9445, modelData != NULL);
}
if (i_this->m02DC != 0) {
modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BDL_BOUEN);
i_this->m02D8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
JUT_ASSERT(9454, modelData != 0);
JUT_ASSERT(9454, modelData != NULL);
}
static Vec hip_offset[] = {
src/d/actor/d_a_bomb2.cpp
+3 -3
View File
@@ -269,15 +269,15 @@ namespace daBomb2 {
const char* resName = attr().resName;
J3DModelData* mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(attr().resName, VBAKH_BDL_VBAKM));
JUT_ASSERT(0x303, mdl_data != 0);
JUT_ASSERT(0x303, mdl_data != NULL);
mpModel = mDoExt_J3DModel__create(mdl_data, 0x80000, 0x11000022);
J3DAnmTransform* bck_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(resName, VBAKH_BCK_VBAKM));
JUT_ASSERT(0x30D, bck_data != 0);
JUT_ASSERT(0x30D, bck_data != NULL);
int temp = mBck0.init(mdl_data, bck_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false);
J3DAnmTevRegKey* brk_data = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(resName, VBAKH_BRK_VBAKM));
JUT_ASSERT(0x314, brk_data != 0);
JUT_ASSERT(0x314, brk_data != NULL);
int temp3 = mBrk0.init(mdl_data, brk_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0);
return mpModel && temp && temp3;
src/d/actor/d_a_bomb3.inc
+6 -6
View File
@@ -1280,30 +1280,30 @@ BOOL daBomb_c::createHeap() {
BOOL ret;
if(mType == 1) {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BDL_VBAKM));
JUT_ASSERT(0x9A5, modelData != 0);
JUT_ASSERT(0x9A5, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
J3DAnmTransform* bck0_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BCK_VBAMX));
JUT_ASSERT(0x9AE, bck0_data != 0);
JUT_ASSERT(0x9AE, bck0_data != NULL);
int temp = mBck0.init(modelData, bck0_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false);
J3DAnmTransform* bck1_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BCK_VBAKM));
JUT_ASSERT(0x9B4, bck1_data != 0);
JUT_ASSERT(0x9B4, bck1_data != NULL);
int temp2 = mBck1.init(modelData, bck1_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false);
J3DAnmTevRegKey* brk0_data = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BRK_VBAMX));
JUT_ASSERT(0x9BB, brk0_data != 0);
JUT_ASSERT(0x9BB, brk0_data != NULL);
int temp3 = mBrk0.init(modelData, brk0_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0);
J3DAnmTevRegKey* brk1_data = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BRK_VBAKM));
JUT_ASSERT(0x9C1, brk1_data != 0);
JUT_ASSERT(0x9C1, brk1_data != NULL);
int temp4 = mBrk1.init(modelData, brk1_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0);
return mpModel && temp && temp2 && temp3 && temp4;
}
else {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_attrType[mType].resName, LINK_BDL_BOMB));
JUT_ASSERT(0x9CE, modelData != 0);
JUT_ASSERT(0x9CE, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
if(!mpModel) {
src/d/actor/d_a_branch.cpp
+2 -2
View File
@@ -72,9 +72,9 @@ int daBranch_c::CreateHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectIDRes(m_arcname, bmd[i]));
J3DAnmTransformKey* bckData = static_cast<J3DAnmTransformKey*>(dComIfG_getObjectIDRes(m_arcname, bck[i]));
JUT_ASSERT(0x1CC, modelData != 0);
JUT_ASSERT(0x1CC, modelData != NULL);
// Bug: They probably meant to assert that bckData isn't null, but accidentally used the array of bck file IDs.
JUT_ASSERT(0x1CD, bck != 0);
JUT_ASSERT(0x1CD, bck != NULL);
mAnims[i] = new mDoExt_McaMorf(
static_cast<J3DModelData*>(dComIfG_getObjectIDRes(m_arcname, bmd[i])),
src/d/actor/d_a_dai_item.cpp
+2 -2
View File
@@ -185,7 +185,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_ac) {
/* 800E37B8-800E3AF8 .text CreateHeap__13daStandItem_cFv */
BOOL daStandItem_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, m_bmdidx[mItemType]);
JUT_ASSERT(0x239, modelData != 0);
JUT_ASSERT(0x239, modelData != NULL);
if (mItemNo == PRESIDENT_STATUE) {
mpModel = mDoExt_J3DModel__create(modelData, 0x0, 0x11020203);
@@ -198,7 +198,7 @@ BOOL daStandItem_c::CreateHeap() {
if (m_bckidx[mItemType] != -1) {
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, m_bckidx[mItemType]);
JUT_ASSERT(0x250, pbck != 0);
JUT_ASSERT(0x250, pbck != NULL);
mpBckAnm = new mDoExt_bckAnm();
static const u32 playmode[12] = {
src/d/actor/d_a_deku_item.cpp
+3 -3
View File
@@ -65,7 +65,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 000000F0-000002C8 .text CreateHeap__12daDekuItem_cFv */
BOOL daDekuItem_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, DEKU_BDL_VLFDM);
JUT_ASSERT(0xF4, modelData != 0);
JUT_ASSERT(0xF4, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203U);
@@ -74,14 +74,14 @@ BOOL daDekuItem_c::CreateHeap() {
}
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, DEKU_BCK_VLFDK);
JUT_ASSERT(0x103, pbck != 0);
JUT_ASSERT(0x103, pbck != NULL);
if (!mBck1.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) {
return FALSE;
}
pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, DEKU_BCK_VLFDM);
JUT_ASSERT(0x110, pbck != 0);
JUT_ASSERT(0x110, pbck != NULL);
if (!mBck2.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) {
return FALSE;
src/d/actor/d_a_esa.cpp
+1 -1
View File
@@ -228,7 +228,7 @@ static BOOL daEsa_CreateHeap(fopAc_ac_c* i_actor) {
esa_class* i_this = static_cast<esa_class*>(i_actor);
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", LINK_BDL_ESA));
JUT_ASSERT(0x1E8, modelData != 0);
JUT_ASSERT(0x1E8, modelData != NULL);
i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
if(i_this->mpModel == NULL) {
src/d/actor/d_a_fan.cpp
+5 -5
View File
@@ -71,7 +71,7 @@ BOOL daFan_c::Delete() {
/* 000000F0-0000040C .text CreateHeap__7daFan_cFv */
int daFan_c::CreateHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arcname[mType], m_bdlidx[mType]));
JUT_ASSERT(0x15e, modelData != 0);
JUT_ASSERT(0x15e, modelData != NULL);
mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
if (mModel == NULL)
@@ -79,23 +79,23 @@ int daFan_c::CreateHeap() {
mModel->setUserArea((u32)this);
modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BDL_YAFLW00);
JUT_ASSERT(0x17f, modelData != 0);
JUT_ASSERT(0x17f, modelData != NULL);
mWindModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222);
if (mWindModel == NULL)
return FALSE;
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BTK_YAFLW00_01);
JUT_ASSERT(400, pbtk != 0);
JUT_ASSERT(400, pbtk != NULL);
if (!mWindBtkAnm0.init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0,-1, false, 0))
return FALSE;
pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BTK_YAFLW00_02);
JUT_ASSERT(0x19c, pbtk != 0);
JUT_ASSERT(0x19c, pbtk != NULL);
if (!mWindBtkAnm1.init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0,-1, false, 0))
return FALSE;
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BCK_YAFLW00);
JUT_ASSERT(0x1a9, pbck != 0);
JUT_ASSERT(0x1a9, pbck != NULL);
if (!mWindBckAnm.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0,-1, false))
return FALSE;
src/d/actor/d_a_floor.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ BOOL daFloor_c::Delete() {
/* 0000012C-000001E8 .text CreateHeap__9daFloor_cFv */
int daFloor_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, HHYU1_BDL_HHYU1);
JUT_ASSERT(0xc1, modelData != 0);
JUT_ASSERT(0xc1, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
if (mpModel == NULL)
return FALSE;
src/d/actor/d_a_ghostship.cpp
+3 -3
View File
@@ -38,7 +38,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
/* 00000118-0000032C .text _createHeap__13daGhostship_cFv */
BOOL daGhostship_c::_createHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BDL_AYUSH));
JUT_ASSERT(88, modelData != 0);
JUT_ASSERT(88, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if(!mpModel) {
@@ -46,7 +46,7 @@ BOOL daGhostship_c::_createHeap() {
}
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BTK_AYUSH));
JUT_ASSERT(95, btk != 0);
JUT_ASSERT(95, btk != NULL);
if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) {
return false;
@@ -356,7 +356,7 @@ bool daGhostship_c::_execute() {
if(mAlpha == l_HIO.shipAlpha && dist < l_HIO.shipEnterDist && dComIfGs_getEventReg(0x8803) < 3 && !mbEnteredShip) {
mDoAud_seStart(JA_SE_LK_WARP_TO_G_SHIP);
stage_scls_info_class* scls_data = dComIfGd_getMeshSceneList(current.pos);
JUT_ASSERT(463, scls_data != 0)
JUT_ASSERT(463, scls_data != NULL)
u8 startCode = scls_data->mStart;
dComIfGs_setEventReg(0xC3FF, scls_data->mRoom);
src/d/actor/d_a_ib.cpp
+4 -4
View File
@@ -424,17 +424,17 @@ s32 daIball_c::_daIball_create() {
/* 800F489C-800F4B40 .text CreateHeap__9daIball_cFv */
BOOL daIball_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, ALWAYS_BDL_IB);
JUT_ASSERT(1135, modelData != 0);
JUT_ASSERT(1135, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222);
if (!mpModel) { return FALSE; }
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, ALWAYS_BCK_START);
JUT_ASSERT(1152, pbck != 0);
JUT_ASSERT(1152, pbck != NULL);
int ret = mBckAnm.init(modelData, pbck, 1, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false);
if (!ret) { return FALSE; }
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, ALWAYS_BTK_IB);
JUT_ASSERT(1164, pbtk != 0);
JUT_ASSERT(1164, pbtk != NULL);
ret = mBtkAnm.init(modelData, pbtk, 1, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0);
if (!ret) { return FALSE; }
@@ -445,7 +445,7 @@ BOOL daIball_c::CreateHeap() {
J3DAnmTevRegKey* pbrk;
for (int i = 0; i < (int)ARRAY_SIZE(mBrkAnm); i++) {
pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, brkIds[i]);
JUT_ASSERT(1182, pbrk != 0);
JUT_ASSERT(1182, pbrk != NULL);
ret = mBrkAnm[i].init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0);
if (!ret) { return FALSE; }
}
src/d/actor/d_a_ikari.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ BOOL daIkari_c::_createHeap() {
J3DModelData* modelData =
static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, ikari_bdl[mModelType]));
JUT_ASSERT(0x7e, modelData != 0);
JUT_ASSERT(0x7e, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x00080000, 0x11000022);
if (mpModel == NULL) {
src/d/actor/d_a_itembase.cpp
+6 -6
View File
@@ -32,7 +32,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1,
JUT_ASSERT(78, 0 <= m_itemNo && m_itemNo <= 255);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(resName, resIdx);
JUT_ASSERT(85, modelData != 0);
JUT_ASSERT(85, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (!mpModel) {
@@ -60,7 +60,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1,
mpBtkAnm1 = NULL;
if (btkAnm1 != -1) {
pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(resName, btkAnm1);
JUT_ASSERT(140, pbtk != 0);
JUT_ASSERT(140, pbtk != NULL);
mpBtkAnm1 = new mDoExt_btkAnm();
if (!mpBtkAnm1 || !mpBtkAnm1->init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) {
return FALSE;
@@ -70,7 +70,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1,
mpBtkAnm2 = NULL;
if (btkAnm2 != -1) {
pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(resName, btkAnm2);
JUT_ASSERT(156, pbtk != 0);
JUT_ASSERT(156, pbtk != NULL);
mpBtkAnm2 = new mDoExt_btkAnm();
if (!mpBtkAnm2 || !mpBtkAnm2->init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) {
return FALSE;
@@ -81,7 +81,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1,
mpBrkAnm1 = NULL;
if (brkAnm1 != -1) {
pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(resName, brkAnm1);
JUT_ASSERT(172, pbrk != 0);
JUT_ASSERT(172, pbrk != NULL);
s8 tevFrm = dItem_data::getTevFrm(m_itemNo);
BOOL shouldAnimate = TRUE;
if (tevFrm != -1) {
@@ -96,7 +96,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1,
mpBrkAnm2 = NULL;
if (brkAnm2 != -1) {
pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(resName, brkAnm2);
JUT_ASSERT(197, pbrk != 0);
JUT_ASSERT(197, pbrk != NULL);
mpBrkAnm2 = new mDoExt_brkAnm();
if (!mpBrkAnm2 || !mpBrkAnm2->init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, false)) {
return FALSE;
@@ -107,7 +107,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1,
mpBckAnm = NULL;
if (bckAnm != -1) {
pbck = (J3DAnmTransform*)dComIfG_getObjectRes(resName, bckAnm);
JUT_ASSERT(212, pbck != 0);
JUT_ASSERT(212, pbck != NULL);
mpBckAnm = new mDoExt_bckAnm();
if (!mpBckAnm || !mpBckAnm->init(modelData, pbck, TRUE, 2, 1.0f, 0, -1, false)) {
return FALSE;
src/d/actor/d_a_kaji.cpp
+1 -1
View File
@@ -25,7 +25,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000098-000001F4 .text CreateHeap__8daKaji_cFv */
BOOL daKaji_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, KAJI_INDEX_BDL_ASODA);
JUT_ASSERT(0x55, modelData != 0);
JUT_ASSERT(0x55, modelData != NULL);
mpMorf = new mDoExt_McaMorf(
modelData,
src/d/actor/d_a_komore.cpp
+2 -2
View File
@@ -21,7 +21,7 @@ bool daKomore::Act_c::create_heap() {
mdl_data = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, 0x04));
JUT_ASSERT(0x66, mdl_data != 0);
JUT_ASSERT(0x66, mdl_data != NULL);
if (mdl_data != NULL) {
mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11020203);
@@ -29,7 +29,7 @@ bool daKomore::Act_c::create_heap() {
btk_data = (J3DAnmTextureSRTKey*)(dComIfG_getObjectRes(M_arcname, 0x07));
JUT_ASSERT(0x6d, btk_data != 0);
JUT_ASSERT(0x6d, btk_data != NULL);
s32 btkRet =
mBtkAnm.init(mdl_data, btk_data, 1, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0);
src/d/actor/d_a_lamp.cpp
+1 -1
View File
@@ -161,7 +161,7 @@ static BOOL daLamp_Delete(lamp_class* i_this) {
/* 00000678-0000073C .text useHeapInit__FP10lamp_class */
static BOOL useHeapInit(lamp_class* i_this) {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Lamp", LAMP_BMD_LAMP_00));
JUT_ASSERT(0x170, modelData != 0);
JUT_ASSERT(0x170, modelData != NULL);
i_this->mModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (i_this->mModel == 0) {
src/d/actor/d_a_lbridge.cpp
+4 -4
View File
@@ -17,7 +17,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000098-00000384 .text CreateHeap__11daLbridge_cFv */
BOOL daLbridge_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, GBRG00_BDL_GBRG00);
JUT_ASSERT(0xD6, modelData != 0);
JUT_ASSERT(0xD6, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000U, 0x11000223U);
@@ -26,14 +26,14 @@ BOOL daLbridge_c::CreateHeap() {
}
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, GBRG00_BTK_GBRG00);
JUT_ASSERT(0xE8, pbtk != 0);
JUT_ASSERT(0xE8, pbtk != NULL);
if (!mBtkAnm.init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) {
return FALSE;
}
J3DAnmColor* pbpk = (J3DAnmColor*)dComIfG_getObjectRes(m_arcname, GBRG00_BPK_GBRG00);
JUT_ASSERT(0xF6, pbpk != 0);
JUT_ASSERT(0xF6, pbpk != NULL);
if (!mBpkAnm.init(modelData, pbpk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) {
return FALSE;
@@ -43,7 +43,7 @@ BOOL daLbridge_c::CreateHeap() {
mBpkAnm.setPlaySpeed(1.0f);
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, GBRG00_BRK_GBRG00);
JUT_ASSERT(0x106, pbrk != 0);
JUT_ASSERT(0x106, pbrk != NULL);
if (!mBrkAnm.init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) {
return FALSE;
src/d/actor/d_a_mbdoor.cpp
+4 -4
View File
@@ -126,22 +126,22 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 000002FC-0000060C .text CreateHeap__10daMbdoor_cFv */
BOOL daMbdoor_c::CreateHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(getArcName(), getFuBdl()));
JUT_ASSERT(198, modelData != 0)
JUT_ASSERT(198, modelData != NULL)
mpFuModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
if (!mpFuModel) { return FALSE; }
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(getArcName(), getLBdl()));
JUT_ASSERT(209, modelData != 0)
JUT_ASSERT(209, modelData != NULL)
mpLModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
if (!mpLModel) { return FALSE; }
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(getArcName(), getRBdl()));
JUT_ASSERT(220, modelData != 0)
JUT_ASSERT(220, modelData != NULL)
mpRModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
if (!mpRModel) { return FALSE; }
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(getArcName(), getToBdl()));
JUT_ASSERT(231, modelData != 0)
JUT_ASSERT(231, modelData != NULL)
mpToModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
if (!mpToModel) { return FALSE; }
src/d/actor/d_a_mozo.cpp
+2 -2
View File
@@ -75,10 +75,10 @@ BOOL daMozo_c::CreateHeap() {
mAnimMorf = newMorf;
m_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Mozo", MOZO_BRK_MOZ);
JUT_ASSERT(0x16A, m_brk != 0);
JUT_ASSERT(0x16A, m_brk != NULL);
m_btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Mozo", MOZO_BTK_MOZ);
JUT_ASSERT(0x16D, m_btk != 0);
JUT_ASSERT(0x16D, m_btk != NULL);
int brkInitResult = mBrkAnm.init(mdlData, m_brk, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0);
int btkInitResult = mBtkAnm.init(mdlData, m_btk, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0);
src/d/actor/d_a_mtoge.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 000000A4-000001E8 .text CreateHeap__9daMtoge_cFv */
BOOL daMtoge_c::CreateHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, MTOGE_BMD_S_MTOGE));
JUT_ASSERT(0x70, modelData != 0);
JUT_ASSERT(0x70, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203U);
src/d/actor/d_a_nh.cpp
+2 -2
View File
@@ -103,7 +103,7 @@ void daNh_c::setBaseMtx() {
/* 800F9980-800F9A54 .text createHeap__6daNh_cFv */
BOOL daNh_c::createHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_NH);
JUT_ASSERT(359, modelData != 0);
JUT_ASSERT(359, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (!mpModel) {
@@ -427,7 +427,7 @@ BOOL daNh_c::initBrkAnm(bool i_modify) {
bool success = false;
J3DAnmTevRegKey* a_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Always", ALWAYS_BRK_TNH);
JUT_ASSERT(883, a_brk != 0);
JUT_ASSERT(883, a_brk != NULL);
if (mBrkAnm.init(modelData, a_brk, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, i_modify, false)) {
success = true;
src/d/actor/d_a_npc_bs1.cpp
+1 -1
View File
@@ -193,7 +193,7 @@ static BOOL nodeCallBack_Bs(J3DNode* node, int value) {
BOOL daNpc_Bs1_c::initTexPatternAnm(bool i_modify) {
J3DModelData* modelData = mpMorf->getModel()->getModelData();
m_head_tex_pattern = (J3DAnmTexPattern*)dComIfG_getObjectRes("Bs", l_btp_ix_tbl[m828]);
JUT_ASSERT(0x1bd, m_head_tex_pattern != 0);
JUT_ASSERT(0x1bd, m_head_tex_pattern != NULL);
if (!mBtpAnm.init(modelData, m_head_tex_pattern, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, i_modify, 0)) {
return FALSE;
}
src/d/actor/d_a_npc_btsw2.cpp
+2 -2
View File
@@ -138,7 +138,7 @@ static BOOL nodeCallBack(J3DNode* node, int param_1) {
BOOL daNpc_Btsw2_c::initTexPatternAnm(bool i_modify) {
J3DModelData* modelData = mpMorf->getModel()->getModelData();
m_btp = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes(m_arc_name, l_btp_ix_tbl[m744]));
JUT_ASSERT(282, m_btp != 0);
JUT_ASSERT(282, m_btp != NULL);
if (!mBtpAnm.init(modelData, m_btp, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, i_modify, 0)) {
return FALSE;
}
@@ -346,7 +346,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* i_this) {
/* 00000BB4-00000EFC .text CreateHeap__13daNpc_Btsw2_cFv */
BOOL daNpc_Btsw2_c::CreateHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, BTSW_INDEX_BDL_BN));
JUT_ASSERT(616, modelData != 0);
JUT_ASSERT(616, modelData != NULL);
mpMorf = new mDoExt_McaMorf(
modelData,
NULL, NULL,
src/d/actor/d_a_npc_ji1.cpp
+3 -3
View File
@@ -3210,10 +3210,10 @@ BOOL daNpc_Ji1_c::CreateHeap() {
field_0x3F8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
J3DAnmTevRegKey* a_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Ji", JI_BRK_YJITR00));
JUT_ASSERT(0x15CD, a_brk != 0);
JUT_ASSERT(0x15CD, a_brk != NULL);
J3DAnmTextureSRTKey* a_btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Ji", JI_BTK_YJITR00));
JUT_ASSERT(0x15D0, a_btk != 0);
JUT_ASSERT(0x15D0, a_btk != NULL);
int temp1 = field_0x3FC.init(modelData, a_brk, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0);
int temp2 = field_0x418.init(modelData, a_btk, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0);
@@ -3223,7 +3223,7 @@ BOOL daNpc_Ji1_c::CreateHeap() {
}
headTexPattern = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes("Ji", JI_BTP_JI));
JUT_ASSERT(0x15D8, headTexPattern != 0);
JUT_ASSERT(0x15D8, headTexPattern != NULL);
if(field_0x3D8.init(modelData, headTexPattern, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0) == 0) {
return false;
src/d/actor/d_a_npc_kamome.cpp
+1 -1
View File
@@ -217,7 +217,7 @@ static int headNodeCallBack(J3DNode* node, int param_1) {
/* 00000CD0-00000EB8 .text createHeap__11daNpc_kam_cFv */
BOOL daNpc_kam_c::createHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kamome", KAMOME_BDL_KA_HYOI);
JUT_ASSERT(763, modelData != 0);
JUT_ASSERT(763, modelData != NULL);
mpMorf = new mDoExt_McaMorf(
modelData,
src/d/actor/d_a_npc_md.cpp
+4 -4
View File
@@ -759,7 +759,7 @@ BOOL daNpc_Md_c::createHeap() {
}
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(mModelArcName, "md.bdl");
JUT_ASSERT(1995, modelData != 0);
JUT_ASSERT(1995, modelData != NULL);
mpMorf = new mDoExt_McaMorf2(
modelData,
@@ -805,7 +805,7 @@ BOOL daNpc_Md_c::createHeap() {
mpMorf->getModel()->setUserArea((u32)this);
modelData = (J3DModelData*)dComIfG_getObjectRes(mModelArcName, "mdarm.bdl");
JUT_ASSERT(2051, modelData != 0);
JUT_ASSERT(2051, modelData != NULL);
mpArmMorf = new mDoExt_McaMorf2(
modelData,
@@ -835,7 +835,7 @@ BOOL daNpc_Md_c::createHeap() {
if (!isTypeShipRide()) {
modelData = (J3DModelData*)dComIfG_getObjectRes(mModelArcName, "mdwing.bdl");
JUT_ASSERT(2083, modelData != 0);
JUT_ASSERT(2083, modelData != NULL);
mpWingMorf = new mDoExt_McaMorf(
modelData,
@@ -2198,7 +2198,7 @@ BOOL daNpc_Md_c::initTexPatternAnm(u8 btpAnmTblIdx, bool param_2) {
J3DModelData* modelData = mpMorf->getModel()->getModelData();
bool ret = false;
J3DAnmTexPattern* eyeTexPtrn = (J3DAnmTexPattern*)dComIfG_getObjectRes(mModelArcName, btpAnmTbl[btpAnmTblIdx].m00);
JUT_ASSERT(7502, eyeTexPtrn != 0);
JUT_ASSERT(7502, eyeTexPtrn != NULL);
if (m0520.init(modelData, eyeTexPtrn, TRUE, J3DFrameCtrl::LOOP_ONCE_RESET_e, 1.0f, 0, -1, param_2, 0)) {
m3112 = eyeTexPtrn->getFrameMax();
m3133 = 0;
src/d/actor/d_a_npc_nz.cpp
+1 -1
View File
@@ -148,7 +148,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
/* 00000D18-00000F98 .text _createHeap__10daNpc_Nz_cFv */
BOOL daNpc_Nz_c::_createHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_bdl_arc_name, NPCNZ_BDL_NZ));
JUT_ASSERT(0xD0, modelData != 0);
JUT_ASSERT(0xD0, modelData != NULL);
mpMorf = new mDoExt_McaMorf(
modelData,
src/d/actor/d_a_npc_os.cpp
+2 -2
View File
@@ -237,7 +237,7 @@ static BOOL tunoNodeCallBack(J3DNode* node, int param_1) {
/* 00000988-00000C94 .text createHeap__10daNpc_Os_cFv */
BOOL daNpc_Os_c::createHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Os", OS_BDL_OS));
JUT_ASSERT(0x2F9, modelData != 0);
JUT_ASSERT(0x2F9, modelData != NULL);
mpMorf = new mDoExt_McaMorf(
modelData,
@@ -1702,7 +1702,7 @@ BOOL daNpc_Os_c::initBrkAnm(u8 param_1, bool param_2) {
bool ret = false;
if(field_0x7A2 != param_1) {
J3DAnmTevRegKey* a_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Os", brkAnmTbl[param_1].brkFileIndex));
JUT_ASSERT(0xBB9, a_brk != 0);
JUT_ASSERT(0xBB9, a_brk != NULL);
if(mBrkAnm.init(modelData, a_brk, TRUE, brkAnmTbl[param_1].loopMode, brkAnmTbl[param_1].speed, 0, -1, param_2, 0)) {
field_0x7A2 = param_1;
src/d/actor/d_a_npc_people.cpp
+1 -1
View File
@@ -7584,7 +7584,7 @@ BOOL daNpcPeople_c::initTexPatternAnm(bool param_1) {
}
m_head_tex_pattern = (J3DAnmTexPattern*)dComIfG_getObjectIDRes(l_arcname_tbl[mNpcType], l_btp_ix_tbl[mNpcType]);
JUT_ASSERT(0x231D, m_head_tex_pattern != 0);
JUT_ASSERT(0x231D, m_head_tex_pattern != NULL);
if(!mBtpAnm.init(modelData, m_head_tex_pattern, 1, 2, 1.0f, 0, -1, param_1, 0)) {
return false;
src/d/actor/d_a_npc_roten.cpp
+1 -1
View File
@@ -2691,7 +2691,7 @@ BOOL daNpcRoten_c::initTexPatternAnm(bool modify) {
J3DModelData* modelData = mpMorf->getModel()->getModelData();
m_head_tex_pattern = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectIDRes(l_arcname_tbl[mNpcNo], l_btp_ix_tbl[mNpcNo]));
JUT_ASSERT(0xBFF, m_head_tex_pattern != 0);
JUT_ASSERT(0xBFF, m_head_tex_pattern != NULL);
if(!mBtpAnm.init(modelData, m_head_tex_pattern, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, modify, 0)) {
return false;
src/d/actor/d_a_obj_Yboil.cpp
+4 -4
View File
@@ -20,13 +20,13 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000098-00000368 .text CreateHeap__12daObjYboil_cFv */
BOOL daObjYboil_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Yboil", YBOIL_BDL_YBOIL00);
JUT_ASSERT(92, modelData != 0);
JUT_ASSERT(92, modelData != NULL);
J3DAnmTransform* bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Yboil", YBOIL_BCK_YBOIL00));
JUT_ASSERT(96, bck != 0);
JUT_ASSERT(96, bck != NULL);
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Yboil", YBOIL_BTK_YBOIL00));
JUT_ASSERT(100, btk != 0);
JUT_ASSERT(100, btk != NULL);
J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Yboil", YBOIL_BRK_YBOIL00));
JUT_ASSERT(104, brk != 0);
JUT_ASSERT(104, brk != NULL);
for (s32 i = 0; i < 50; i++) {
mModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222);
src/d/actor/d_a_obj_adnno.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000098-00000178 .text CreateHeap__12daObjAdnno_cFv */
BOOL daObjAdnno_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Adnno", ADNNO_BDL_ADNNO));
JUT_ASSERT(0x5c, modelData != 0);
JUT_ASSERT(0x5c, modelData != NULL);
for (s32 i = 0; i < 16; i++) {
mpModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x37441422);
if (!mpModel[i])
src/d/actor/d_a_obj_akabe.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ namespace daObjAkabe {
if (mpBgW != NULL) {
static const s16 dzb[4] = { AKABE_DZB_AKABE, AKABED_DZB_AKABED, AKABEK_DZB_AKABEK, NBOX_DZB_NBOX, };
cBgD_t * bgw_data = (cBgD_t*)dComIfG_getObjectRes(M_arcname[mType], dzb[mType]);
JUT_ASSERT(0x82, bgw_data != 0);
JUT_ASSERT(0x82, bgw_data != NULL);
if (!mpBgW->Set(bgw_data, cBgW::MOVE_BG_e, &mMtx))
rt = true;
}
src/d/actor/d_a_obj_barrier.cpp
+5 -5
View File
@@ -299,8 +299,8 @@ void daObjBarrier_ef_c::setDummyTexture(int i_idx) {
J3DTexture* texture = modelData->getTexture();
JUTNameTab* textureName = modelData->getTextureName();
JUT_ASSERT(808, texture != 0);
JUT_ASSERT(809, textureName != 0);
JUT_ASSERT(808, texture != NULL);
JUT_ASSERT(809, textureName != NULL);
for (u16 i = 0; i < texture->getNum(); i++) {
if (strcmp(textureName->getName(i), "__dummy") == 0) {
@@ -375,13 +375,13 @@ void daObjBarrier_ef_c::birth(fopAc_ac_c* i_hitActor, f32 i_radius, cXyz i_cente
J3DModelData* modelData = mpModel[effect_idx]->getModelData();
J3DAnmTextureSRTKey* btk_anm_p = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BTK_YHRBR00));
JUT_ASSERT(937, btk_anm_p != 0);
JUT_ASSERT(937, btk_anm_p != NULL);
J3DAnmTransform* bck_anm_p = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(l_arcname, YCAGE_BCK_YHRBR00));
JUT_ASSERT(942, bck_anm_p != 0);
JUT_ASSERT(942, bck_anm_p != NULL);
J3DAnmTevRegKey* brk_anm_p = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BRK_YHRBR00));
JUT_ASSERT(947, brk_anm_p != 0);
JUT_ASSERT(947, brk_anm_p != NULL);
mBtk[effect_idx].init(modelData, btk_anm_p, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1,
true, 0);
src/d/actor/d_a_obj_bscurtain.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ BOOL daObj_Bscurtain_c::CreateHeap() {
modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, PTC_INDEX_BDL_PTCU);
}
JUT_ASSERT(0xa9, modelData != 0);
JUT_ASSERT(0xa9, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x0, 0x11020203);
return mpModel != NULL;
src/d/actor/d_a_obj_cafelmp.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000098-0000015C .text CreateHeap__14daObjCafelmp_cFv */
BOOL daObjCafelmp_c::CreateHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Cafelmp", CAFELMP_BDL_YLAMP));
JUT_ASSERT(0x51, modelData != 0);
JUT_ASSERT(0x51, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x00, 0x11020203);
if (!mpModel)
return FALSE;
src/d/actor/d_a_obj_dmgroom.cpp
+2 -2
View File
@@ -21,13 +21,13 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000098-000001FC .text CreateHeap__14daObjDmgroom_cFv */
BOOL daObjDmgroom_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Dmgroom", DMGROOM_BDL_DMGROOM));
JUT_ASSERT(0x52, modelData != 0);
JUT_ASSERT(0x52, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x00, 0x11020203);
if (!mpModel)
return FALSE;
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)(dComIfG_getObjectRes("Dmgroom", DMGROOM_BRK_DMGROOM));
JUT_ASSERT(0x5c, brk != 0);
JUT_ASSERT(0x5c, brk != NULL);
if (!mBrkAnm.init(modelData, brk, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0))
return FALSE;
src/d/actor/d_a_obj_doguu_demo.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ BOOL daObjDoguuD_c::CreateHeap() {
mUnusedParam = fopAcM_GetParam(this) & 0xFF;
J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("DoguuD", DOGUUD_BDL_ESKZTO));
JUT_ASSERT(0x65, modelData != 0);
JUT_ASSERT(0x65, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x00, 0x11020203);
if (mpModel == NULL)
return FALSE;
src/d/actor/d_a_obj_dragonhead.cpp
+1 -1
View File
@@ -55,7 +55,7 @@ namespace daObjDragonhead_prm {
/* 00000098-00000228 .text CreateHeap__17daObjDragonhead_cFv */
BOOL daObjDragonhead_c::CreateHeap() {
J3DModelData* model_data = (J3DModelData*)(dComIfG_getObjectRes("Qdghd", QDGHD_BDL_QDGHD));
JUT_ASSERT(0xA0, model_data != 0);
JUT_ASSERT(0xA0, model_data != NULL);
mpModel = mDoExt_J3DModel__create(model_data, 0x00, 0x11020203);
if (!mpModel)
return FALSE;
src/d/actor/d_a_obj_eayogn.cpp
+1 -1
View File
@@ -25,7 +25,7 @@ BOOL daObjEayogn_c::create_heap() {
BOOL ret = FALSE;
J3DModelData* mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, EAYOGN_BDL_EAYOGN));
JUT_ASSERT(0x5c, mdl_data != 0);
JUT_ASSERT(0x5c, mdl_data != NULL);
if (mdl_data != NULL) {
mpModel = mDoExt_J3DModel__create(mdl_data, 0x00, 0x11020203);
src/d/actor/d_a_obj_eskban.cpp
+2 -2
View File
@@ -120,10 +120,10 @@ static dCcD_SrcSph sph_check_src = {
int daObjEskban::Act_c::CreateHeap() {
J3DModelData* model_data =
static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, ESKBAN_BDL_ESKBAN));
JUT_ASSERT(261, model_data != 0);
JUT_ASSERT(261, model_data != NULL);
mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203U);
M_smoke = new dPa_smokeEcallBack();
JUT_ASSERT(264, M_smoke != 0);
JUT_ASSERT(264, M_smoke != NULL);
return mpModel != NULL;
}
src/d/actor/d_a_obj_ferris.cpp
+4 -4
View File
@@ -91,14 +91,14 @@ BOOL daObjFerris::Act_c::solidHeapCB(fopAc_ac_c* i_this) {
bool daObjFerris::Act_c::create_heap() {
s32 i;
J3DModelData* mdl_data_gondola = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, SKANRAN_BDL_SGONDOR));
JUT_ASSERT(0x183, mdl_data_gondola != 0);
JUT_ASSERT(0x183, mdl_data_gondola != NULL);
if (mdl_data_gondola != NULL) {
for (i = 0; i < 5; i++)
mpModel[i] = mDoExt_J3DModel__create(mdl_data_gondola, 0, 0x11020203);
}
J3DModelData* mdl_data_wheelbase = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, SKANRAN_BDL_SKANRAN));
JUT_ASSERT(0x18c, mdl_data_wheelbase != 0);
JUT_ASSERT(0x18c, mdl_data_wheelbase != NULL);
if (mdl_data_wheelbase != NULL) {
mpModel[5] = mDoExt_J3DModel__create(mdl_data_wheelbase, 0, 0x11020203);
}
@@ -107,7 +107,7 @@ bool daObjFerris::Act_c::create_heap() {
init_mtx();
cBgD_t* bgw_data_gondola = static_cast<cBgD_t*>(dComIfG_getObjectRes(M_arcname, SKANRAN_DZB_SGONDOR));
JUT_ASSERT(0x1a0, bgw_data_gondola != 0);
JUT_ASSERT(0x1a0, bgw_data_gondola != NULL);
if (bgw_data_gondola != NULL) {
for (i = 0; i < 5; i++) {
mpBgW[i] = new dBgW();
@@ -117,7 +117,7 @@ bool daObjFerris::Act_c::create_heap() {
}
cBgD_t* bgw_data_wheelbase = static_cast<cBgD_t*>(dComIfG_getObjectRes(M_arcname, SKANRAN_DZB_SKANRAN));
JUT_ASSERT(0x1b0, bgw_data_wheelbase != 0);
JUT_ASSERT(0x1b0, bgw_data_wheelbase != NULL);
if (bgw_data_wheelbase != NULL) {
mpBgW[5] = new dBgW();
if (mpBgW[5] != NULL && mpBgW[5]->Set(bgw_data_wheelbase, dBgW::MOVE_BG_e, &mMtx[5]) == 1)
src/d/actor/d_a_obj_gaship2.cpp
+2 -2
View File
@@ -24,12 +24,12 @@ bool daObjGaship2::Act_c::create_heap() {
cBgD_t *bgw_data;
mdl_data = (J3DModelData *) (dComIfG_getObjectRes(M_arcname, YAKEROM_BDL_YAKEROM));
JUT_ASSERT(0x5A, mdl_data != 0);
JUT_ASSERT(0x5A, mdl_data != NULL);
mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11000002);
set_mtx();
bgw_data = (cBgD_t *) (dComIfG_getObjectRes(M_arcname, YAKEROM_DZB_YAKEROM));
JUT_ASSERT(0x67, bgw_data != 0);
JUT_ASSERT(0x67, bgw_data != NULL);
if (bgw_data != NULL) {
mpBgW = new dBgW();
if (mpBgW != NULL && (mpBgW->Set(bgw_data, cBgW::MOVE_BG_e, &mMtx) == true)) {
src/d/actor/d_a_obj_gong.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ BOOL daObjGong::Act_c::solidHeapCB(fopAc_ac_c* i_this) {
bool daObjGong::Act_c::create_heap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, VDORA_INDEX_BDL_VDORA));
J3DAnmTransformKey* bck = static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes(M_arcname, VDORA_INDEX_BCK_05_VDORA_CUT02_HIT));
JUT_ASSERT(0xbd, (modelData != 0) && (bck != 0));
JUT_ASSERT(0xbd, (modelData != NULL) && (bck != NULL));
mpMorf = new mDoExt_McaMorf(
modelData,
src/d/actor/d_a_obj_gryw00.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ f32 daObjGryw00_c::get_draw_water_lv(void* p) {
BOOL daObjGryw00_c::setup_high_water_level_btk_anm() {
BOOL ret = TRUE;
J3DAnmTextureSRTKey* btk_anm_p = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, GRYW00_BTK_GRYW00));
JUT_ASSERT(223, btk_anm_p != 0);
JUT_ASSERT(223, btk_anm_p != NULL);
if (!mBtk.init(mpModel->getModelData(), btk_anm_p, 1, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0x191, -1, -1, 0)) {
ret = FALSE;
}
src/d/actor/d_a_obj_hbrf1.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ const char daObjHbrf1::Act_c::M_evname[] = "ami_cam";
/* 00000078-0000012C .text CreateHeap__Q210daObjHbrf15Act_cFv */
BOOL daObjHbrf1::Act_c::CreateHeap() {
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, HBRF1_BDL_HBRF1);
JUT_ASSERT(0x5E, model_data != 0);
JUT_ASSERT(0x5E, model_data != NULL);
mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203);
src/d/actor/d_a_obj_hole.cpp
+1 -1
View File
@@ -225,7 +225,7 @@ void daObj_Hole_c::createInit() {
BOOL daObj_Hole_c::_createHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, AANA_BDL_AANA);
JUT_ASSERT(0x13D, modelData != 0);
JUT_ASSERT(0x13D, modelData != NULL);
mpMdl = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
src/d/actor/d_a_obj_kanat.cpp
+1 -1
View File
@@ -15,7 +15,7 @@ const char daObjKanat::Act_c::M_arcname[] = "Kanat";
/* 00000078-0000012C .text CreateHeap__Q210daObjKanat5Act_cFv */
int daObjKanat::Act_c::CreateHeap() {
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, KANAT_BDL_KANAT);
JUT_ASSERT(79, model_data != 0);
JUT_ASSERT(79, model_data != NULL);
mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203);
return !!mpModel;
}
src/d/actor/d_a_obj_ladder.cpp
+1 -1
View File
@@ -67,7 +67,7 @@ const char daObjLadder::Act_c::M_arcname[] = "Mhsg";
/* 00000078-0000013C .text CreateHeap__Q211daObjLadder5Act_cFv */
BOOL daObjLadder::Act_c::CreateHeap() {
J3DModelData* model_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, attr_type(mType).modelId));
JUT_ASSERT(0x17E, model_data != 0);
JUT_ASSERT(0x17E, model_data != NULL);
mpModel = mDoExt_J3DModel__create(model_data, 0x80000U, 0x11000022U);
src/d/actor/d_a_obj_mknjd.cpp
+2 -2
View File
@@ -176,8 +176,8 @@ int daObjMknjD::Act_c::CreateHeap() {
J3DModelData* model_data_d = (J3DModelData*)temp_r26;
J3DModelData* model_data_h = (J3DModelData*)dComIfG_getObjectRes(M_arcname, MKNJD_BDL_MKNJH);
JUT_ASSERT(0x123, model_data_d != 0)
JUT_ASSERT(0x124, model_data_h != 0)
JUT_ASSERT(0x123, model_data_d != NULL)
JUT_ASSERT(0x124, model_data_h != NULL)
mMainMdl = mDoExt_J3DModel__create(model_data_d, 0x80000, 0x31000002);
mBreakMdl = mDoExt_J3DModel__create(model_data_h, 0x80000, 0x11000002);
src/d/actor/d_a_obj_monument.cpp
+1 -1
View File
@@ -37,7 +37,7 @@ bool daObjMonument::Act_c::create_heap() {
bool ret = true;
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, attr(mType).mModelId));
JUT_ASSERT(0x81, modelData != 0);
JUT_ASSERT(0x81, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x00, 0x11020203);
if (!mpModel)
src/d/actor/d_a_obj_movebox.cpp
+1 -1
View File
@@ -1219,7 +1219,7 @@ namespace daObjMovebox {
BOOL success = TRUE;
if (i_attr()->mModelFileIndex >= 0) {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname[mType], i_attr()->mModelFileIndex);
JUT_ASSERT(1722, modelData != 0);
JUT_ASSERT(1722, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
success = (mpModel != 0);
src/d/actor/d_a_obj_mtest.cpp
+1 -1
View File
@@ -100,7 +100,7 @@ BOOL daObjMtest::Act_c::CreateHeap() {
s16 bmdIdx = bmd_data[M_type];
if (bmdIdx >= 0) {
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname[M_type], bmdIdx);
JUT_ASSERT(257, model_data != 0);
JUT_ASSERT(257, model_data != NULL);
mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203);
return !!mpModel;
src/d/actor/d_a_obj_ojtree.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ const char daObjOjtree::Act_c::M_arcname[] = "Ojtree";
/* 00000078-0000012C .text CreateHeap__Q211daObjOjtree5Act_cFv */
int daObjOjtree::Act_c::CreateHeap() {
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, OJTREE_BDL_OJTREE);
JUT_ASSERT(67, model_data != 0);
JUT_ASSERT(67, model_data != NULL);
mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000022);
return !!mpModel;
}

Some files were not shown because too many files have changed in this diff Show More