diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 4a7b94e3a..f6b8d6430 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -557,7 +557,7 @@ public: void draw(); - void entryOpa() { j3dSys.getDrawBuffer(0)->entryImm(this, 0); } + void entryOpa() { j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(this, 0); } }; class mDoExt_onCupOffAupPacket : public J3DPacket { @@ -566,7 +566,7 @@ public: void draw(); - void entryOpa() { j3dSys.getDrawBuffer(0)->entryImm(this, 0); } + void entryOpa() { j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(this, 0); } }; class mDoExt_3Dline_c { diff --git a/src/JSystem/J3DGraphAnimator/J3DJoint.cpp b/src/JSystem/J3DGraphAnimator/J3DJoint.cpp index a9bd17103..24b2fd2ac 100644 --- a/src/JSystem/J3DGraphAnimator/J3DJoint.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DJoint.cpp @@ -229,8 +229,8 @@ void J3DJoint::calcOut() { /* 802F58D8-802F5A78 .text entryIn__8J3DJointFv */ void J3DJoint::entryIn() { MtxP anmMtx = j3dSys.getModel()->getAnmMtx(mJntNo); - j3dSys.getDrawBuffer(0)->setZMtx(anmMtx); - j3dSys.getDrawBuffer(1)->setZMtx(anmMtx); + j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->setZMtx(anmMtx); + j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu)->setZMtx(anmMtx); for (J3DMaterial* mesh = mMesh; mesh != NULL; ) { if (mesh->getShape()->checkFlag(J3DShpFlag_Hide)) { mesh = mesh->getNext(); diff --git a/src/d/actor/d_a_bwdg.cpp b/src/d/actor/d_a_bwdg.cpp index bcb2b401b..e36d95378 100644 --- a/src/d/actor/d_a_bwdg.cpp +++ b/src/d/actor/d_a_bwdg.cpp @@ -69,7 +69,7 @@ static BOOL daBwdg_Draw(bwdg_class* i_this) { MtxTrans(0.0f, 10.0f + f1, 0.0f, 0); cMtx_concat(j3dSys.getViewMtx(), *calc_mtx, i_this->mBwdgPacket.getMtx()); i_this->mBwdgPacket.setTevStr(&i_this->tevStr); - j3dSys.getDrawBuffer(0)->entryImm(&i_this->mBwdgPacket, 0); + j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(&i_this->mBwdgPacket, 0); return TRUE; } diff --git a/src/d/actor/d_a_goal_flag.cpp b/src/d/actor/d_a_goal_flag.cpp index f6e578742..5ed2fa41f 100644 --- a/src/d/actor/d_a_goal_flag.cpp +++ b/src/d/actor/d_a_goal_flag.cpp @@ -934,7 +934,7 @@ bool daGoal_Flag_c::_draw() { cMtx_concat(j3dSys.getViewMtx(), *calc_mtx, mFlagPacket.getMtx()); mFlagPacket.setTevStr(&tevStr); - j3dSys.getDrawBuffer(0)->entryImm(&mFlagPacket, 0); + j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(&mFlagPacket, 0); for (int i = 0; i < mNumRopes; i++) { GXColor rope_color; diff --git a/src/d/actor/d_a_majuu_flag.cpp b/src/d/actor/d_a_majuu_flag.cpp index f8defffe3..39415aa2e 100644 --- a/src/d/actor/d_a_majuu_flag.cpp +++ b/src/d/actor/d_a_majuu_flag.cpp @@ -493,7 +493,7 @@ static BOOL daMajuu_Flag_Draw(daMajuu_Flag_c* i_this) { } else { i_this->mPacket.setTevStr(&i_this->tevStr); } - j3dSys.getDrawBuffer(0)->entryImm(&i_this->mPacket, 0); + j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(&i_this->mPacket, 0); return TRUE; } diff --git a/src/d/actor/d_a_pirate_flag.cpp b/src/d/actor/d_a_pirate_flag.cpp index 35853822e..4b97a6108 100644 --- a/src/d/actor/d_a_pirate_flag.cpp +++ b/src/d/actor/d_a_pirate_flag.cpp @@ -277,7 +277,7 @@ static BOOL daPirate_Flag_Draw(pirate_flag_class* i_this) { cMtx_concat(j3dSys.getViewMtx(), *calc_mtx, i_this->mPacket.getMtx()); i_this->mPacket.setTevStr(&i_this->tevStr); - j3dSys.getDrawBuffer(0)->entryImm(&i_this->mPacket, 0); + j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(&i_this->mPacket, 0); if (l_HIO.m05 != 0) { s16 tmp_r29 = i_this->current.angle.y; diff --git a/src/d/actor/d_a_sail.cpp b/src/d/actor/d_a_sail.cpp index 88d7bacb3..987c3822b 100644 --- a/src/d/actor/d_a_sail.cpp +++ b/src/d/actor/d_a_sail.cpp @@ -333,7 +333,7 @@ static BOOL daSail_Draw(sail_class* i_this) { i_this->mSailPacket.setTevStr(&i_this->tevStr); - j3dSys.getDrawBuffer(0)->entryImm(&i_this->mSailPacket, 0); + j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(&i_this->mSailPacket, 0); return TRUE; } diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp index 30ce80b3f..8813d924a 100644 --- a/src/d/actor/d_a_sea.cpp +++ b/src/d/actor/d_a_sea.cpp @@ -1140,7 +1140,7 @@ void daSea_packet_c::draw() { /* 8015D80C-8015D87C .text daSea_Draw__FP9sea_class */ static BOOL daSea_Draw(sea_class* i_this) { dComIfGd_setListSky(); - j3dSys.getDrawBuffer(1)->entryImm(&l_cloth, 31); + j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu)->entryImm(&l_cloth, 31); dComIfGd_setList(); return TRUE; } diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index f4dd5db2f..1436e15e2 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -1356,17 +1356,17 @@ u32 dDlst_shadowReal_c::set(u32 key, s8 shouldFade, J3DModel* model, cXyz* pos, mModelNum = 0; } - J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0); - J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1); + J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa); + J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu); j3dSys.setViewMtx(mViewMtx); - j3dSys.setDrawBuffer(mpDrawBuffer, 0); - j3dSys.setDrawBuffer(mpDrawBuffer, 1); + j3dSys.setDrawBuffer(mpDrawBuffer, J3DSysDrawBuf_Opa); + j3dSys.setDrawBuffer(mpDrawBuffer, J3DSysDrawBuf_Xlu); model->entry(); model->lock(); model->viewCalc(); j3dSys.setViewMtx(dComIfGd_getView()->mViewMtx); - j3dSys.setDrawBuffer(buffer0, 0); - j3dSys.setDrawBuffer(buffer1, 1); + j3dSys.setDrawBuffer(buffer0, J3DSysDrawBuf_Opa); + j3dSys.setDrawBuffer(buffer1, J3DSysDrawBuf_Xlu); return mKey; } diff --git a/src/d/d_flower.cpp b/src/d/d_flower.cpp index d3e79f219..dd9e7bc83 100644 --- a/src/d/d_flower.cpp +++ b/src/d/d_flower.cpp @@ -477,7 +477,7 @@ void dFlower_packet_c::update() { } } - j3dSys.getDrawBuffer(0)->entryImm(this, 0); + j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(this, 0); } /* 800C0EF4-800C10D4 .text setData__16dFlower_packet_cFP14dFlower_data_ciScR4cXyziSc */ diff --git a/src/d/d_grass.cpp b/src/d/d_grass.cpp index a82209571..17d324dc1 100644 --- a/src/d/d_grass.cpp +++ b/src/d/d_grass.cpp @@ -411,7 +411,7 @@ void dGrass_packet_c::update() { data++; } mDoLib_clipper::resetFar(); - j3dSys.getDrawBuffer(0)->entryImm(this, 0); + j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(this, 0); } /* 800784E8-800785C0 .text setData__15dGrass_packet_cFP13dGrass_data_ciR4cXyziSc */ diff --git a/src/d/d_magma.cpp b/src/d/d_magma.cpp index 20450a5c9..c760fec48 100644 --- a/src/d/d_magma.cpp +++ b/src/d/d_magma.cpp @@ -366,7 +366,7 @@ void dMagma_packet_c::update() { if (floor->getBall() != NULL) floor->update(); } - j3dSys.getDrawBuffer(0)->entryImm(this, 0); + j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(this, 0); } /* 800767E4-80076924 .text checkYpos__15dMagma_packet_cFR4cXyz */ diff --git a/src/d/d_material.cpp b/src/d/d_material.cpp index b64aa3aa8..e664a4454 100644 --- a/src/d/d_material.cpp +++ b/src/d/d_material.cpp @@ -53,8 +53,8 @@ void dMat_ice_c::copy(J3DModelData* modelData) { /* 8006F83C-8006F90C .text updateDL__10dMat_ice_cFP8J3DModelScP21mDoExt_invisibleModel */ void dMat_ice_c::updateDL(J3DModel* model, s8 backupNo, mDoExt_invisibleModel* inv) { - J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0); - J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1); + J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa); + J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu); J3DModelData* modelData = model->getModelData(); if (backupNo < 0) dMat_control_c::push(modelData); @@ -69,14 +69,14 @@ void dMat_ice_c::updateDL(J3DModel* model, s8 backupNo, mDoExt_invisibleModel* i if (inv != NULL) inv->entry(); - j3dSys.setDrawBuffer(buffer0, 0); - j3dSys.setDrawBuffer(buffer1, 1); + j3dSys.setDrawBuffer(buffer0, J3DSysDrawBuf_Opa); + j3dSys.setDrawBuffer(buffer1, J3DSysDrawBuf_Xlu); } /* 8006F90C-8006F9E0 .text updateDL__10dMat_ice_cFP14mDoExt_McaMorfScP21mDoExt_invisibleModel */ void dMat_ice_c::updateDL(mDoExt_McaMorf* morf, s8 backupNo, mDoExt_invisibleModel* inv) { - J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0); - J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1); + J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa); + J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu); J3DModelData* modelData = morf->getModel()->getModelData(); if (backupNo < 0) dMat_control_c::push(modelData); @@ -91,14 +91,14 @@ void dMat_ice_c::updateDL(mDoExt_McaMorf* morf, s8 backupNo, mDoExt_invisibleMod if (inv != NULL) inv->entry(); - j3dSys.setDrawBuffer(buffer0, 0); - j3dSys.setDrawBuffer(buffer1, 1); + j3dSys.setDrawBuffer(buffer0, J3DSysDrawBuf_Opa); + j3dSys.setDrawBuffer(buffer1, J3DSysDrawBuf_Xlu); } /* 8006F9E0-8006FAB0 .text entryDL__10dMat_ice_cFP8J3DModelScP21mDoExt_invisibleModel */ void dMat_ice_c::entryDL(J3DModel* model, s8 backupNo, mDoExt_invisibleModel* inv) { - J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0); - J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1); + J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa); + J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu); J3DModelData* modelData = model->getModelData(); if (backupNo < 0) dMat_control_c::push(modelData); @@ -113,14 +113,14 @@ void dMat_ice_c::entryDL(J3DModel* model, s8 backupNo, mDoExt_invisibleModel* in if (inv != NULL) inv->entry(); - j3dSys.setDrawBuffer(buffer0, 0); - j3dSys.setDrawBuffer(buffer1, 1); + j3dSys.setDrawBuffer(buffer0, J3DSysDrawBuf_Opa); + j3dSys.setDrawBuffer(buffer1, J3DSysDrawBuf_Xlu); } /* 8006FAB0-8006FB84 .text entryDL__10dMat_ice_cFP14mDoExt_McaMorfScP21mDoExt_invisibleModel */ void dMat_ice_c::entryDL(mDoExt_McaMorf* morf, s8 backupNo, mDoExt_invisibleModel* inv) { - J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0); - J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1); + J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa); + J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu); J3DModelData* modelData = morf->getModel()->getModelData(); if (backupNo < 0) dMat_control_c::push(modelData); @@ -135,8 +135,8 @@ void dMat_ice_c::entryDL(mDoExt_McaMorf* morf, s8 backupNo, mDoExt_invisibleMode if (inv != NULL) inv->entry(); - j3dSys.setDrawBuffer(buffer0, 0); - j3dSys.setDrawBuffer(buffer1, 1); + j3dSys.setDrawBuffer(buffer0, J3DSysDrawBuf_Opa); + j3dSys.setDrawBuffer(buffer1, J3DSysDrawBuf_Xlu); } /* 8006FB84-8006FCF0 .text create__14dMat_control_cFP16J3DMaterialTableP19J3DAnmTextureSRTKey */ diff --git a/src/d/d_snap.cpp b/src/d/d_snap.cpp index a022d4d7e..3978633c1 100644 --- a/src/d/d_snap.cpp +++ b/src/d/d_snap.cpp @@ -2248,7 +2248,7 @@ void dSnap_RegistFig(u8 photoNo, fopAc_ac_c* actor, const Vec& pos, s16 angleY, void dSnap_DebugDraw() { if (l_snap.ChkReleaseShutter()) { dComIfGd_setListMaskOff(); - j3dSys.getDrawBuffer(1)->entryImm(&l_snap, 0xFF); + j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu)->entryImm(&l_snap, 0xFF); dComIfGd_setList(); } } diff --git a/src/d/d_tree.cpp b/src/d/d_tree.cpp index 934f78c28..316d3d466 100644 --- a/src/d/d_tree.cpp +++ b/src/d/d_tree.cpp @@ -599,7 +599,7 @@ void dTree_packet_c::update() { mDoLib_clipper::resetFar(); dComIfGd_setXluListBG(); - j3dSys.getDrawBuffer(1)->entryImm(this, 0); + j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu)->entryImm(this, 0); dComIfGd_setXluList(); } diff --git a/src/d/d_wood.cpp b/src/d/d_wood.cpp index 7568e72dd..605dab487 100644 --- a/src/d/d_wood.cpp +++ b/src/d/d_wood.cpp @@ -853,7 +853,7 @@ void dWood::Packet_c::update() { } dComIfGd_setXluListBG(); - j3dSys.getDrawBuffer(0)->entryImm(this, 0); + j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(this, 0); dComIfGd_setXluList(); } diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 96c93c6a9..c9048576b 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -824,24 +824,24 @@ void mDoExt_invisibleModel::entryMaskOff() { /* 80011654-800116C4 .text updateDL__21mDoExt_invisibleModelFP8J3DModel */ void mDoExt_invisibleModel::updateDL(J3DModel* model) { - J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0); - J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1); + J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa); + J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu); dComIfGd_setList(); mDoExt_modelUpdateDL(model); entry(); - j3dSys.setDrawBuffer(buffer0, 0); - j3dSys.setDrawBuffer(buffer1, 1); + j3dSys.setDrawBuffer(buffer0, J3DSysDrawBuf_Opa); + j3dSys.setDrawBuffer(buffer1, J3DSysDrawBuf_Xlu); } /* 800116C4-80011734 .text updateDL__21mDoExt_invisibleModelFP14mDoExt_McaMorf */ void mDoExt_invisibleModel::updateDL(mDoExt_McaMorf* param_0) { - J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0); - J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1); + J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa); + J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu); dComIfGd_setList(); param_0->updateDL(); entry(); - j3dSys.setDrawBuffer(buffer0, 0); - j3dSys.setDrawBuffer(buffer1, 1); + j3dSys.setDrawBuffer(buffer0, J3DSysDrawBuf_Opa); + j3dSys.setDrawBuffer(buffer1, J3DSysDrawBuf_Xlu); } JKRExpHeap* gameHeap; @@ -2521,7 +2521,7 @@ void mDoExt_3DlineMat1_c::update(u16 i_segs, GXColor& i_color, dKy_tevstr_c* i_t /* 80016518-8001657C .text setMat__26mDoExt_3DlineMatSortPacketFP18mDoExt_3DlineMat_c */ void mDoExt_3DlineMatSortPacket::setMat(mDoExt_3DlineMat_c* i_3DlineMat) { if (mp3DlineMat == NULL) { - j3dSys.getDrawBuffer(0)->entryImm(this, 0); + j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(this, 0); } i_3DlineMat->mpNextLineMat = mp3DlineMat; mp3DlineMat = i_3DlineMat;