mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-29 15:33:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
LagoLunatic
2025-07-08 22:40:41 -04:00
parent b255434807
commit adac5936d2
7 changed files with 51 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_agbsw0.cpp
+2 -1
View File
@@ -1882,7 +1882,8 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x1D:
if(dComIfGs_getMaxMagic() != 0 && !dComIfGs_getMagic) {
// @bug They meant to call this function
if(dComIfGs_getMaxMagic() != 0 && dComIfGs_getMagic == 0) {
return FALSE;
}
src/d/actor/d_a_obj_mknjd.cpp
+4 -4
View File
@@ -967,7 +967,7 @@ void daObjMknjD::setMaterial(J3DMaterial* i_mat, u8 i_alpha) {
i_mat->getZMode()->setUpdateEnable(1);
i_mat->getZMode()->setCompareEnable(1);
i_mat->getBlend()->setType(0);
i_mat->getBlend()->setType(GX_BM_NONE);
}
else {
i_mat->setMaterialMode(1);
@@ -975,9 +975,9 @@ void daObjMknjD::setMaterial(J3DMaterial* i_mat, u8 i_alpha) {
i_mat->getZMode()->setUpdateEnable(0);
i_mat->getZMode()->setCompareEnable(0);
i_mat->getBlend()->setType(1);
i_mat->getBlend()->setSrcFactor(4);
i_mat->getBlend()->setDstFactor(5);
i_mat->getBlend()->setType(GX_BM_BLEND);
i_mat->getBlend()->setSrcFactor(GX_BL_SRC_ALPHA);
i_mat->getBlend()->setDstFactor(GX_BL_INV_SRC_ALPHA);
}
i_mat->getTevKColor(3)->mColor.a = i_alpha;
src/d/actor/d_a_player_main.cpp
+13 -13
View File
@@ -1509,7 +1509,7 @@ void daPy_lk_c::updateDLSetLight(J3DModel* model, u32 param_2) {
/* 80106CB0-80106D8C .text hideHatAndBackle__9daPy_lk_cFP11J3DMaterial */
void daPy_lk_c::hideHatAndBackle(J3DMaterial* param_1) {
for (int i = 0; param_1 != NULL; i++) {
if ((!checkNoResetFlg1(daPyFlg1_FREEZE_STATE) && (i == 2 || i == 5)) ||
if ((!checkFreezeState() && (i == 2 || i == 5)) ||
(i == 4 && (checkCaughtShapeHide() || checkNoResetFlg1(daPyFlg1_CASUAL_CLOTHES))))
{
param_1->getShape()->hide();
@@ -1810,7 +1810,7 @@ BOOL daPy_lk_c::draw() {
}
link_root_joint->entryIn();
if (checkMaskDraw()) {
entryDLSetLight(mpYamuModel, checkNoResetFlg1(daPyFlg1_FREEZE_STATE));
entryDLSetLight(mpYamuModel, checkFreezeState());
}
j3dSys.setModel(mpCLModel);
j3dSys.setTexture(mpCLModelData->getTexture());
@@ -1858,31 +1858,31 @@ BOOL daPy_lk_c::draw() {
mpCLModelData->getJointNodePointer(0x14)->getMesh()->getShape()->show(); // cl_hana joint
mpCLModelData->getJointNodePointer(0x29)->getMesh()->getShape()->show(); // cl_back joint
if (!r24) {
entryDLSetLight(mpHandsModel, checkNoResetFlg1(daPyFlg1_FREEZE_STATE));
entryDLSetLight(mpHandsModel, checkFreezeState());
if (checkNoResetFlg1(daPyFlg1_CASUAL_CLOTHES) && !checkCaughtShapeHide()
#if VERSION > VERSION_DEMO
&& !dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x20)
#endif
) {
entryDLSetLight(mpKatsuraModel, checkNoResetFlg1(daPyFlg1_FREEZE_STATE));
entryDLSetLight(mpKatsuraModel, checkFreezeState());
}
if (checkFreezeState() && checkMaskDraw()) {
entryDLSetLight(mpYamuModel, checkNoResetFlg1(daPyFlg1_FREEZE_STATE));
entryDLSetLight(mpYamuModel, checkFreezeState());
}
if (dComIfGs_getSelectEquip(2) == dItem_POWER_BRACELETS_e) {
entryDLSetLight(mpPringModel, checkNoResetFlg1(daPyFlg1_FREEZE_STATE));
entryDLSetLight(mpPringModel, checkFreezeState());
}
if (checkMasterSwordEquip() && !checkCaughtShapeHide()
#if VERSION > VERSION_DEMO
&& !checkDemoShieldNoDraw()
#endif
) {
updateDLSetLight(mpPodmsModel, checkNoResetFlg1(daPyFlg1_FREEZE_STATE));
updateDLSetLight(mpPodmsModel, checkFreezeState());
}
}
if (checkEquipHeavyBoots()) {
entryDLSetLight(mpHbootsModels[0], checkNoResetFlg1(daPyFlg1_FREEZE_STATE));
entryDLSetLight(mpHbootsModels[1], checkNoResetFlg1(daPyFlg1_FREEZE_STATE));
entryDLSetLight(mpHbootsModels[0], checkFreezeState());
entryDLSetLight(mpHbootsModels[1], checkFreezeState());
}
tevStr.mFogColor.r = origFog.r;
@@ -1916,7 +1916,7 @@ BOOL daPy_lk_c::draw() {
&& !checkDemoSwordNoDraw(1)
#endif
) {
entryDLSetLight(mpEquippedSwordModel, checkNoResetFlg1(daPyFlg1_FREEZE_STATE));
entryDLSetLight(mpEquippedSwordModel, checkFreezeState());
}
}
if (dComIfGs_getSelectEquip(1) != dItem_NONE_e && !checkCaughtShapeHide()
@@ -1926,7 +1926,7 @@ BOOL daPy_lk_c::draw() {
&& !checkDemoShieldNoDraw()
#endif
) {
entryDLSetLight(mpEquippedShieldModel, checkNoResetFlg1(daPyFlg1_FREEZE_STATE));
entryDLSetLight(mpEquippedShieldModel, checkFreezeState());
}
dComIfGd_setList();
drawMirrorLightModel();
@@ -1949,7 +1949,7 @@ BOOL daPy_lk_c::draw() {
mpEquipItemModel->setAnmMtx(4, hookshot->getMtxTop());
}
}
entryDLSetLight(mpEquipItemModel, checkNoResetFlg1(daPyFlg1_FREEZE_STATE));
entryDLSetLight(mpEquipItemModel, checkFreezeState());
if (mpSwordModel1 != NULL) {
if (checkChanceMode() || checkNoResetFlg1(daPyFlg1_UNK8000) || checkFinalMasterSwordEquip()) {
updateDLSetLight(mpSwordModel1, 0);
@@ -9246,7 +9246,7 @@ void daPy_lk_c::checkOriginalHatAnimation() {
/* 8011BEA4-8011CBA4 .text setHatAngle__9daPy_lk_cFv */
void daPy_lk_c::setHatAngle() {
if (m_old_fdata->getOldFrameFlg() == false || checkNoResetFlg1(daPyFlg1_FREEZE_STATE)) {
if (m_old_fdata->getOldFrameFlg() == false || checkFreezeState()) {
return;
}