mirror of
https://github.com/zeldaret/tp
synced 2026-09-07 03:10:11 -04:00
d_a_alink cleanup / debug work (#3045)
* start d_a_alink debug cleanup * d_a_alink_damage debug * d_a_alink_guard debug * d_a_alink_bow debug * d_a_alink_boom debug * d_a_alink_copyrod debug * d_a_alink_hvyboots debug * d_a_alink_grab debug * d_a_alink_sumou debug * d_a_alink_horse debug * d_a_alink_canoe debug * d_a_alink_crawl / d_a_alink_hang debug * d_a_alink_swim debug * d_a_alink_hook / d_a_alink_iceleaf debug * d_a_alink_bottle debug * d_a_alink_whistle / d_a_alink_kandelaar / d_a_alink_ironball debug * d_a_alink_demo debug * d_a_alink_effect debug * d_a_alink_wolf debug * d_a_alink debug / cleanup * cleanup button status enums
This commit is contained in:
@@ -1121,7 +1121,7 @@ u32 daB_TN_c::getCutType() {
|
||||
case daPy_py_c::CUT_TYPE_NM_RIGHT:
|
||||
case daPy_py_c::CUT_TYPE_FINISH_LEFT:
|
||||
case daPy_py_c::CUT_TYPE_FINISH_VERTICAL:
|
||||
case daPy_py_c::CUT_TYPE_DASH_UNK_26:
|
||||
case daPy_py_c::CUT_TYPE_DASH_RIGHT:
|
||||
return rv | 0x12;
|
||||
|
||||
case daPy_py_c::CUT_TYPE_NM_STAB:
|
||||
@@ -1129,7 +1129,7 @@ u32 daB_TN_c::getCutType() {
|
||||
return rv | 0x02;
|
||||
|
||||
case daPy_py_c::CUT_TYPE_NM_LEFT:
|
||||
case daPy_py_c::CUT_TYPE_DASH_UNK_25:
|
||||
case daPy_py_c::CUT_TYPE_DASH_LEFT:
|
||||
return rv | 0x21;
|
||||
|
||||
case daPy_py_c::CUT_TYPE_COMBO_STAB:
|
||||
@@ -1344,8 +1344,8 @@ void daB_TN_c::damage_check() {
|
||||
if (cut_type == daPy_py_c::CUT_TYPE_LARGE_JUMP_FINISH) {
|
||||
return;
|
||||
} else if (mActionMode1 < 8) {
|
||||
if (cut_type == daPy_py_c::CUT_TYPE_DASH_UNK_25 ||
|
||||
cut_type == daPy_py_c::CUT_TYPE_DASH_UNK_26 ||
|
||||
if (cut_type == daPy_py_c::CUT_TYPE_DASH_LEFT ||
|
||||
cut_type == daPy_py_c::CUT_TYPE_DASH_RIGHT ||
|
||||
mAtInfo.mpCollider->ChkAtType(AT_TYPE_UNK))
|
||||
{
|
||||
setShieldEffect(&dStack_160);
|
||||
@@ -1403,8 +1403,8 @@ void daB_TN_c::damage_check() {
|
||||
|
||||
if (mTimer10 != 0 ||
|
||||
abs((s16)(fopAcM_searchPlayerAngleY(this) - shape_angle.y)) < 0x3000 ||
|
||||
cut_type == daPy_py_c::CUT_TYPE_DASH_UNK_25 ||
|
||||
cut_type == daPy_py_c::CUT_TYPE_DASH_UNK_26)
|
||||
cut_type == daPy_py_c::CUT_TYPE_DASH_LEFT ||
|
||||
cut_type == daPy_py_c::CUT_TYPE_DASH_RIGHT)
|
||||
{
|
||||
field_0xaa8 = false;
|
||||
setShieldEffect(&dStack_160);
|
||||
|
||||
Reference in New Issue
Block a user