falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix setLightTevColorType_MAJI usage (#2103)

This commit is contained in:
Caroline Madsen 2024-03-20 17:41:42 -04:00 committed by GitHub
parent 4ea2b399be
commit 5845e695ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
45 changed files with 61 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/d/kankyo/d_kankyo.h
View File

@ -277,6 +277,9 @@ public:
/* 801ADBBC */ virtual ~dScnKy_env_light_c();
void setLightTevColorType(J3DModel* i_model, dKy_tevstr_c* tevstr) {
setLightTevColorType(i_model->getModelData(), tevstr);
}
void setLightTevColorType_MAJI(J3DModel* i_model, dKy_tevstr_c* tevstr) {
setLightTevColorType_MAJI(i_model->getModelData(), tevstr);
}

8
rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp
View File

@ -1369,7 +1369,7 @@ int daB_DS_c::draw() {
J3DModel* model = mpMorf->getModel();
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(model->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(model, &tevStr);
J3DModelData* model_data = model->getModelData();
if (mType == PHASE_2) {
@ -1392,7 +1392,7 @@ int daB_DS_c::draw() {
if (!mNoDrawSword) {
J3DModel* sword_model = mpSwordMorf->getModel();
g_env_light.settingTevStruct(0, &mSwordPos, &tevStr);
g_env_light.setLightTevColorType_MAJI(sword_model->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(sword_model, &tevStr);
mpSwordBrkAnm->entry(sword_model->getModelData());
mpSwordMorf->entryDL();
}
@ -1450,7 +1450,7 @@ int daB_DS_c::draw() {
if (!mNoDrawSword) {
J3DModel* sword_model = mpSwordMorf->getModel();
g_env_light.settingTevStruct(0, &mSwordPos, &tevStr);
g_env_light.setLightTevColorType_MAJI(sword_model->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(sword_model, &tevStr);
mpSwordBrkAnm->entry(sword_model->getModelData());
mpSwordMorf->entryDL();
}
@ -1464,7 +1464,7 @@ int daB_DS_c::draw() {
if (mDrawZant) {
J3DModel* zant_model = mpZantMorf->getModel();
g_env_light.settingTevStruct(3, &mSwordPos, &tevStr);
g_env_light.setLightTevColorType_MAJI(zant_model->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(zant_model, &tevStr);
J3DShape* shape =
mpZantMorf->getModel()->getModelData()->getMaterialNodePointer(2)->getShape();
if (shape != NULL) {

2
rel/d/a/b/d_a_b_go/d_a_b_go.cpp
View File

@ -65,7 +65,7 @@ static int daB_GO_Draw(b_go_class* i_this) {
J3DModel* model = i_this->mpMorf->getModel();
g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(model->getModelData(), &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(model, &i_this->tevStr);
i_this->mpMorf->entryDL();
}

2
rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp
View File

@ -46,7 +46,7 @@ static int daB_GOS_Draw(b_gos_class* i_this) {
J3DModel* model = i_this->mpMorf->getModel();
g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(model->getModelData(), &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(model, &i_this->tevStr);
i_this->mpMorf->entryDL();
cXyz sp28;

2
rel/d/a/d_a_mirror/d_a_mirror.cpp
View File

@ -617,7 +617,7 @@ int daMirror_c::draw() {
if (mpModel != NULL) {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType(mpModel, &tevStr);
mDoExt_modelUpdateDL(mpModel);
}

2
rel/d/a/d_a_myna/d_a_myna.cpp
View File

@ -1427,7 +1427,7 @@ int daMyna_c::draw() {
J3DModel* model = mpMorf->getModel();
J3DModelData* modelData = model->getModelData();
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(model->getModelData(), &tevStr);
g_env_light.setLightTevColorType_MAJI(model, &tevStr);
if (cLib_checkBit<u16>(field_0x914, 0x40)) {
mBtpAnm.entry(modelData);
}

4
rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp
View File

@ -765,12 +765,12 @@ int daBdoor_c::draw() {
fopAcM_OffStatus(this, 0);
}
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpDoorModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpDoorModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpDoorModel);
dComIfGd_setList();
if (mLocked) {
g_env_light.setLightTevColorType_MAJI(mpLockModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpLockModel, &tevStr);
mpLockAnm->entry(mpLockModel->getModelData());
mDoExt_modelUpdateDL(mpLockModel);
}

2
rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp
View File

@ -730,7 +730,7 @@ int daE_YM_c::draw() {
J3DModel* model_p = field_0x5b4->getModel();
g_env_light.settingTevStruct(6, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(model_p->getModelData(), &tevStr);
g_env_light.setLightTevColorType_MAJI(model_p, &tevStr);
J3DModelData* modelData_p = model_p->getModelData();
for (u16 i = 0; i < modelData_p->getMaterialNum(); i++) {

4
rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp
View File

@ -1153,11 +1153,11 @@ int daNpcAsh_c::Draw() {
mMcaMorf->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm);
draw(0, 0, daNpcAsh_Param_c::m.mShadow, NULL, 0);
if (field_0xf60 == 1) {
g_env_light.setLightTevColorType_MAJI(mModelBow->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mModelBow, &tevStr);
mDoMtx_stack_c::copy(mMcaMorf->getModel()->getAnmMtx(16));
mModelBow->setBaseTRMtx(mDoMtx_stack_c::get());
mDoExt_modelUpdateDL(mModelBow);
g_env_light.setLightTevColorType_MAJI(mModelQuiver->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mModelQuiver, &tevStr);
mDoMtx_stack_c::copy(mMcaMorf->getModel()->getAnmMtx(2));
mModelQuiver->setBaseTRMtx(mDoMtx_stack_c::get());
mDoExt_modelUpdateDL(mModelQuiver);

5
rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp
View File

@ -624,7 +624,7 @@ static int daNpc_Ne_Draw(npc_ne_class* i_this) {
} else {
g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
}
g_env_light.setLightTevColorType_MAJI(model->mModelData, &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(model, &i_this->tevStr);
i_this->mpBtkAnm->entry(model->getModelData());
i_this->mpBtpAnm->entry(model->getModelData());
@ -640,8 +640,7 @@ static int daNpc_Ne_Draw(npc_ne_class* i_this) {
}
if (i_this->field_0x5b4 == 3) {
g_env_light.setLightTevColorType_MAJI(i_this->mpDishMorf->getModel()->mModelData,
&i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(i_this->mpDishMorf->getModel(), &i_this->tevStr);
i_this->mpDishMorf->entryDL();
}

2
rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp
View File

@ -222,7 +222,7 @@ static asm int nodeCallBack(J3DJoint* param_0, int param_1) {
/* 80B25B78-80B25BDC 000258 0064+00 1/0 0/0 0/0 .text daNPC_TR_Draw__FP12npc_tr_class */
static int daNPC_TR_Draw(npc_tr_class* npc_tr) {
g_env_light.settingTevStruct(0, &npc_tr->current.pos, &npc_tr->tevStr);
g_env_light.setLightTevColorType_MAJI(npc_tr->field_0x5b8->mModelData, &npc_tr->tevStr);
g_env_light.setLightTevColorType_MAJI(npc_tr->field_0x5b8, &npc_tr->tevStr);
mDoExt_modelUpdateDL(npc_tr->field_0x5b8);
return 1;
}

2
rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp
View File

@ -156,7 +156,7 @@ void daBarDesk_c::setBreakEffect() {
/* 80BA98E8-80BA998C 000848 00A4+00 1/0 0/0 0/0 .text Draw__11daBarDesk_cFv */
int daBarDesk_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();

2
rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp
View File

@ -111,7 +111,7 @@ int daObj_Bed_c::Execute() {
/* 80BADDF4-80BADEB8 000874 00C4+00 1/1 0/0 0/0 .text Draw__11daObj_Bed_cFv */
int daObj_Bed_c::Draw() {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
mDoExt_modelUpdateDL(mpModel);
if (mGroundH != -1e9f) {
mShadow = dComIfGd_setShadow(mShadow, 1, mpModel, &current.pos,

2
rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp
View File

@ -109,7 +109,7 @@ static int daObjBombf_Execute(daObjBombf_c* i_this) {
/* 80BBADF8-80BBAE5C 000478 0064+00 1/1 0/0 0/0 .text draw__12daObjBombf_cFv */
int daObjBombf_c::draw() {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(field_0x570->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(field_0x570, &tevStr);
mDoExt_modelUpdateDL(field_0x570);
return 1;
}

2
rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp
View File

@ -1009,7 +1009,7 @@ void daObjBossWarp_c::setGoal() {
/* 8057B190-8057B23C 001BD0 00AC+00 1/1 0/0 0/0 .text draw__15daObjBossWarp_cFv */
int daObjBossWarp_c::draw() {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
mpBrkAnm->entry(mpModel->getModelData());
mpBtkAnm[0]->entry(mpModel->getModelData());
mpBtkAnm[1]->entry(mpModel->getModelData());

2
rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp
View File

@ -162,7 +162,7 @@ void daBsGate_c::modeClose() {
/* 80BC2F94-80BC3038 0007F4 00A4+00 1/0 0/0 0/0 .text Draw__10daBsGate_cFv */
int daBsGate_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();

2
rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp
View File

@ -316,7 +316,7 @@ void daObjCdoor_c::actionDead() {
/* 80BC7C04-80BC7CE4 000EC4 00E0+00 1/0 0/0 0/0 .text Draw__12daObjCdoor_cFv */
int daObjCdoor_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
if (mType == 1) {
J3DModelData* model_data = mpModel->getModelData();
if (mIsOpen) {

2
rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.cpp
View File

@ -82,7 +82,7 @@ int daObjChandelier_c::Delete() {
/* 80BC8194-80BC8238 0002D4 00A4+00 1/0 0/0 0/0 .text Draw__17daObjChandelier_cFv */
int daObjChandelier_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();

2
rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp
View File

@ -494,7 +494,7 @@ int daObjCHO_c::Draw() {
Z_BufferChk();
J3DModel* model = mpMorf->getModel();
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(model->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(model, &tevStr);
mpBtkAnm->entry(model->getModelData());
mpBrkAnm->entry(model->getModelData());
mpMorf->entryDL();

2
rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp
View File

@ -65,7 +65,7 @@ int daCowdoor_c::Execute(f32 (**param_0)[3][4]) {
/* 80BCCA48-80BCCAEC 0002C8 00A4+00 1/0 0/0 0/0 .text Draw__11daCowdoor_cFv */
int daCowdoor_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(field_0x5a8->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(field_0x5a8, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(field_0x5a8);
dComIfGd_setList();

2
rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp
View File

@ -194,7 +194,7 @@ int daGraveStone_c::Execute(Mtx** i_mtxP) {
/* 80C13078-80C1311C 000AF8 00A4+00 1/0 0/0 0/0 .text Draw__14daGraveStone_cFv */
int daGraveStone_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();

2
rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp
View File

@ -69,7 +69,7 @@ int daHsTarget_c::Execute(f32 (**param_0)[3][4]) {
/* 80C1F6C4-80C1F728 000384 0064+00 1/0 0/0 0/0 .text Draw__12daHsTarget_cFv */
int daHsTarget_c::Draw() {
g_env_light.settingTevStruct(0x40, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
mDoExt_modelUpdateDL(mpModel);
return 1;
}

2
rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp
View File

@ -688,7 +688,7 @@ int daObjKABUTO_c::Draw() {
Z_BufferChk();
J3DModel* model = mpMorf->getModel();
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(model->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(model, &tevStr);
mpBtkAnm->entry(model->getModelData());
mpBrkAnm->entry(model->getModelData());
mpMorf->entryDL();

2
rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp
View File

@ -47,7 +47,7 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
static int daObj_Ki_Draw(obj_ki_class* i_this) {
J3DModel* model = i_this->mpMorf->getModel();
g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(model->mModelData, &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(model, &i_this->tevStr);
i_this->mpMorf->entryDL();
return 1;
}

2
rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp
View File

@ -42,7 +42,7 @@ daObj_Lbox_HIO_c::daObj_Lbox_HIO_c() {
*/
static int daObj_Lbox_Draw(obj_lbox_class* i_this) {
g_env_light.settingTevStruct(16, &i_this->current.pos, &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(i_this->mpModel->mModelData, &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr);
mDoExt_modelUpdateDL(i_this->mpModel);
return 1;
}

2
rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.cpp
View File

@ -245,7 +245,7 @@ int daLv1Cdl00_c::Execute() {
/* 80C567EC-80C56890 000BCC 00A4+00 1/1 0/0 0/0 .text Draw__12daLv1Cdl00_cFv */
int daLv1Cdl00_c::Draw() {
g_env_light.settingTevStruct(0x40, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();

2
rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.cpp
View File

@ -198,7 +198,7 @@ int daLv1Cdl01_c::Execute(f32 (**param_0)[3][4]) {
/* 80C575F4-80C57698 000A34 00A4+00 1/0 0/0 0/0 .text Draw__12daLv1Cdl01_cFv */
int daLv1Cdl01_c::Draw() {
g_env_light.settingTevStruct(0x40, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();

2
rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.cpp
View File

@ -369,7 +369,7 @@ int daLv2Candle_c::Execute() {
/* 8058EEC8-8058EF6C 000F68 00A4+00 1/1 0/0 0/0 .text Draw__13daLv2Candle_cFv */
int daLv2Candle_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();

2
rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp
View File

@ -62,7 +62,7 @@ int daObjProp_c::Delete() {
/* 80CB543C-80CB54A0 0002DC 0064+00 1/1 0/0 0/0 .text draw__11daObjProp_cFv */
int daObjProp_c::draw() {
g_env_light.settingTevStruct(NULL, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
mDoExt_modelUpdate(mpModel);
return 1;
}

4
rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp
View File

@ -71,8 +71,8 @@ int daObjRCircle_c::Delete() {
/* 80CB8A5C-80CB8B28 00047C 00CC+00 1/1 0/0 0/0 .text draw__14daObjRCircle_cFv */
int daObjRCircle_c::draw() {
g_env_light.settingTevStruct(16, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
J3DModelData* modelData = mpModel->mModelData;
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
J3DModelData* modelData = mpModel->getModelData();
mBtk.entry(modelData);
mBrk.entry(modelData);
dComIfGd_setListBG();

2
rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp
View File

@ -106,7 +106,7 @@ int daObj_Sekizo_c::Execute(Mtx** i_mtx) {
int daObj_Sekizo_c::Draw() {
if (!field_0x5b2) {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();

2
rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp
View File

@ -83,7 +83,7 @@ int daObjSnowSoup_c::Delete() {
/* 80CDFBC4-80CDFC40 0003E4 007C+00 1/1 0/0 0/0 .text draw__15daObjSnowSoup_cFv */
int daObjSnowSoup_c::draw() {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel[mState]->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel[mState], &tevStr);
mDoExt_modelUpdate(mpModel[mState]);
return 1;
}

2
rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp
View File

@ -151,7 +151,7 @@ int daObj_SSItem_c::Draw() {
return 1;
} else {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
mDoExt_modelUpdateDL(mpModel);
if (field_0xB00 != -1000000000.0f) {
cM3dGPla plane;

2
rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp
View File

@ -97,7 +97,7 @@ int daObjVGnd_c::execute() {
/* 80D21878-80D2194C 000518 00D4+00 1/1 0/0 0/0 .text draw__11daObjVGnd_cFv */
int daObjVGnd_c::draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
mpBrk->entry(mpModel->getModelData());
mpBtk->entry(mpModel->getModelData());
dComIfGd_setListDarkBG();

2
rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp
View File

@ -892,7 +892,7 @@ asm void daObjWchain_shape_c::draw() {
// matches once daObjWchain_shape_c inheritance is resolved
int daObjWchain_c::draw() {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpHandleModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpHandleModel, &tevStr);
mDoExt_modelUpdateDL(mpHandleModel);
g_env_light.setLightTevColorType_MAJI(mpChainModelData, &tevStr);
dComIfGd_getOpaList()->entryImm(&mShape, 0);

2
rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp
View File

@ -139,7 +139,7 @@ int daObjWindow_c::Execute(Mtx** i_mtx) {
/* 80D38F28-80D39000 000848 00D8+00 1/0 0/0 0/0 .text Draw__13daObjWindow_cFv */
int daObjWindow_c::Draw() {
g_env_light.settingTevStruct(0x14, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
if (mpBckAnm != NULL) {
mpBckAnm->entry(mpModel->getModelData());

4
rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp
View File

@ -57,13 +57,13 @@ static int daObj_Ystone_Draw(obj_ystone_class* i_this) {
g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
if (i_this->mLevel < 3) {
if (!i_this->field_0x59b) {
g_env_light.setLightTevColorType_MAJI(i_this->mpModel->mModelData, &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr);
i_this->mpBrkAnm->entry(i_this->mpModel->getModelData());
mDoExt_modelUpdateDL(i_this->mpModel);
}
} else {
J3DModel* model = i_this->mpMorf->getModel();
g_env_light.setLightTevColorType_MAJI(model->mModelData, &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(model, &i_this->tevStr);
if (i_this->field_0x59a) {
i_this->mpBtkAnm->entry(model->getModelData());
}

4
rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp
View File

@ -599,8 +599,8 @@ void daZrTurara_c::modeEnd() {
/* 80D412B0-80D41380 000E30 00D0+00 1/0 0/0 0/0 .text Draw__12daZrTurara_cFv */
int daZrTurara_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpBaseModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpRockModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpBaseModel, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpRockModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpBaseModel);
if (mDrawRock) {

2
rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.cpp
View File

@ -174,7 +174,7 @@ void daZrTuraRc_c::modeDropEnd() {
/* 80D42160-80D421C4 0009C0 0064+00 1/1 0/0 0/0 .text Draw__12daZrTuraRc_cFv */
int daZrTuraRc_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
mDoExt_modelUpdateDL(mpModel);
return 1;
}

2
rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp
View File

@ -277,7 +277,7 @@ int daZraFreeze_c::Draw() {
if (field_0x5b0 == 0xff || dComIfGs_isSwitch(field_0x5b0, fopAcM_GetRoomNo(this))) {
if (mTwilight != 0 && dComIfGs_wolfeye_effect_check() == true) {
g_env_light.settingTevStruct(4, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
mDoExt_modelUpdateDL(mpModel);
}
}

4
rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp
View File

@ -109,14 +109,14 @@ int daObjZraRock_c::Execute(Mtx** i_mtx) {
int daObjZraRock_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
if (mDemoStart) {
g_env_light.setLightTevColorType_MAJI(mpModelXlu->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModelXlu, &tevStr);
dComIfGd_setListBG();
mBrkAnm.entry(mpModelXlu->getModelData());
mDoExt_modelUpdateDL(mpModelXlu);
mBrkAnm.remove(mpModelXlu->getModelData());
dComIfGd_setList();
} else {
g_env_light.setLightTevColorType_MAJI(mpModelOpa->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModelOpa, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModelOpa);
dComIfGd_setList();

4
rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp
View File

@ -361,9 +361,9 @@ int daObjMirrorChain_c::draw() {
static f32 const SCISSOR_CENTER_Z = -23024.53f;
static f32 const SCISSOR_SIZE = 984.0f;
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) {
g_env_light.setLightTevColorType_MAJI(mpPortalModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpPortalModel, &tevStr);
if (mpBckAnm != NULL) {
mpBckAnm->entry(mpPortalModel->getModelData());
}

2
rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.cpp
View File

@ -256,7 +256,7 @@ int daObjMirrorScrew_c::Execute(Mtx** i_mtxP) {
/* 80C99608-80C996AC 000BA8 00A4+00 1/0 0/0 0/0 .text Draw__18daObjMirrorScrew_cFv */
int daObjMirrorScrew_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();

6
rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp
View File

@ -341,10 +341,10 @@ static int daObjMirrorTable_Draw(daObjMirrorTable_c* i_this) {
/* 80C9A298-80C9A4B0 0009F8 0218+00 1/1 0/0 0/0 .text draw__18daObjMirrorTable_cFv */
int daObjMirrorTable_c::draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpTableModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpMirrorModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpTableModel, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpMirrorModel, &tevStr);
if (mpStairModel != NULL) {
g_env_light.setLightTevColorType_MAJI(mpStairModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpStairModel, &tevStr);
}
mpTableUpBckAnm->entry(mpTableModel->getModelData());
dComIfGd_setListBG();

4
src/d/a/d_a_npc.cpp
View File

@ -1847,13 +1847,13 @@ int daNpcT_c::draw(int param_0, int i_setEffMtx, f32 param_2, GXColorS10* i_colo
drawGhost();
} else if (field_0xa89 != 0) {
g_env_light.settingTevStruct(4, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(model->getModelData(), &tevStr);
g_env_light.setLightTevColorType_MAJI(model, &tevStr);
dComIfGd_setListDark();
mMcaMorfAnm[0]->entryDL();
dComIfGd_setList();
} else {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(model->getModelData(), &tevStr);
g_env_light.setLightTevColorType_MAJI(model, &tevStr);
mMcaMorfAnm[0]->entryDL();
}