diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-06-22 11:07:16 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-06-22 11:07:16 -0400 |
| commit | f9d40ebad822d9d873e05f0fbe52990dc538179e (patch) | |
| tree | 20b37f53f7909efee3c4d33486232e62ebfd1053 /src/d/d_s_name.cpp | |
| parent | c836c5ca1f14fa629a82e02ea74fb681a7c94e6b (diff) | |
Use NULL macro in asserts, fix NULL macro to match
Diffstat (limited to 'src/d/d_s_name.cpp')
| -rw-r--r-- | src/d/d_s_name.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index 899f6096..c9b15130 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -104,7 +104,7 @@ s32 dScnName_c::create() { s32 rt = resLoad(&mPhs, "Stage"); if (rt == cPhs_COMPLEATE_e) { heap = JKRCreateExpHeap(0x68000, mDoExt_getGameHeap(), false); - JUT_ASSERT(0x1c8, heap != 0); + JUT_ASSERT(0x1c8, heap != NULL); oldHeap = mDoExt_setCurrentHeap(heap); mArchive = new JKRMemArchive(); @@ -112,17 +112,17 @@ s32 dScnName_c::create() { cloth_create(); buttonIconCreate(); dFs_c = new dFile_select_c(); - JUT_ASSERT(470, dFs_c != 0); + JUT_ASSERT(470, dFs_c != NULL); dFs_c->field_0x0 = mArchive; savePicDatabuf = new (0x20) u8[0x12000]; - JUT_ASSERT(476, savePicDatabuf != 0); + JUT_ASSERT(476, savePicDatabuf != NULL); if (fpcM_GetName(this) == PROC_NAME_SCENE) { dFs_c->field_0x3940 = 0; dNm_c = new dName_c(); - JUT_ASSERT(484, dNm_c != 0); + JUT_ASSERT(484, dNm_c != NULL); dNm_c->_create(); dFe_c = new dFile_error_c(); - JUT_ASSERT(489, dFe_c != 0); + JUT_ASSERT(489, dFe_c != NULL); dFe_c->_create(); dMs_c = NULL; g_dComIfG_gameInfo.save.field_0x1291 = 0; @@ -132,7 +132,7 @@ s32 dScnName_c::create() { dComIfGs_setClearCount(1); dFs_c->field_0x3940 = 1; dMs_c = new dMenu_save_c(); - JUT_ASSERT(511, dMs_c != 0); + JUT_ASSERT(511, dMs_c != NULL); dMs_c->field_0x0537 = 3; dMs_c->_create(); dFe_c = NULL; @@ -210,7 +210,7 @@ void dScnName_c::cloth_move() { void dScnName_c::cloth2D_create() { JKRArchive* clothRes = dComIfGp_getClothResArchive(); cloth.cloth_c = new dMCloth_c(); - JUT_ASSERT(801, cloth.cloth_c != 0); + JUT_ASSERT(801, cloth.cloth_c != NULL); cloth.cloth_c->setArchive(clothRes); cloth.cloth_c->setClothType(1); // ? } @@ -225,7 +225,7 @@ static void dummy() { /* 802302F8-80230500 .text buttonIconCreate__10dScnName_cFv */ void dScnName_c::buttonIconCreate() { btnIcon.scr = new J2DScreen(); - JUT_ASSERT(866, btnIcon.scr != 0); + JUT_ASSERT(866, btnIcon.scr != NULL); btnIcon.scr->set("main_parts_fileselect.blo", mArchive); fopMsgM_setPaneData(&field_0x43c, btnIcon.scr->search('cent')); fopMsgM_setPaneData(&field_0x474, btnIcon.scr->search('bab')); |