mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-05 11:17:43 -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
include/JSystem/J3DGraphBase/J3DMatBlock.h
+3 -12
View File
@@ -610,26 +610,17 @@ struct J3DBlend : public J3DBlendInfo {
void setBlendInfo(const J3DBlendInfo& info) { *(J3DBlendInfo*)this = info; }
GXBlendMode getType() const { return (GXBlendMode)mBlendMode; }
void setType(u8 i_type) { mBlendMode = i_type; }
GXBlendFactor getSrcFactor() const { return (GXBlendFactor)mSrcFactor; }
void setSrcFactor(u8 i_src) { mSrcFactor = i_src; }
GXBlendFactor getDstFactor() const { return (GXBlendFactor)mDstFactor; }
void setDstFactor(u8 i_dst) { mDstFactor = i_dst; }
GXLogicOp getOp() const { return (GXLogicOp)mLogicOp; }
void load(u8 ditherEnable) {
J3DGDSetBlendMode(getType(), getSrcFactor(), getDstFactor(), getOp(), ditherEnable);
}
void setType(u8 i_type) {
mBlendMode = i_type;
}
void setSrcFactor(u8 i_src) {
mSrcFactor = i_src;
}
void setDstFactor(u8 i_dst) {
mDstFactor = i_dst;
}
// void operator=(const J3DBlend&) {}
// void operator==(J3DBlend&) {}
};
include/d/actor/d_a_obj_hami3.h
+12 -10
View File
@@ -17,9 +17,9 @@ namespace daObjHami3 {
PRM_SOUND_W = 0x01,
PRM_SOUND_S = 0x10,
};
int prm_get_sound() const {return daObj::PrmAbstract<Prm_e>(this, PRM_SOUND_W, PRM_SOUND_S);}
int prm_get_swSave() const {return daObj::PrmAbstract<Prm_e>(this, PRM_SWSAVE_W, PRM_SWSAVE_S);}
int prm_get_swSave2() const {return daObj::PrmAbstract<Prm_e>(this, PRM_SWSAVE2_W, PRM_SWSAVE2_S);}
int prm_get_sound() const { return daObj::PrmAbstract<Prm_e>(this, PRM_SOUND_W, PRM_SOUND_S); }
int prm_get_swSave() const { return daObj::PrmAbstract<Prm_e>(this, PRM_SWSAVE_W, PRM_SWSAVE_S); }
int prm_get_swSave2() const { return daObj::PrmAbstract<Prm_e>(this, PRM_SWSAVE2_W, PRM_SWSAVE2_S); }
virtual BOOL CreateHeap();
virtual BOOL Create();
@@ -39,16 +39,18 @@ namespace daObjHami3 {
static Mtx M_tmp_mtx;
static const char M_arcname[];
#if VERSION > VERSION_DEMO
static const char M_evname[];
#endif
public:
/* 0x2C8 */ s16 field_0x2C8;
/* 0x2CA */ s16 field_0x2CA;
/* 0x2CC */ request_of_phase_process_class field_0x2CC;
/* 0x2D4 */ J3DModel* field_0x2D4;
/* 0x2D8 */ int field_0x2D8;
/* 0x2DC */ s16 field_0x2DC;
/* 0x2DE */ s16 field_0x2DE;
/* 0x2C8 */ s16 field_0x2C8;
/* 0x2CA */ s16 field_0x2CA;
/* 0x2CC */ request_of_phase_process_class field_0x2CC;
/* 0x2D4 */ J3DModel* field_0x2D4;
/* 0x2D8 */ int field_0x2D8;
/* 0x2DC */ s16 field_0x2DC;
/* 0x2DE */ s16 field_0x2DE;
}; // Size: 0x2E0
};
include/d/actor/d_a_obj_vfan.h
+3 -3
View File
@@ -13,14 +13,14 @@ namespace daObjVfan {
class Act_c : public dBgS_MoveBgActor {
public:
enum Prm_e {
PRM_W = 8,
PRM_S = 0,
PRM_SWSAVE_W = 8,
PRM_SWSAVE_S = 0,
};
static Mtx M_tmp_mtx;
static const char M_arcname[];
s32 prm_get_swSave() const { return daObj::PrmAbstract(this, PRM_W, PRM_S); }
s32 prm_get_swSave() const { return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_SWSAVE_S); }
virtual BOOL CreateHeap();
virtual BOOL Create();
include/d/actor/d_a_player.h
+14 -14
View File
@@ -475,46 +475,46 @@ public:
void onNoResetFlg0(daPy_FLG0 flag) { mNoResetFlg0 |= flag; }
void offNoResetFlg0(daPy_FLG0 flag) { mNoResetFlg0 &= ~flag; }
u32 checkNoResetFlg0(daPy_FLG0 flag) const { return mNoResetFlg0 & flag; }
BOOL getCutAtFlg() const { return checkNoResetFlg0(daPyFlg0_CUT_AT_FLG); }
u32 getCutAtFlg() const { return checkNoResetFlg0(daPyFlg0_CUT_AT_FLG); }
void onPushPullKeep() { onNoResetFlg0(daPyFlg0_PUSH_PULL_KEEP); }
void offPushPullKeep() { offNoResetFlg0(daPyFlg0_PUSH_PULL_KEEP); }
bool checkEquipHoverBoots() const { return checkNoResetFlg0(daPyFlg0_HOVER_BOOTS); }
u32 checkEquipHoverBoots() const { return checkNoResetFlg0(daPyFlg0_HOVER_BOOTS); }
void onNoFallVoice() { onNoResetFlg0(daPyFlg0_NO_FALL_VOICE); }
void onScopeCancel() { onNoResetFlg0(daPyFlg0_SCOPE_CANCEL); }
void onPhotoBoxCancel() { onNoResetFlg0(daPyFlg0_PHOTO_BOX_CANCEL); }
bool checkEquipHeavyBoots() const { return checkNoResetFlg0(daPyFlg0_EQUIP_HEAVY_BOOTS); }
u32 checkEquipHeavyBoots() const { return checkNoResetFlg0(daPyFlg0_EQUIP_HEAVY_BOOTS); }
void onPlayerNoDraw() { onNoResetFlg0(daPyFlg0_NO_DRAW); }
void offPlayerNoDraw() { offNoResetFlg0(daPyFlg0_NO_DRAW); }
void onHeavyState() { onNoResetFlg0(daPyFlg0_HEAVY_STATE); }
void offHeavyState() { offNoResetFlg0(daPyFlg0_HEAVY_STATE); }
bool getHeavyState() { return checkNoResetFlg0(daPyFlg0_HEAVY_STATE); }
bool getHeavyStateAndBoots() { return checkNoResetFlg0(static_cast<daPy_FLG0>(daPyFlg0_HEAVY_STATE | daPyFlg0_EQUIP_HEAVY_BOOTS)); }
u32 getHeavyState() { return checkNoResetFlg0(daPyFlg0_HEAVY_STATE); }
u32 getHeavyStateAndBoots() { return checkNoResetFlg0(static_cast<daPy_FLG0>(daPyFlg0_HEAVY_STATE | daPyFlg0_EQUIP_HEAVY_BOOTS)); }
void onNoResetFlg1(daPy_FLG1 flag) { mNoResetFlg1 |= flag; }
void offNoResetFlg1(daPy_FLG1 flag) { mNoResetFlg1 &= ~flag; }
u32 checkNoResetFlg1(daPy_FLG1 flag) const { return mNoResetFlg1 & flag; }
bool checkEquipDragonShield() const { return checkNoResetFlg1(daPyFlg1_EQUIP_DRAGON_SHIELD); }
u32 checkEquipDragonShield() const { return checkNoResetFlg1(daPyFlg1_EQUIP_DRAGON_SHIELD); }
void onNpcCallCommand() { onNoResetFlg1(daPyFlg1_NPC_CALL_COMMAND); }
void onNpcCall() { onNoResetFlg1(daPyFlg1_NPC_CALL_COMMAND); }
void offNpcCallCommand() { offNoResetFlg1(daPyFlg1_NPC_CALL_COMMAND); }
bool checkNpcCallCommand() const { return checkNoResetFlg1(daPyFlg1_NPC_CALL_COMMAND); }
u32 checkNpcCallCommand() const { return checkNoResetFlg1(daPyFlg1_NPC_CALL_COMMAND); }
void onForceVomitJump() { onNoResetFlg1(daPyFlg1_FORCE_VOMIT_JUMP); }
void onNpcNotChange() { onNoResetFlg1(daPyFlg1_NPC_NOT_CHANGE); }
void offNpcNotChange() { offNoResetFlg1(daPyFlg1_NPC_NOT_CHANGE); }
bool checkNpcNotChange() const { return checkNoResetFlg1(daPyFlg1_NPC_NOT_CHANGE); }
u32 checkNpcNotChange() const { return checkNoResetFlg1(daPyFlg1_NPC_NOT_CHANGE); }
void onConfuse() { onNoResetFlg1(daPyFlg1_CONFUSE); }
void offConfuse() { offNoResetFlg1(daPyFlg1_CONFUSE); }
bool checkConfuse() const { return checkNoResetFlg1(daPyFlg1_CONFUSE); }
bool checkFreezeState() const { return checkNoResetFlg1(daPyFlg1_FREEZE_STATE); }
bool checkUseArrowEffect() const { return checkNoResetFlg1(daPyFlg1_USE_ARROW_EFFECT); }
u32 checkConfuse() const { return checkNoResetFlg1(daPyFlg1_CONFUSE); }
u32 checkFreezeState() const { return checkNoResetFlg1(daPyFlg1_FREEZE_STATE); }
u32 checkUseArrowEffect() const { return checkNoResetFlg1(daPyFlg1_USE_ARROW_EFFECT); }
void onUseArrowEffect() { onNoResetFlg1(daPyFlg1_USE_ARROW_EFFECT); }
void offUseArrowEffect() { offNoResetFlg1(daPyFlg1_USE_ARROW_EFFECT); }
void onLetterReadEyeMove() { onNoResetFlg1(daPyFlg1_LETTER_READ_EYE_MOVE); }
void onForceVomitJumpShort() { onNoResetFlg1(daPyFlg1_FORCE_VOMIT_JUMP_SHORT); }
bool checkForestWaterUse() const { return checkNoResetFlg1(daPyFlg1_FOREST_WATER_USE); }
u32 checkForestWaterUse() const { return checkNoResetFlg1(daPyFlg1_FOREST_WATER_USE); }
void onWaterDrop() { onNoResetFlg1(daPyFlg1_WATER_DROP); }
void onVineCatch() { onNoResetFlg1(daPyFlg1_VINE_CATCH); }
bool checkLastComboWait() const { return checkNoResetFlg1(daPyFlg1_LAST_COMBO_WAIT); }
u32 checkLastComboWait() const { return checkNoResetFlg1(daPyFlg1_LAST_COMBO_WAIT); }
void onResetFlg0(daPy_RFLG0 flag) { mResetFlg0 |= flag; }
void offResetFlg0(daPy_RFLG0 flag) { mResetFlg0 &= ~flag; }
@@ -535,7 +535,7 @@ public:
u32 checkTactInput() const { return checkResetFlg0(daPyRFlg0_TACT_INPUT); }
u32 checkArrowShoot() const { return checkResetFlg0(daPyRFlg0_ARROW_SHOOT); }
bool checkGrabWear() const { return field_0x2b0 < 0.0f; }
BOOL checkGrabWear() const { return field_0x2b0 < 0.0f; }
BOOL checkNormalSwordEquip() const {
return dComIfGs_getSelectEquip(0) == dItem_SWORD_e || checkSwordMiniGame();
}
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;
}