Skip to content

Commit

Permalink
Use NULL macro in asserts, fix NULL macro to match
Browse files Browse the repository at this point in the history
  • Loading branch information
@LagoLunatic
LagoLunatic committed Jun 22, 2024
1 parent c836c5c commit f9d40eb
Show file tree
Hide file tree
Showing 159 changed files with 462 additions and 462 deletions.
12 changes: 6 additions & 6 deletions include/JSystem/JFramework/JFWSystem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions include/d/d_demo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ class dDemo_actor_c : public JStage::TActor {
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;
}
Expand Down
16 changes: 8 additions & 8 deletions src/JSystem/JAudio/JASBNKParser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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) {
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/JSystem/JAudio/JASBankMgr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/JSystem/JAudio/JASBasicBank.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions src/JSystem/JAudio/JASBasicInst.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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);
}

Expand All @@ -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);
}

Expand Down Expand Up @@ -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;
}

Expand Down
6 changes: 3 additions & 3 deletions src/JSystem/JAudio/JASBasicWaveBank.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/JSystem/JAudio/JASCalc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/JSystem/JAudio/JASCallback.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions src/JSystem/JAudio/JASCmdStack.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand All @@ -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) {
Expand All @@ -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) {
Expand All @@ -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;
}
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/JSystem/JAudio/JASDSPInterface.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions src/JSystem/JAudio/JASDrumSet.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,15 @@ 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);
}

/* 80285664-802856F8 .text setVeloRegionCount__Q38JASystem8TDrumSet5TPercFUl */
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;
}

Expand Down
2 changes: 1 addition & 1 deletion src/JSystem/JAudio/JASHardStream.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions src/JSystem/JAudio/JASHeapCtrl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/JSystem/JAudio/JASSeqParser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/JSystem/JAudio/JASSimpleWaveBank.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion src/JSystem/JAudio/JASSystemHeap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/JSystem/JAudio/JASTrack.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/JSystem/JAudio/JASWaveBankMgr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/JSystem/JFramework/JFWSystem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading

0 comments on commit f9d40eb

Please sign in to comment.