diff options
| author | hatal175 <hatal175@users.noreply.github.com> | 2024-12-24 12:36:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-24 02:36:01 -0800 |
| commit | d874f05f44b97c6852867453394e2308d771f86a (patch) | |
| tree | 924e93151a89c32be37b655f40cfa2a90e91e52b /src/d/d_cc_uty.cpp | |
| parent | e0ea8495f78feb83aaba7700f668fc3d52405c1d (diff) | |
d_a_obj_wsStick, d_a_obj_onsenTaru OK (#2268)
* d_a_obj_wsStick, d_a_obj_onsenTaru OK
* d_a_obj_pdtile OK
* d_a_obj_stone equivalent
* d_a_npc_lf OK
* Z2SoundMgr OK
* Remove fixed nonmatching comment
* d_a_obj_kantera OK
* Remove unneeded header
* daMyna_c::deleteItem matching
* d_a_obj_crvsteel OK
Diffstat (limited to 'src/d/d_cc_uty.cpp')
| -rw-r--r-- | src/d/d_cc_uty.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/d/d_cc_uty.cpp b/src/d/d_cc_uty.cpp index c1df3fb303..fd1e3724fd 100644 --- a/src/d/d_cc_uty.cpp +++ b/src/d/d_cc_uty.cpp @@ -165,7 +165,7 @@ static u8 at_power_get(dCcU_AtInfo* i_AtInfo) { u8 power = i_AtInfo->mpCollider->GetAtAtp(); if (i_AtInfo->mPowerType == 0) { - if (i_AtInfo->mpCollider->ChkAtType(0x10000000)) { + if (i_AtInfo->mpCollider->ChkAtType(AT_TYPE_10000000)) { power = 0; } else if (power == 1) { power = 1; @@ -179,7 +179,7 @@ static u8 at_power_get(dCcU_AtInfo* i_AtInfo) { power = 200; } } else if (i_AtInfo->mPowerType == 6) { - if (i_AtInfo->mpCollider->ChkAtType(0x10000000)) { + if (i_AtInfo->mpCollider->ChkAtType(AT_TYPE_10000000)) { power = 0; } else if (power == 1) { power = 1; @@ -193,7 +193,7 @@ static u8 at_power_get(dCcU_AtInfo* i_AtInfo) { } else if (i_AtInfo->mPowerType == 4) { if (i_AtInfo->mpCollider->ChkAtType(AT_TYPE_IRON_BALL)) { power = 200; - } else if (i_AtInfo->mpCollider->ChkAtType(0x10000000)) { + } else if (i_AtInfo->mpCollider->ChkAtType(AT_TYPE_10000000)) { power = 0; } else if (power == 1) { power = 1; @@ -247,7 +247,7 @@ static u8 at_power_get(dCcU_AtInfo* i_AtInfo) { power = 40; } } else if (i_AtInfo->mPowerType == 7) { - if (i_AtInfo->mpCollider->ChkAtType(0x420008)) { + if (i_AtInfo->mpCollider->ChkAtType(AT_TYPE_THROW_OBJ | AT_TYPE_20000 | AT_TYPE_IRON_BALL)) { power = 50; } else if (i_AtInfo->mpCollider->ChkAtType(AT_TYPE_ARROW)) { power = 27; @@ -337,7 +337,7 @@ fopAc_ac_c* at_power_check(dCcU_AtInfo* i_AtInfo) { s16 ac_name = fopAcM_GetName(i_AtInfo->mpActor); if (ac_name == PROC_ALINK || ac_name == PROC_ALINK) { - if (i_AtInfo->mpCollider->ChkAtType(0x8000) || + if (i_AtInfo->mpCollider->ChkAtType(AT_TYPE_8000) || i_AtInfo->mpCollider->ChkAtType(AT_TYPE_IRON_BALL)) { i_AtInfo->mHitType = HIT_TYPE_LINK_HEAVY_ATTACK; @@ -358,7 +358,7 @@ fopAc_ac_c* at_power_check(dCcU_AtInfo* i_AtInfo) { } i_AtInfo->mHitStatus = 0; - if (i_AtInfo->mpCollider->ChkAtType(0x40) || + if (i_AtInfo->mpCollider->ChkAtType(AT_TYPE_40) || i_AtInfo->mpCollider->ChkAtType(AT_TYPE_BOOMERANG) || i_AtInfo->mpCollider->ChkAtType(AT_TYPE_SLINGSHOT) || i_AtInfo->mpCollider->ChkAtType(AT_TYPE_SHIELD_ATTACK)) |