mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-19 13:24:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

DEMO_SELECT

Browse Source
This commit is contained in:
LagoLunatic
2025-07-25 21:05:36 -04:00
parent 4ebe6758cb
commit 72dc8f4ef6
43 changed files with 210 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_acorn_leaf.cpp
+2 -2
View File
@@ -66,7 +66,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_actor) {
/* 0000010C-00000258 .text CreateHeap__9daAleaf_cFv */
BOOL daAleaf_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAleaf_c::m_arcname, VIGAH_BDL_VIGAH);
JUT_ASSERT(VERSION_SELECT(258, 262, 262, 262), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(258, 262), modelData != NULL);
unk_298 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
if (unk_298 == NULL) {
@@ -74,7 +74,7 @@ BOOL daAleaf_c::CreateHeap() {
}
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(daAleaf_c::m_arcname, VIGAH_BCK_VIGAH);
JUT_ASSERT(VERSION_SELECT(273, 277, 277, 277), pbck != NULL);
JUT_ASSERT(DEMO_SELECT(273, 277), pbck != NULL);
if (!unk_408.init(modelData, pbck, 1, 1, 1.0f, 0, -1, 0)) {
return FALSE;
src/d/actor/d_a_amiprop.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 000000F4-00000244 .text CreateHeap__11daAmiProp_cFv */
BOOL daAmiProp_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAmiProp_c::m_arcname, HAMI1_BDL_HAMI1);
JUT_ASSERT(VERSION_SELECT(250, 255, 255, 255), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(250, 255), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
if (mpModel == NULL) {
src/d/actor/d_a_bb.cpp
+3 -3
View File
@@ -744,7 +744,7 @@ void bb_path_move(bb_class* i_this) {
if (i_this->ppd->m_nextID + 0 != 0xFFFF) {
i_this->ppd = dPath_GetRoomPath(i_this->ppd->m_nextID, fopAcM_GetRoomNo(a_this));
JUT_ASSERT(VERSION_SELECT(1476, 1479, 1479, 1479), i_this->ppd != NULL);
JUT_ASSERT(DEMO_SELECT(1476, 1479), i_this->ppd != NULL);
}
} else if (i_this->unk_35E < 0) {
i_this->unk_35F = 1;
@@ -2525,7 +2525,7 @@ static BOOL useHeapInit(fopAc_ac_c* ac) {
}
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Bb", BB_BDL_BB_TAIL));
JUT_ASSERT(VERSION_SELECT(4508, 4535, 4535, 4535), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(4508, 4535), modelData != NULL);
for (s32 i = 0; i < 9; i++) {
i_this->unk_A84[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x33221202);
@@ -2535,7 +2535,7 @@ static BOOL useHeapInit(fopAc_ac_c* ac) {
}
J3DAnmTexPattern* btp = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes("Bb", bb_tex_anm_idx[4]));
JUT_ASSERT(VERSION_SELECT(4529, 4556, 4556, 4556), btp);
JUT_ASSERT(DEMO_SELECT(4529, 4556), btp);
s32 ret = i_this->mBtpAnm.init(i_this->mpMorf->getModel()->getModelData(), btp, 0, 2, 1.0f, 0, -1, false, 0);
if (ret == 0) {
src/d/actor/d_a_bridge.cpp
+2 -2
View File
@@ -1315,12 +1315,12 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) {
}
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Bridge", bridge_bmd[modelNum]);
JUT_ASSERT(VERSION_SELECT(2334, 2336, 2336, 2336), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(2334, 2336), modelData != NULL);
J3DModelData* modelData2;
if (modelNum == 1) {
modelData2 = (J3DModelData*)dComIfG_getObjectRes("Bridge", BRIDGE_BDL_OBM_CHAIN1);
JUT_ASSERT(VERSION_SELECT(2340, 2342, 2342, 2342), modelData2 != NULL);
JUT_ASSERT(DEMO_SELECT(2340, 2342), modelData2 != NULL);
}
br_s* pBr = i_this->mBr;
src/d/actor/d_a_demo00.cpp
+2 -2
View File
@@ -290,7 +290,7 @@ BOOL daDemo00_c::execute() {
if (!spCC.isEnd() && spCC.isValid()) {
TValueIterator_raw<u8> it = spCC.begin();
int argID = *it;
JUT_ASSERT(VERSION_SELECT(771, 832, 832, 832), argID < (sizeof(l_eventBit)/sizeof(u16)));
JUT_ASSERT(DEMO_SELECT(771, 832), argID < (sizeof(l_eventBit)/sizeof(u16)));
if (l_eventBit[argID] != 0xFFFF) {
dComIfGs_onEventBit(l_eventBit[argID]);
}
@@ -313,7 +313,7 @@ BOOL daDemo00_c::execute() {
if (!spB8.isEnd() && spB8.isValid()) {
TValueIterator_raw<u8> it = spB8.begin();
int argID = *it;
JUT_ASSERT(VERSION_SELECT(797, 858, 858, 858), argID < (sizeof(l_itemNo)/sizeof(u8)));
JUT_ASSERT(DEMO_SELECT(797, 858), argID < (sizeof(l_itemNo)/sizeof(u8)));
if (l_itemNo[argID] != dItem_NONE_e) {
execItemGet(l_itemNo[argID]);
}
src/d/actor/d_a_dk.cpp
+1 -1
View File
@@ -350,7 +350,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
#endif
modelData = (J3DModelData*) dComIfG_getObjectIDRes("Dk", DK_BDL_DK_TAIL);
JUT_ASSERT(VERSION_SELECT(817, 819, 819, 819), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(817, 819), modelData != NULL);
for (s32 i = 0; i < 4; i++) {
for (s32 j = 0; j < 9; j++) {
src/d/actor/d_a_door10.cpp
+4 -4
View File
@@ -275,7 +275,7 @@ BOOL daDoor10_c::CreateHeap() {
modelData = (J3DModelData*)dComIfG_getStageRes("Stage", getBdlName());
}
JUT_ASSERT(VERSION_SELECT(354, 356, 356, 356), modelData);
JUT_ASSERT(DEMO_SELECT(354, 356), modelData);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
if (mpModel == NULL) {
@@ -425,7 +425,7 @@ void daDoor10_c::openEnd() {
void daDoor10_c::closeInit() {
onFlag(2);
bool rt = dComIfG_Bgsp()->Regist(mpBgW, this);
JUT_ASSERT(VERSION_SELECT(539, 541, 541, 541), !rt);
JUT_ASSERT(DEMO_SELECT(539, 541), !rt);
dComIfGp_map_clrAGBMapSendStopFlg();
fopAcM_seStart(this, JA_SE_OBJ_STN_DOOR_MOVE_D, 0);
}
@@ -463,7 +463,7 @@ void daDoor10_c::calcMtx() {
/* 000010FC-0000125C .text CreateInit__10daDoor10_cFv */
BOOL daDoor10_c::CreateInit() {
if (dComIfG_Bgsp()->Regist(mpBgW, this)) {
JUT_ASSERT(VERSION_SELECT(605, 607, 607, 607), NULL);
JUT_ASSERT(DEMO_SELECT(605, 607), NULL);
}
tevStr.mRoomNo = current.roomNo;
@@ -823,7 +823,7 @@ BOOL daDoor10_c::execute() {
break;
default:
JUT_ASSERT(VERSION_SELECT(1028, 1032, 1032, 1032), NULL);
JUT_ASSERT(DEMO_SELECT(1028, 1032), NULL);
break;
}
src/d/actor/d_a_dr2.cpp
+4 -4
View File
@@ -664,7 +664,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
i_this->mpMorf1->getModel()->setUserArea((u32)i_this);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BDL_IWA00);
JUT_ASSERT(VERSION_SELECT(1347, 1361, 1361, 1361), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(1347, 1361), modelData != NULL);
i_this->unk_418 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (i_this->unk_418 == NULL) {
@@ -672,7 +672,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_GAN_MAGMA);
JUT_ASSERT(VERSION_SELECT(1356, 1370, 1370, 1370), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(1356, 1370), modelData != NULL);
i_this->unk_41C = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (i_this->unk_41C == NULL) {
@@ -711,7 +711,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_MBYO1);
JUT_ASSERT(VERSION_SELECT(1405, 1429, 1429, 1429), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(1405, 1429), modelData != NULL);
i_this->unk_428 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (i_this->unk_428 == NULL) {
@@ -719,7 +719,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
}
modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_MBYO2);
JUT_ASSERT(VERSION_SELECT(1412, 1436, 1436, 1436), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(1412, 1436), modelData != NULL);
i_this->unk_42C = mDoExt_J3DModel__create(modelData,0,0x11020203);
if (i_this->unk_42C == NULL) {
src/d/actor/d_a_ep.cpp
+2 -2
View File
@@ -514,7 +514,7 @@ static BOOL daEp_CreateHeap(fopAc_ac_c* a_this) {
} else {
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ep", EP_BDL_OBM_SHOKUDAI1));
}
JUT_ASSERT(VERSION_SELECT(996, 997, 997, 997), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(996, 997), modelData != NULL);
#if VERSION == VERSION_DEMO
i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x0, 0x11020203);
@@ -527,7 +527,7 @@ static BOOL daEp_CreateHeap(fopAc_ac_c* a_this) {
if (i_this->mbHasGa != 0) {
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ep", EP_BDL_EP_GA));
JUT_ASSERT(VERSION_SELECT(1007, 1010, 1010, 1010), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(1007, 1010), modelData != NULL);
for (s32 i = 0; i < 2; i++) {
#if VERSION == VERSION_DEMO
src/d/actor/d_a_fallrock.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000098-00000140 .text CreateHeap__12daFallRock_cFv */
BOOL daFallRock_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(m_arcname, ALWAYS_BDL_KROCK_00);
JUT_ASSERT(VERSION_SELECT(159, 161, 161, 161), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(159, 161), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000,0x11020002);
return TRUE;
src/d/actor/d_a_ff.cpp
+1 -1
View File
@@ -257,7 +257,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
for (int i = 0; i < 2; i++) {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Ff", ho_bmd[i]);
JUT_ASSERT(VERSION_SELECT(717, 719, 719, 719), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(717, 719), modelData != NULL);
#if VERSION > VERSION_DEMO
if (modelData == NULL) {
return FALSE;
src/d/actor/d_a_ghostship.cpp
+3 -3
View File
@@ -35,7 +35,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(VERSION_SELECT(80, 88, 88, 88), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(80, 88), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if(!mpModel) {
@@ -43,7 +43,7 @@ BOOL daGhostship_c::_createHeap() {
}
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BTK_AYUSH));
JUT_ASSERT(VERSION_SELECT(87, 95, 95, 95), btk != NULL);
JUT_ASSERT(DEMO_SELECT(87, 95), btk != NULL);
if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) {
return false;
@@ -369,7 +369,7 @@ bool daGhostship_c::_execute() {
) {
mDoAud_seStart(JA_SE_LK_WARP_TO_G_SHIP);
stage_scls_info_class* scls_data = dComIfGd_getMeshSceneList(current.pos);
JUT_ASSERT(VERSION_SELECT(457, 463, 463, 463), scls_data != NULL)
JUT_ASSERT(DEMO_SELECT(457, 463), scls_data != NULL)
u8 startCode = scls_data->mStart;
dComIfGs_setEventReg(0xC3FF, scls_data->mRoom);
src/d/actor/d_a_msw.cpp
+1 -1
View File
@@ -219,7 +219,7 @@ BOOL daMsw_CreateInit(fopAc_ac_c* i_this) {
}
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Msw", MSW_BDL_OBM_CHAIN1));
JUT_ASSERT(VERSION_SELECT(519, 523, 523, 523), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(519, 523), modelData != NULL);
for (int chainIdx = 0; chainIdx < 4; chainIdx++) {
pActor->mpChainModels[chainIdx] = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
src/d/actor/d_a_nh.cpp
+2 -2
View File
@@ -112,7 +112,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(VERSION_SELECT(357, 359, 359, 359), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(357, 359), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (!mpModel) {
@@ -438,7 +438,7 @@ BOOL daNh_c::initBrkAnm(bool i_modify) {
bool success = false;
J3DAnmTevRegKey* a_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Always", ALWAYS_BRK_TNH);
JUT_ASSERT(VERSION_SELECT(881, 883, 883, 883), a_brk != NULL);
JUT_ASSERT(DEMO_SELECT(881, 883), a_brk != NULL);
if (mBrkAnm.init(modelData, a_brk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, i_modify, false)) {
success = true;
src/d/actor/d_a_npc_km1.cpp
+3 -3
View File
@@ -724,7 +724,7 @@ BOOL daNpc_Km1_c::CreateHeap() {
a_mdl_data = (J3DModelData*)dComIfG_getObjectIDRes("Km",KM_BDL_KM);
JUT_ASSERT(VERSION_SELECT(1316, 1325, 1325, 1325) ,a_mdl_data != NULL);
JUT_ASSERT(DEMO_SELECT(1316, 1325) ,a_mdl_data != NULL);
mpMorf = new mDoExt_McaMorf(
a_mdl_data,
NULL, NULL,
@@ -735,9 +735,9 @@ BOOL daNpc_Km1_c::CreateHeap() {
if (mpMorf){
if(mpMorf->getModel()) {
m_head_jnt_num = a_mdl_data->getJointName()->getIndex("head");
JUT_ASSERT(VERSION_SELECT(1335, 1344, 1344, 1344), m_head_jnt_num >= 0);
JUT_ASSERT(DEMO_SELECT(1335, 1344), m_head_jnt_num >= 0);
m_backbone_jnt_num = a_mdl_data->getJointName()->getIndex("backbone");
JUT_ASSERT(VERSION_SELECT(1337, 1346, 1346, 1346), m_backbone_jnt_num >= 0);
JUT_ASSERT(DEMO_SELECT(1337, 1346), m_backbone_jnt_num >= 0);
field_0x7CD = a_tex_pattern_num_tbl[field_0x7D3];
if (initTexPatternAnm(false) != 0) {
field_0x6D4 = mDoExt_J3DModel__create(a_mdl_data,0x20000,0x11020203);
src/d/actor/d_a_obj_Ygush00.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ bool daObjYgush00_c::create_heap() {
J3DAnmTransform * pBck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(l_arcname, bck_table[mType]));
if (!pModelData || !pBtk || !pBck) {
JUT_ASSERT(VERSION_SELECT(203, 207, 207, 207), FALSE);
JUT_ASSERT(DEMO_SELECT(203, 207), FALSE);
ret = false;
} else {
mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000222);
src/d/actor/d_a_obj_dragonhead.cpp
+2 -2
View File
@@ -56,7 +56,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(VERSION_SELECT(158, 160, 160, 160), model_data != NULL);
JUT_ASSERT(DEMO_SELECT(158, 160), model_data != NULL);
mpModel = mDoExt_J3DModel__create(model_data, 0x00, 0x11020203);
if (!mpModel)
return FALSE;
@@ -117,7 +117,7 @@ cPhs_State daObjDragonhead_c::_create() {
cPhs_State ret = dComIfG_resLoad(&mPhs, "Qdghd");
if (ret == cPhs_COMPLEATE_e) {
if (fopAcM_entrySolidHeap(this, CheckCreateHeap, VERSION_SELECT(0x300, 0x10500, 0x10500, 0x10500)) == 0) {
if (fopAcM_entrySolidHeap(this, CheckCreateHeap, DEMO_SELECT(0x300, 0x10500)) == 0) {
ret = cPhs_ERROR_e;
} else {
CreateInit();
src/d/actor/d_a_obj_figure.cpp
+3 -3
View File
@@ -1088,14 +1088,14 @@ void linkDraw(mDoExt_McaMorf* pMorf) {
if (mtl->getZMode()->getCompareEnable() == 0) {
if ((u8)mtl->getBlend()->getType() == GX_BM_BLEND) {
ZOffBlendShape[zoff_blend_cnt++] = mtl->getShape();
JUT_ASSERT(VERSION_SELECT(1713, 1767, 1767, 1767), zoff_blend_cnt <= 4);
JUT_ASSERT(DEMO_SELECT(1713, 1767), zoff_blend_cnt <= 4);
} else {
ZOffNoneShape[zoff_none_cnt++] = mtl->getShape();
JUT_ASSERT(VERSION_SELECT(1717, 1770, 1770, 1770), zoff_none_cnt <= 4);
JUT_ASSERT(DEMO_SELECT(1717, 1770), zoff_none_cnt <= 4);
}
} else {
ZOnShape[zon_cnt++] = mtl->getShape();
JUT_ASSERT(VERSION_SELECT(1722, 1774, 1774, 1774), zon_cnt <= 4);
JUT_ASSERT(DEMO_SELECT(1722, 1774), zon_cnt <= 4);
}
mtl = mtl->getNext();
}
src/d/actor/d_a_obj_hami3.cpp
+2 -2
View File
@@ -39,7 +39,7 @@ static BOOL nodeCallBack(J3DNode *node, int calcTiming) {
/* 0000012C-0000026C .text CreateHeap__Q210daObjHami35Act_cFv */
BOOL daObjHami3::Act_c::CreateHeap() {
J3DModelData *modelData = (J3DModelData *)dComIfG_getObjectRes(M_arcname, HAMI3_BDL_HAMI3);
JUT_ASSERT(VERSION_SELECT(112, 113, 113, 113), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(112, 113), modelData != NULL);
field_0x2D4 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (field_0x2D4 != NULL) {
@@ -86,7 +86,7 @@ cPhs_State daObjHami3::Act_c::Mthd_Create() {
if (phase_state == cPhs_COMPLEATE_e) {
phase_state = MoveBGCreate(M_arcname, HAMI3_DZB_HAMI3, dBgS_MoveBGProc_Typical, 0x1fc0);
JUT_ASSERT(VERSION_SELECT(182, 183, 183, 183),
JUT_ASSERT(DEMO_SELECT(182, 183),
(phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e));
}
return phase_state;
src/d/actor/d_a_obj_hfuck1.cpp
+1 -1
View File
@@ -87,7 +87,7 @@ bool daObjHfuck1_c::create_heap() {
J3DModelData* pModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, HFUCK1_BDL_HFUCK1));
if (!pModelData) {
JUT_ASSERT(VERSION_SELECT(241, 245, 245, 245), FALSE);
JUT_ASSERT(DEMO_SELECT(241, 245), FALSE);
ret = false;
} else {
mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000022);
src/d/actor/d_a_obj_hha.cpp
+5 -5
View File
@@ -106,7 +106,7 @@ BOOL daObjHhaPart_c::set_mdl_area(const char* arcname, int index) {
BOOL ret;
ret = FALSE;
mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(arcname, index));
JUT_ASSERT(VERSION_SELECT(410, 473, 473, 473), mdl_data != NULL);
JUT_ASSERT(DEMO_SELECT(410, 473), mdl_data != NULL);
if(mdl_data != NULL){
mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11020203);
ret = TRUE;
@@ -204,19 +204,19 @@ BOOL daObjHhaYgush_c::create_area(const char* arcname) {
BOOL ret = FALSE;
J3DModelData* mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(arcname, HHA_BDL_YGSTP00));
JUT_ASSERT(VERSION_SELECT(577, 640, 640, 640), mdl_data != NULL);
JUT_ASSERT(DEMO_SELECT(577, 640), mdl_data != NULL);
if(mdl_data != NULL){
M_mdl = mDoExt_J3DModel__create(mdl_data, 0x80000, 0x11000222);
JUT_ASSERT(VERSION_SELECT(586, 649, 649, 649), M_mdl != NULL);
JUT_ASSERT(DEMO_SELECT(586, 649), M_mdl != NULL);
if(M_mdl != NULL){
J3DAnmTextureSRTKey* btk_data = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(arcname, HHA_BTK_YGSTP00));
JUT_ASSERT(VERSION_SELECT(593, 656, 656, 656), btk_data != NULL);
JUT_ASSERT(DEMO_SELECT(593, 656), btk_data != NULL);
if(mBtk.init(M_mdl->getModelData(), btk_data, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, false) != false){
J3DAnmTransform* bck_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(arcname, HHA_BCK_YGSTP00));
JUT_ASSERT(VERSION_SELECT(598, 661, 661, 661), bck_data != NULL);
JUT_ASSERT(DEMO_SELECT(598, 661), bck_data != NULL);
if(mBck.init(M_mdl->getModelData(), bck_data, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false) != false){
ret = TRUE;
src/d/actor/d_a_obj_homen.cpp
+2 -2
View File
@@ -224,7 +224,7 @@ bool Act_c::create_heap() {
};
J3DModelData* mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, bdl_idx[mType]);
JUT_ASSERT(VERSION_SELECT(578, 615, 615, 615), mdl_data != NULL);
JUT_ASSERT(DEMO_SELECT(578, 615), mdl_data != NULL);
#if VERSION > VERSION_DEMO
if (mdl_data != NULL)
#endif
@@ -239,7 +239,7 @@ bool Act_c::create_heap() {
#endif
cBgD_t* bgw_data = (cBgD_t*)dComIfG_getObjectRes(M_arcname, dzb_idx[mType]);
JUT_ASSERT(VERSION_SELECT(590, 628, 628, 628), bgw_data != NULL);
JUT_ASSERT(DEMO_SELECT(590, 628), bgw_data != NULL);
#if VERSION > VERSION_DEMO
if (bgw_data != NULL)
#endif
src/d/actor/d_a_obj_ladder.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ cPhs_State daObjLadder::Act_c::Mthd_Create() {
mType = prm_get_type();
phase_state = MoveBGCreate(
M_arcname, attr_type(mType).dzbId, dBgS_MoveBGProc_Trans,
VERSION_SELECT(0x1700, 0x900, 0x900, 0x900)
DEMO_SELECT(0x1700, 0x900)
);
JUT_ASSERT(0x1DE, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e));
src/d/actor/d_a_player_main.cpp
+6 -6
View File
@@ -11878,16 +11878,16 @@ void daPy_lk_c::initTextureAnime() {
/* 80123360-80123830 .text initTextureScroll__9daPy_lk_cFv */
void daPy_lk_c::initTextureScroll() {
m_tex_scroll_heap.m_buffer = new(0x20) u8[0x800];
JUT_ASSERT(VERSION_SELECT(20757, 20944, 20944, 20944), m_tex_scroll_heap.m_buffer != NULL);
JUT_ASSERT(DEMO_SELECT(20757, 20944), m_tex_scroll_heap.m_buffer != NULL);
JKRReadIdxResource(m_tex_scroll_heap.m_buffer, 0x800, LKANM_BTK_TMABA, dComIfGp_getAnmArchive());
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(J3DAnmLoaderDataBase::load(m_tex_scroll_heap.m_buffer));
btk->searchUpdateMaterialID(mpCLModelData);
u16 material_num = btk->getUpdateMaterialNum();
JUT_ASSERT(VERSION_SELECT(20771, 20958, 20958, 20958), material_num == 2);
JUT_ASSERT(DEMO_SELECT(20771, 20958), material_num == 2);
m_texMtxAnm = new J3DTexMtxAnm[material_num];
JUT_ASSERT(VERSION_SELECT(20774, 20961, 20961, 20961), m_texMtxAnm != NULL);
JUT_ASSERT(DEMO_SELECT(20774, 20961), m_texMtxAnm != NULL);
for (u16 no = 0; no < material_num; no++) {
u16 matID = btk->getUpdateMaterialID(no);
@@ -11896,7 +11896,7 @@ void daPy_lk_c::initTextureScroll() {
}
m_tex_eye_scroll[no] = new daPy_matAnm_c();
JUT_ASSERT(VERSION_SELECT(20785, 20972, 20972, 20972), m_tex_eye_scroll[no] != NULL);
JUT_ASSERT(DEMO_SELECT(20785, 20972), m_tex_eye_scroll[no] != NULL);
mpCLModelData->getMaterialNodePointer(matID)->change();
mpCLModelData->getMaterialNodePointer(matID)->setMaterialAnm(m_tex_eye_scroll[no]);
@@ -11910,7 +11910,7 @@ void daPy_lk_c::initTextureScroll() {
J3DTexMtx* tmtx;
if (mtl->getTexMtx(texMtxID) == NULL) {
tmtx = new J3DTexMtx();
JUT_ASSERT(VERSION_SELECT(20797, 20984, 20984, 20984), tmtx != NULL);
JUT_ASSERT(DEMO_SELECT(20797, 20984), tmtx != NULL);
mtl->setTexMtx(texMtxID, tmtx);
}
if (mtl->getTexCoord(texMtxID) != NULL) {
@@ -11927,7 +11927,7 @@ void daPy_lk_c::initTextureScroll() {
tmtxinfo.mCenter.y = btk->getSRTCenter(no).y;
tmtxinfo.mCenter.z = btk->getSRTCenter(no).z;
JUT_ASSERT(VERSION_SELECT(20814, 21001, 21001, 21001), mtl->getMaterialAnm() != NULL);
JUT_ASSERT(DEMO_SELECT(20814, 21001), mtl->getMaterialAnm() != NULL);
mtl->getMaterialAnm()->setTexMtxAnm(texMtxID, &m_texMtxAnm[no]);
}
src/d/actor/d_a_rd.cpp
+3 -3
View File
@@ -199,7 +199,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
/* 000006C0-0000096C .text _createHeap__6daRd_cFv */
BOOL daRd_c::_createHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, RD_BDL_RD));
JUT_ASSERT(VERSION_SELECT(502, 504, 504, 504), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(502, 504), modelData != NULL);
mpMorf = new mDoExt_McaMorf(
modelData,
@@ -220,7 +220,7 @@ BOOL daRd_c::_createHeap() {
}
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, RD_BTK_RD_CLOSE));
JUT_ASSERT(VERSION_SELECT(528, 525, 525, 525), btk != NULL);
JUT_ASSERT(DEMO_SELECT(528, 525), btk != NULL);
if (!mBtkAnm.init(modelData, btk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) {
return FALSE;
}
@@ -228,7 +228,7 @@ BOOL daRd_c::_createHeap() {
modelData->getJointNodePointer(0x0C)->setCallBack(nodeHeadControl_CB); // ree_atama_1
J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_arc_name, RD_BRK_NML));
JUT_ASSERT(VERSION_SELECT(553, 550, 550, 550), brk != NULL);
JUT_ASSERT(DEMO_SELECT(553, 550), brk != NULL);
if (!mBrkAnm.init(modelData, brk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) {
return FALSE;
}
src/d/actor/d_a_ship.cpp
+6 -6
View File
@@ -2183,7 +2183,7 @@ BOOL daShip_c::procZevDemo() {
fVar17 = local_70.absXZ();
if (!dComIfGp_evmng_getMyFloatP(mEvtStaffId, "rad")) {
JUT_ASSERT(VERSION_SELECT(3722, 3741, 3741, 3741), 0);
JUT_ASSERT(DEMO_SELECT(3722, 3741), 0);
}
fVar3 = *dComIfGp_evmng_getMyFloatP(mEvtStaffId, "rad");
@@ -4384,7 +4384,7 @@ BOOL daShip_c::createHeap() {
m0392 = SHIP_BCK_FN_MAST_OFF2;
}
modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_FN_BODY);
JUT_ASSERT(VERSION_SELECT(6969, 7004, 7004, 7004), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(6969, 7004), modelData != NULL);
mpBodyAnm = new mDoExt_McaMorf(
modelData, NULL, NULL,
@@ -4409,7 +4409,7 @@ BOOL daShip_c::createHeap() {
}
modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_VFNCN);
JUT_ASSERT(VERSION_SELECT(7006, 7041, 7041, 7041), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(7006, 7041), modelData != NULL);
mpCannonModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
if (mpCannonModel == NULL) {
@@ -4417,7 +4417,7 @@ BOOL daShip_c::createHeap() {
}
modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_VFNCR);
JUT_ASSERT(VERSION_SELECT(7019, 7054, 7054, 7054), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(7019, 7054), modelData != NULL);
mpSalvageArmModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
if (mpSalvageArmModel == NULL) {
@@ -4425,7 +4425,7 @@ BOOL daShip_c::createHeap() {
}
modelData = (J3DModelData *)dComIfG_getObjectRes("Link", LINK_BDL_ROPEEND);
JUT_ASSERT(VERSION_SELECT(7032, 7067, 7067, 7067), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(7032, 7067), modelData != NULL);
mpLinkModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
if (mpLinkModel == NULL) {
@@ -4433,7 +4433,7 @@ BOOL daShip_c::createHeap() {
}
modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_FN_HEAD_H);
JUT_ASSERT(VERSION_SELECT(7045, 7080, 7080, 7080), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(7045, 7080), modelData != NULL);
m03B4 = SHIP_BCK_FN_LOOK_L;
src/d/actor/d_a_vrbox2.cpp
+1 -1
View File
@@ -264,7 +264,7 @@ static BOOL daVrbox2_solidHeapCB(fopAc_ac_c* i_actor) {
vrbox2_class* i_this = static_cast<vrbox2_class*>(i_actor);
J3DModelData* modelData = (J3DModelData*)dComIfG_getStageRes("Stage", "vr_back_cloud.bdl");
JUT_ASSERT(VERSION_SELECT(511, 529, 529, 529), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(511, 529), modelData != NULL);
i_this->mpBackCloud = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020202);
modelData = (J3DModelData*)dComIfG_getStageRes("Stage", "vr_kasumi_mae.bdl");
src/d/actor/d_a_windmill.cpp
+1 -1
View File
@@ -140,7 +140,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_ac) {
/* 00000108-000002A0 .text CreateHeap__12daWindMill_cFv */
BOOL daWindMill_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(m_arcname[mType], m_bmdidx[mType]);
JUT_ASSERT(VERSION_SELECT(399, 405, 405, 405), modelData != NULL);
JUT_ASSERT(DEMO_SELECT(399, 405), modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000,0x11000222);
if (mpModel == NULL) {