From e05e065854a9ab241fac88762f2b61b20887798c Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Mon, 8 Jan 2024 20:39:00 -0500 Subject: [PATCH] Rename wind damage type --- include/SSystem/SComponent/c_cc_d.h | 2 +- src/d/actor/d_a_am.cpp | 2 +- src/d/actor/d_a_am2.cpp | 8 ++++---- src/d/actor/d_a_bomb2.cpp | 4 ++-- src/d/actor/d_a_bomb3.inc | 8 ++++---- src/d/actor/d_a_fan.cpp | 2 +- src/d/actor/d_a_lamp.cpp | 4 ++-- src/d/actor/d_a_npc_md.cpp | 4 ++-- src/d/actor/d_a_obj_paper.cpp | 2 +- src/d/actor/d_a_obj_zouK.cpp | 2 +- src/d/actor/d_a_player.cpp | 2 +- src/d/actor/d_a_player_main.cpp | 8 ++++---- src/d/actor/d_a_rd.cpp | 4 ++-- src/d/actor/d_a_swhit0.cpp | 2 +- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 22384acd0..56c66c471 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -33,7 +33,7 @@ enum cCcD_ObjAtType { /* 0x00040000 */ AT_TYPE_FIRE_ARROW = (1 << 18), /* 0x00080000 */ AT_TYPE_ICE_ARROW = (1 << 19), /* 0x00100000 */ AT_TYPE_LIGHT_ARROW = (1 << 20), - /* 0x00200000 */ AT_TYPE_LEAF_WIND = (1 << 21), + /* 0x00200000 */ AT_TYPE_WIND = (1 << 21), /* 0x00400000 */ AT_TYPE_UNK400000 = (1 << 22), /* 0x00800000 */ AT_TYPE_LIGHT = (1 << 23), /* 0x01000000 */ AT_TYPE_STALFOS_MACE = (1 << 24), diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index ee0d984a1..dbc4ddc65 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -1321,7 +1321,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) { /* SrcObjAt Type */ AT_TYPE_UNK1000, /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), + /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP, /* SrcGObjAt Se */ 0, diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index dffdf2711..676e8dddf 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -270,7 +270,7 @@ static BOOL week_atari_check(am2_class* i_this) { i_this->m2CE = 1; } break; - case AT_TYPE_LEAF_WIND: + case AT_TYPE_WIND: hitType = 2; i_this->m2CE = 3; break; @@ -305,7 +305,7 @@ static BOOL week_atari_check(am2_class* i_this) { break; } - if (hitType != 2) { // Not hit by Deku Leaf wind + if (hitType != 2) { // Not hit by wind CcAtInfo atInfo; cXyz hitPos = *i_this->mWeakSph.GetTgHitPosP(); atInfo.mpObj = i_this->mWeakSph.GetTgHitObj(); @@ -1400,7 +1400,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { /* SrcObjAt Type */ AT_TYPE_UNK1000, /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), + /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, @@ -1432,7 +1432,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { /* SrcObjAt Type */ AT_TYPE_UNK1000, /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), + /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP, /* SrcGObjAt Se */ 0, diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index 73d59cafa..ee7991826 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -643,7 +643,7 @@ namespace daBomb2 { cCcD_Obj* hitObj = mSph.GetTgHitObj(); if (hitObj == NULL) return; - if (!(hitObj->GetAtType() & AT_TYPE_LEAF_WIND)) + if (!(hitObj->GetAtType() & AT_TYPE_WIND)) return; f32 f30 = attr().field_0x40; @@ -814,7 +814,7 @@ namespace daBomb2 { if(obj->ChkAtType(AT_TYPE_BOMB)) { fuse = true; } - else if(!obj->ChkAtType(AT_TYPE_LEAF_WIND)) { + else if(!obj->ChkAtType(AT_TYPE_WIND)) { explode = true; } } diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index e04369aec..def7f3f87 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -219,7 +219,7 @@ bool daBomb_c::checkExplodeCc_norm() { if(obj->ChkAtType(AT_TYPE_BOMB)) { explode = true; } - else if(!obj->ChkAtType(AT_TYPE_LEAF_WIND)) { + else if(!obj->ChkAtType(AT_TYPE_WIND)) { explode = true; } } @@ -247,7 +247,7 @@ bool daBomb_c::checkExplodeCc_nut() { if(obj->ChkAtType(AT_TYPE_BOMB)) { explode = true; } - else if(!obj->ChkAtType(AT_TYPE_LEAF_WIND)) { + else if(!obj->ChkAtType(AT_TYPE_WIND)) { hit = true; } } @@ -286,7 +286,7 @@ bool daBomb_c::checkExplodeCc_cannon() { if(mSph.ChkTgHit()) { cCcD_Obj* obj = mSph.GetTgHitObj(); if(obj) { - if(!obj->ChkAtType(AT_TYPE_LEAF_WIND)) { + if(!obj->ChkAtType(AT_TYPE_WIND)) { explode = true; } } @@ -1086,7 +1086,7 @@ void daBomb_c::set_wind_vec() { cCcD_Obj* hitObj = mSph.GetTgHitObj(); if (hitObj == NULL) return; - if (!(hitObj->GetAtType() & AT_TYPE_LEAF_WIND)) + if (!(hitObj->GetAtType() & AT_TYPE_WIND)) return; cXyz sp48 = *mSph.GetTgRVecP(); f32 f31 = sp48.abs2(); diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp index 002b8ba54..40fa7a78b 100644 --- a/src/d/actor/d_a_fan.cpp +++ b/src/d/actor/d_a_fan.cpp @@ -27,7 +27,7 @@ static dCcD_SrcCps l_cps_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_LEAF_WIND, + /* SrcObjAt Type */ AT_TYPE_WIND, /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_GRP, /* SrcObjTg Type */ 0, diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp index 7e8199320..c935c6806 100644 --- a/src/d/actor/d_a_lamp.cpp +++ b/src/d/actor/d_a_lamp.cpp @@ -16,7 +16,7 @@ static dCcD_SrcSph sph_src = { /* SrcObjAt Type */ 0, /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_FIRE | AT_TYPE_UNK20000 | AT_TYPE_FIRE_ARROW | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000, + /* SrcObjTg Type */ AT_TYPE_FIRE | AT_TYPE_UNK20000 | AT_TYPE_FIRE_ARROW | AT_TYPE_WIND | AT_TYPE_UNK400000, /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, @@ -114,7 +114,7 @@ static BOOL daLamp_Execute(lamp_class* i_this) { if (!i_this->mHitTimeoutLeft) { if (i_this->mSph.ChkTgHit()) { cCcD_Obj* pHitObj = i_this->mSph.GetTgHitObj(); - if (pHitObj && pHitObj->ChkAtType(AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000)) { + if (pHitObj && pHitObj->ChkAtType(AT_TYPE_WIND | AT_TYPE_UNK400000)) { i_this->mHitAngle = dComIfGp_getPlayer(0)->shape_angle.y; i_this->mHitTimeoutLeft = 0x28; } diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index b3a1f2db0..5deccfa26 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -53,7 +53,7 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcObjAt Type */ 0, /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG | AT_TYPE_LEAF_WIND | AT_TYPE_LIGHT), + /* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG | AT_TYPE_WIND | AT_TYPE_LIGHT), /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_PLAYER, /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP, /* SrcGObjAt Se */ 0, @@ -143,7 +143,7 @@ static dCcD_SrcCyl l_wind_cyl_src = { /* SrcObjAt Type */ 0, /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_LEAF_WIND, + /* SrcObjTg Type */ AT_TYPE_WIND, /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp index 40b05e356..c00a13040 100644 --- a/src/d/actor/d_a_obj_paper.cpp +++ b/src/d/actor/d_a_obj_paper.cpp @@ -60,7 +60,7 @@ namespace daObjPaper { /* SrcObjAt Type */ 0, /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), + /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_GRP, /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP, /* SrcGObjAt Se */ 0, diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp index 8b1426d1b..b8b9dfb61 100644 --- a/src/d/actor/d_a_obj_zouK.cpp +++ b/src/d/actor/d_a_obj_zouK.cpp @@ -32,7 +32,7 @@ namespace daObjZouk { /* SrcObjAt Type */ 0, /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_ALL & ~(AT_TYPE_LIGHT | AT_TYPE_UNK400000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK20000 | AT_TYPE_WATER), + /* SrcObjTg Type */ ~(AT_TYPE_LIGHT | AT_TYPE_UNK400000 | AT_TYPE_WIND | AT_TYPE_UNK20000 | AT_TYPE_WATER), /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_GRP, /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP, /* SrcGObjAt Se */ 0, diff --git a/src/d/actor/d_a_player.cpp b/src/d/actor/d_a_player.cpp index 92e34e0b3..cbc8e6a21 100644 --- a/src/d/actor/d_a_player.cpp +++ b/src/d/actor/d_a_player.cpp @@ -29,7 +29,7 @@ void daPy_py_c::objWindHitCheck(dCcD_Cyl* cyl) { if (cyl->ChkTgHit()) { cCcD_Obj* hitObj = cyl->GetTgHitObj(); - if (hitObj && hitObj->GetAtType() & AT_TYPE_LEAF_WIND) { + if (hitObj && hitObj->GetAtType() & AT_TYPE_WIND) { targetSpeed = *cyl->GetTgRVecP(); f32 distXZ = cyl->GetTgRVecP()->absXZ(); maxStep = 1.0f; diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 03e40f289..e21ee0590 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -2227,7 +2227,7 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcObjAt Type */ 0, /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), + /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_PLAYER, /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK2 | CO_SPRM_VSGRP, /* SrcGObjAt Se */ 0, @@ -2257,7 +2257,7 @@ static dCcD_SrcCyl l_wind_cyl_src = { /* SrcObjAt Type */ 0, /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_LEAF_WIND, + /* SrcObjTg Type */ AT_TYPE_WIND, /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_PLAYER, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, @@ -2344,7 +2344,7 @@ static dCcD_SrcCps l_fan_wind_cps_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_LEAF_WIND, + /* SrcObjAt Type */ AT_TYPE_WIND, /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_VS_OTHER, /* SrcObjTg Type */ 0, @@ -2374,7 +2374,7 @@ static dCcD_SrcSph l_fan_wind_sph_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_LEAF_WIND, + /* SrcObjAt Type */ AT_TYPE_WIND, /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_VS_OTHER, /* SrcObjTg Type */ 0, diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index bef1153e7..5ba205c27 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -37,7 +37,7 @@ const dCcD_SrcCyl daRd_c::m_cyl_src = { /* SrcObjAt Type */ 0, /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000), + /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000), /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IGRP | CO_SPRM_VSGRP, /* SrcGObjAt Se */ 0, @@ -577,7 +577,7 @@ bool daRd_c::checkTgHit() { break; } break; - case AT_TYPE_LEAF_WIND: + case AT_TYPE_WIND: r29 = false; mHitType = 3; mCE0 = 40; diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 41e078b2e..645cb80e6 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -17,7 +17,7 @@ static dCcD_SrcSph l_sph_src = { /* SrcObjAt Type */ 0, /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_LIGHT | AT_TYPE_UNK400000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK20000 | AT_TYPE_WATER), // 0xFF1DFEFF + /* SrcObjTg Type */ ~(AT_TYPE_LIGHT | AT_TYPE_UNK400000 | AT_TYPE_WIND | AT_TYPE_UNK20000 | AT_TYPE_WATER), // 0xFF1DFEFF /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0,