diff --git a/include/collision_check.h b/include/collision_check.h index 194ae1e699..d3d756abcc 100644 --- a/include/collision_check.h +++ b/include/collision_check.h @@ -85,7 +85,10 @@ typedef enum HitSpecialEffect { HIT_SPECIAL_EFFECT_FIRE, HIT_SPECIAL_EFFECT_ICE, HIT_SPECIAL_EFFECT_ELECTRIC, - HIT_SPECIAL_EFFECT_KNOCKBACK + HIT_SPECIAL_EFFECT_KNOCKBACK, + HIT_SPECIAL_EFFECT_7 = 7, // Same effect as `HIT_SPECIAL_EFFECT_NONE` + HIT_SPECIAL_EFFECT_8, // Same effect as `HIT_SPECIAL_EFFECT_NONE` + HIT_SPECIAL_EFFECT_9 // Same effect as `HIT_SPECIAL_EFFECT_NONE` } HitSpecialEffect; typedef struct ColliderElementDamageInfoAT { diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 12d31b4f0a..7b84c9bd38 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -50,8 +50,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 1f5d4a5c06..0a92bc66ce 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -64,9 +64,9 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000010, 0x00, 0x00 }, - ATELEM_NONE | ATELEM_SFX_NORMAL, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000010, HIT_BACKLASH_NONE, 0x00 }, + ATELEM_NONE, ACELEM_ON, OCELEM_NONE, }, diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index d087c9a684..1b193f8ca2 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -46,8 +46,8 @@ static ColliderQuadInit sQuadInit = { }, { ELEM_MATERIAL_UNK2, - { 0x00000080, 0x00, 0x01 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000080, HIT_SPECIAL_EFFECT_NONE, 0x01 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_NEAREST | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index da3991dace..89b34075ea 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -80,8 +80,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index 212fcaf52e..90855881e4 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -71,8 +71,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xEFC1FFFE, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xEFC1FFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c index 8b8b26f5e9..ce54ce1c85 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c @@ -33,8 +33,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x40000048, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x40000048, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -44,8 +44,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x40000048, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x40000048, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -55,8 +55,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x40000048, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x40000048, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index 188322fc16..422608488c 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -63,8 +63,8 @@ static ColliderQuadInit sQuadInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000048, 0x00, 0x00 }, - { 0x00000048, 0x00, 0x00 }, + { 0x00000048, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000048, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index 6e82c308d7..1f37e0fcd4 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c @@ -52,8 +52,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index 3f825cf6aa..e797c80179 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -61,8 +61,8 @@ static ColliderCylinderInit sMainColliderCylinderInit = { }, { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -81,8 +81,8 @@ static ColliderCylinderInit sLeftRightColliderCylinderInit = { }, { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c index f855cfe65f..f8fe2db5ec 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c @@ -53,8 +53,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x00 }, - { 0x00020800, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00020800, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c index 616ceb1e6a..873fd76091 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c @@ -51,8 +51,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0x20000000, 0x00, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, @@ -62,8 +62,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0x20000000, 0x00, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, @@ -73,8 +73,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0x20000000, 0x00, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, @@ -84,8 +84,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0x20000000, 0x00, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, @@ -118,8 +118,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index 071fa3de53..afb0f19043 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -64,8 +64,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -77,8 +77,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00020000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00020000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -88,8 +88,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00020000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00020000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index d4b20752d5..c86bc3abda 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -53,8 +53,8 @@ static ColliderCylinderInit sPotColliderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -73,8 +73,8 @@ static ColliderCylinderInit sFlamesColliderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0x00000008, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c index 5be3889889..40c5797627 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c @@ -53,8 +53,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index 7abcc1f912..780f11f164 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -53,8 +53,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c index fba20e422c..af59378acf 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c @@ -44,8 +44,8 @@ static ColliderTrisElementInit sTrisElementInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000040, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000040, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_NO_AT_INFO | ACELEM_NO_DAMAGE | ACELEM_NO_SWORD_SFX | ACELEM_NO_HITMARK, OCELEM_NONE, @@ -55,8 +55,8 @@ static ColliderTrisElementInit sTrisElementInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000040, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000040, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_NO_AT_INFO | ACELEM_NO_DAMAGE | ACELEM_NO_SWORD_SFX | ACELEM_NO_HITMARK, OCELEM_NONE, @@ -66,8 +66,8 @@ static ColliderTrisElementInit sTrisElementInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000040, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000040, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_NO_AT_INFO | ACELEM_NO_DAMAGE | ACELEM_NO_SWORD_SFX | ACELEM_NO_HITMARK, OCELEM_NONE, @@ -77,8 +77,8 @@ static ColliderTrisElementInit sTrisElementInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000040, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000040, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_NO_AT_INFO | ACELEM_NO_DAMAGE | ACELEM_NO_SWORD_SFX | ACELEM_NO_HITMARK, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c index af66735b5b..34764dfacd 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c @@ -54,8 +54,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c index 0a01e35dcd..1c6ca2164a 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c @@ -67,8 +67,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c index 36f0d1d5d6..694fbe6342 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c @@ -45,8 +45,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x40000040, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x40000040, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -56,8 +56,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x40000040, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x40000040, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c index 0198087724..e9f39437f5 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c @@ -42,8 +42,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x40000040, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x40000040, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_NO_AT_INFO | ACELEM_NO_DAMAGE | ACELEM_NO_SWORD_SFX | ACELEM_NO_HITMARK, OCELEM_NONE, @@ -53,8 +53,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x40000040, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x40000040, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_NO_AT_INFO | ACELEM_NO_DAMAGE | ACELEM_NO_SWORD_SFX | ACELEM_NO_HITMARK, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index baf9318209..070e7cd107 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -58,8 +58,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c index 872ed0608c..603d2f159f 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c @@ -65,8 +65,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c index 9dbce70dd1..8bf82f42fe 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c @@ -41,8 +41,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, @@ -52,8 +52,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, @@ -63,8 +63,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, @@ -74,8 +74,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, @@ -85,8 +85,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, @@ -96,8 +96,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c index 01bf9de8c7..7073a60cd5 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c @@ -45,8 +45,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_ON, @@ -56,8 +56,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_ON, @@ -67,8 +67,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_ON, @@ -78,8 +78,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_ON, @@ -89,8 +89,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_ON, @@ -100,8 +100,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c index f19ab4f077..7f4f4c256b 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c @@ -50,8 +50,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, @@ -61,8 +61,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index 0c6578ec26..cdbbec6b9c 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -64,8 +64,8 @@ static ColliderCylinderInit sCylinderInit1 = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -84,8 +84,8 @@ static ColliderCylinderInit sCylinderInit2 = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x4FC1FFF6, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x4FC1FFF6, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c index 8f619e0ed2..5ba57a0a37 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c @@ -40,8 +40,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0x4FC007CA, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0x4FC007CA, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index 6ff102aa41..a7427fcab3 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -57,8 +57,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index 50c2e0fdf4..32fe055262 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -45,8 +45,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index e3bcd757a9..2f40d2a17a 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -42,8 +42,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c index 0a7e119025..3c91cb71a6 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c @@ -47,8 +47,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x00, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c index 8d7fe66c86..665635d16d 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c @@ -47,8 +47,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c index cf13895832..0db1d8bee4 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c @@ -60,8 +60,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index a2587692ac..7f5b273162 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -50,8 +50,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00200000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00200000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c index 5a7b579279..d3dcc483dd 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c @@ -42,8 +42,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0x00000000, 0x00, 0x00 }, - { 0x0001F820, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x0001F820, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index fa429d0e49..6acdc0b574 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -48,8 +48,8 @@ static ColliderTrisElementInit sTrisElementsInitFloor[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -59,8 +59,8 @@ static ColliderTrisElementInit sTrisElementsInitFloor[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -86,8 +86,8 @@ static ColliderTrisElementInit sTrisElementsInitRutoWall[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -113,8 +113,8 @@ static ColliderTrisElementInit sTrisElementsInitWall[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -124,8 +124,8 @@ static ColliderTrisElementInit sTrisElementsInitWall[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index c3db5cea85..cab3d7d318 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -51,8 +51,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0x00000000, 0x00, 0x00 }, - { 0x0001F820, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x0001F820, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index 17374e5a1f..bbfecc301f 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -60,8 +60,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0x00000000, 0x00, 0x00 }, - { 0x0001F820, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x0001F820, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -71,8 +71,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0x00000000, 0x00, 0x00 }, - { 0x0001F820, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x0001F820, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c index cf9c454583..0c1ce9924d 100644 --- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c +++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c @@ -45,8 +45,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index 9134960449..25adbc1110 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -75,8 +75,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000080, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000080, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index aedf3921a3..e6d32de9ff 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -44,8 +44,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -55,8 +55,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -66,8 +66,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index 427d9d4a6c..eadfe2ce59 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -48,8 +48,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index fc1c8b76b4..e30db9ba20 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -56,8 +56,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x4FC1FFF6, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x4FC1FFF6, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -90,8 +90,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index 5131deafc1..51bccf7ca0 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -53,8 +53,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -64,8 +64,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index cc73cfb110..5a2fe183ed 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -58,8 +58,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c index 1e435b914d..10c23e5187 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c @@ -44,8 +44,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x00, 0x04 }, - { 0x00000004, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0x00000004, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_WOOD, ACELEM_ON, OCELEM_NONE, @@ -55,8 +55,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x00, 0x04 }, - { 0x00000004, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0x00000004, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_WOOD, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c index cf04ed2953..a7071694d2 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c @@ -56,8 +56,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x00 }, - { 0x00020800, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00020800, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -67,8 +67,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x00 }, - { 0x00020800, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00020800, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c index 29bdc03592..0723fd0eb9 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c @@ -15,8 +15,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK3, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -26,8 +26,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK3, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -37,8 +37,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -48,8 +48,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -59,8 +59,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -70,8 +70,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -81,8 +81,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -92,8 +92,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -103,8 +103,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -114,8 +114,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -125,8 +125,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -136,8 +136,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -147,8 +147,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -158,8 +158,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -169,8 +169,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -180,8 +180,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -191,8 +191,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -202,8 +202,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -213,8 +213,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c index f553945558..4b51a74d6b 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c @@ -4,8 +4,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK3, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -15,8 +15,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -26,8 +26,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -37,8 +37,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -48,8 +48,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -59,8 +59,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -70,8 +70,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -81,8 +81,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -92,8 +92,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -103,8 +103,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -114,8 +114,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -125,8 +125,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -136,8 +136,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -147,8 +147,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -158,8 +158,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -169,8 +169,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -180,8 +180,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -191,8 +191,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -202,8 +202,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c index db62cb0849..64994745d4 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c @@ -4,8 +4,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK3, - { 0xFFCFFFFF, 0x00, 0x20 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x20 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, @@ -15,8 +15,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x20 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x20 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -26,8 +26,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x20 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x20 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -37,8 +37,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x20 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x20 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -48,8 +48,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x20 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x20 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -59,8 +59,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x20 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x20 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -70,8 +70,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x20 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x20 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -81,8 +81,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x20 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x20 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -92,8 +92,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x20 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x20 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index 7880389683..2e9f2cf6ab 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -93,8 +93,8 @@ static ColliderCylinderInit sDorfCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, @@ -113,8 +113,8 @@ static ColliderCylinderInit sLightBallCylinderInit = { }, { ELEM_MATERIAL_UNK6, - { 0x00100700, 0x00, 0x08 }, - { 0x0D900740, 0x00, 0x00 }, + { 0x00100700, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0x0D900740, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index 186f93ee10..1cc37837f0 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -111,8 +111,8 @@ static ColliderJntSphElementInit sJntSphElementsInit1[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -122,8 +122,8 @@ static ColliderJntSphElementInit sJntSphElementsInit1[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -133,8 +133,8 @@ static ColliderJntSphElementInit sJntSphElementsInit1[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -144,8 +144,8 @@ static ColliderJntSphElementInit sJntSphElementsInit1[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -155,8 +155,8 @@ static ColliderJntSphElementInit sJntSphElementsInit1[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -166,8 +166,8 @@ static ColliderJntSphElementInit sJntSphElementsInit1[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -177,8 +177,8 @@ static ColliderJntSphElementInit sJntSphElementsInit1[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -188,8 +188,8 @@ static ColliderJntSphElementInit sJntSphElementsInit1[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -199,8 +199,8 @@ static ColliderJntSphElementInit sJntSphElementsInit1[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -210,8 +210,8 @@ static ColliderJntSphElementInit sJntSphElementsInit1[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -221,8 +221,8 @@ static ColliderJntSphElementInit sJntSphElementsInit1[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -232,8 +232,8 @@ static ColliderJntSphElementInit sJntSphElementsInit1[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -243,8 +243,8 @@ static ColliderJntSphElementInit sJntSphElementsInit1[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -254,8 +254,8 @@ static ColliderJntSphElementInit sJntSphElementsInit1[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -265,8 +265,8 @@ static ColliderJntSphElementInit sJntSphElementsInit1[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -276,8 +276,8 @@ static ColliderJntSphElementInit sJntSphElementsInit1[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -303,8 +303,8 @@ static ColliderJntSphElementInit sJntSphElementsInit2[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x40 }, - { 0xFFDFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x40 }, + { 0xFFDFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -314,8 +314,8 @@ static ColliderJntSphElementInit sJntSphElementsInit2[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x40 }, - { 0xFFDFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x40 }, + { 0xFFDFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index 09f84081de..6a7c63663e 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -115,8 +115,8 @@ static ColliderCylinderInit sCylinderInitBody = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, @@ -135,8 +135,8 @@ static ColliderCylinderInit sCylinderInitSpear = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x30 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index cfb868c20b..85a2a8502c 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -96,8 +96,8 @@ static ColliderJntSphElementInit sColliderJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK3, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -107,8 +107,8 @@ static ColliderJntSphElementInit sColliderJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -118,8 +118,8 @@ static ColliderJntSphElementInit sColliderJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -129,8 +129,8 @@ static ColliderJntSphElementInit sColliderJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -140,8 +140,8 @@ static ColliderJntSphElementInit sColliderJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -151,8 +151,8 @@ static ColliderJntSphElementInit sColliderJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -162,8 +162,8 @@ static ColliderJntSphElementInit sColliderJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -173,8 +173,8 @@ static ColliderJntSphElementInit sColliderJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -184,8 +184,8 @@ static ColliderJntSphElementInit sColliderJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -195,8 +195,8 @@ static ColliderJntSphElementInit sColliderJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -206,8 +206,8 @@ static ColliderJntSphElementInit sColliderJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -217,8 +217,8 @@ static ColliderJntSphElementInit sColliderJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -228,8 +228,8 @@ static ColliderJntSphElementInit sColliderJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c index fe560d7e37..6a9474e361 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c @@ -4,8 +4,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -15,8 +15,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -26,8 +26,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -37,8 +37,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -48,8 +48,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -59,8 +59,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -70,8 +70,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -81,8 +81,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -92,8 +92,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -103,8 +103,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -114,8 +114,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -125,8 +125,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -136,8 +136,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -147,8 +147,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -158,8 +158,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -169,8 +169,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -180,8 +180,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -191,8 +191,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -202,8 +202,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -236,8 +236,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFDFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFDFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c index 13261ff349..275218c1ac 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c @@ -5,8 +5,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHand[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -16,8 +16,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHand[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -27,8 +27,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHand[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -38,8 +38,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHand[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -49,8 +49,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHand[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -60,8 +60,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHand[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -71,8 +71,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHand[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -82,8 +82,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHand[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -93,8 +93,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHand[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -104,8 +104,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHand[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -115,8 +115,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHand[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -142,8 +142,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHead[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x30 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -153,8 +153,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHead[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x30 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -164,8 +164,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHead[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x30 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -175,8 +175,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHead[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x30 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -186,8 +186,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHead[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x30 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -197,8 +197,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHead[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x30 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -208,8 +208,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHead[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x30 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -219,8 +219,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHead[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x30 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -230,8 +230,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHead[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x30 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -241,8 +241,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHead[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x30 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -252,8 +252,8 @@ static ColliderJntSphElementInit sJntSphElementsInitHead[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0x00000080, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x30 }, + { 0x00000080, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -286,8 +286,8 @@ static ColliderCylinderInit sCylinderInitHead = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -306,8 +306,8 @@ static ColliderCylinderInit sCylinderInitHand = { }, { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x04, 0x10 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_KNOCKBACK, 0x10 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 9c75e35f23..49427c2096 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -170,8 +170,8 @@ static ColliderCylinderInit sCylinderInitBlasts = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x30 }, - { 0x00100000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x30 }, + { 0x00100000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -190,8 +190,8 @@ static ColliderCylinderInit sCylinderInitKoumeKotake = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x20 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x20 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -210,8 +210,8 @@ static ColliderCylinderInit sCylinderInitTwinrova = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x20 }, - { 0xFFCDFFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x20 }, + { 0xFFCDFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index 5fc7b7cd67..afd2b6e50a 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -236,8 +236,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFEF, 0x03, 0x08 }, - { 0x00000010, 0x00, 0x00 }, + { 0xFFCFFFEF, HIT_SPECIAL_EFFECT_ELECTRIC, 0x08 }, + { 0x00000010, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -249,8 +249,8 @@ static ColliderJntSphElementInit sJntSphElementsInitSupport[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000010, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000010, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -276,8 +276,8 @@ static ColliderJntSphElementInit sJntSphElementsInitBari[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x03, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_ELECTRIC, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_NONE, @@ -310,8 +310,8 @@ static ColliderQuadInit sQuadInit = { }, { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x03, 0x04 }, - { 0x00000010, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_ELECTRIC, 0x04 }, + { 0x00000010, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index 03d2fdbf89..cdcfca0182 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -45,8 +45,8 @@ static ColliderCylinderInitType1 sCylinderInit1 = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -64,8 +64,8 @@ static ColliderCylinderInitType1 sCylinderInit2 = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -83,8 +83,8 @@ static ColliderCylinderInitType1 sCylinderInit3 = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index 095abe07c8..1c53402a6b 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -86,8 +86,8 @@ static ColliderCylinderInitType1 sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index 3ba0504137..d5c1faa67d 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -59,8 +59,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x07, 0x04 }, - { 0x00002000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_7, 0x04 }, + { 0x00002000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index 580f580165..647ba366bd 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -52,8 +52,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0x00000048, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000048, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c index 2c20ce03f1..565ea6adc4 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -65,8 +65,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0x0001FFEE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0x0001FFEE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_NONE, @@ -78,8 +78,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index 6b382ca364..b3f31ec53f 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -78,8 +78,8 @@ static ColliderCylinderInit sHurtCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -98,8 +98,8 @@ static ColliderCylinderInit sBlockCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00400106, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00400106, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -118,8 +118,8 @@ static ColliderQuadInit sQuadInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index 50ce8e4123..b42d9bd29f 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -61,8 +61,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c index dd527d95bd..7f060f2ea7 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -64,8 +64,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c index 39cc72c383..5e518870e2 100644 --- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c +++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c @@ -55,8 +55,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index 48517bfe41..21d2bb6aa2 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -57,8 +57,8 @@ static ColliderQuadInit sColliderQuadInit = { }, { ELEM_MATERIAL_UNK2, - { 0x00000020, 0x00, 0x01 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000020, HIT_SPECIAL_EFFECT_NONE, 0x01 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_NEAREST | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/src/overlays/actors/ovl_En_Ba/z_en_ba.c index 75dd460a60..a6ab6b8546 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -56,8 +56,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000010, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000010, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -67,8 +67,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x00, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index fe4dd22b07..50d01b999a 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -230,8 +230,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index 0ed240091f..51cab89db8 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -66,8 +66,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK1, - { 0x20000000, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/src/overlays/actors/ovl_En_Bili/z_en_bili.c index 9c219eb8ee..29571ca747 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -67,8 +67,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x03, 0x08 }, - { 0xFFCFFFFF, 0x01, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_ELECTRIC, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_ELECTRIC, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index c2eeb243df..e5f590a14b 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -54,8 +54,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0x0003F828, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x0003F828, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -67,8 +67,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000008, 0x00, 0x08 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000008, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index 6e9dc91695..8467c4e5a6 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -46,8 +46,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 5fe014e7be..a4312e5403 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -58,8 +58,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0x0003F828, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x0003F828, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -71,8 +71,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000008, 0x00, 0x08 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000008, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index f679755105..c8254f1a86 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -49,8 +49,8 @@ static ColliderQuadInit sQuadInit = { }, { ELEM_MATERIAL_UNK2, - { 0x00000010, 0x00, 0x01 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000010, HIT_SPECIAL_EFFECT_NONE, 0x01 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_NEAREST | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.c b/src/overlays/actors/ovl_En_Brob/z_en_brob.c index 1dc0ea5e6e..6784fc2de2 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.c +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.c @@ -54,8 +54,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK1, - { 0xFFCFFFFF, 0x03, 0x08 }, - { 0xFFCFFFFF, 0x01, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_ELECTRIC, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_ELECTRIC, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index ee31df6fb1..0624c84add 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -41,8 +41,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x04 }, - { 0xFFCFD753, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFD753, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -52,8 +52,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00002824, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00002824, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_NO_AT_INFO | ACELEM_NO_DAMAGE | ACELEM_NO_SWORD_SFX | ACELEM_NO_HITMARK, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index 43cc1e659c..2cf9a677f0 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -45,8 +45,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index 8e7e20e8a5..37563cf728 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -74,8 +74,8 @@ static ColliderCylinderInit sCylinderInit1 = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, 0x08 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, 0x08 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, @@ -94,8 +94,8 @@ static ColliderCylinderInit sCylinderInit2 = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index 942cfdd6fb..4d08e68715 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -50,8 +50,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK1, - { 0xFFCFFFFF, 0x03, 0x04 }, - { 0xFFCFFFFF, 0x01, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_ELECTRIC, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_ELECTRIC, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_NONE, @@ -70,8 +70,8 @@ static ColliderQuadInit sQuadInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x03, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_ELECTRIC, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c index f3b7f3dc19..ec6bdd9925 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -60,8 +60,8 @@ static ColliderCylinderInit sArwingCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFDFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFDFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -80,8 +80,8 @@ static ColliderCylinderInit sLaserCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFDFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFDFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index 2c27b88f2c..6f8a5329a8 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -61,8 +61,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index 22ba1873e1..195494c853 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -48,8 +48,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c index ce9f69f5cd..51825392be 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c @@ -52,8 +52,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index 628e7de831..f3fc6fc1a8 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -83,8 +83,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index 7401a84e38..d74149bdcd 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -65,8 +65,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index 7acef7bc6f..dd2a3d45b7 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -59,8 +59,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, ACELEM_ON, OCELEM_ON, @@ -70,8 +70,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -81,8 +81,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_NONE, @@ -92,8 +92,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_NONE, @@ -103,8 +103,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_NONE, @@ -114,8 +114,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_NONE, @@ -125,8 +125,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index dac88693bc..1197e36c9d 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -62,8 +62,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index e9b252092e..dc7007f672 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -82,8 +82,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -95,8 +95,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON | OCELEM_UNK3, diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index d3fa1346ff..d93711b6c3 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -89,8 +89,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -100,8 +100,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -111,8 +111,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -122,8 +122,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -133,8 +133,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index cbca97dfbb..c9c064136d 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -78,8 +78,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index 8dd85d8c2e..ef9ada2258 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -79,8 +79,8 @@ static ColliderCylinderInitType1 sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index dfaa49be28..1bcb628f92 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -82,8 +82,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index 353f42e63c..d6e00db875 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -102,8 +102,8 @@ static ColliderCylinderInit sBodyCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -122,8 +122,8 @@ static ColliderQuadInit sTargetQuadInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x0001F824, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x0001F824, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c index 2f276b25f4..3697c6593e 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -66,8 +66,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFC5FFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFC5FFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index 70205edb27..ccbb01753d 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -68,8 +68,8 @@ static ColliderJntSphElementInit sBodyElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -79,8 +79,8 @@ static ColliderJntSphElementInit sBodyElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -90,8 +90,8 @@ static ColliderJntSphElementInit sBodyElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -101,8 +101,8 @@ static ColliderJntSphElementInit sBodyElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -112,8 +112,8 @@ static ColliderJntSphElementInit sBodyElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -123,8 +123,8 @@ static ColliderJntSphElementInit sBodyElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x0D800691, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x0D800691, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON | OCELEM_UNK3, @@ -150,8 +150,8 @@ static ColliderTrisElementInit sHardElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0xF24BF96E, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xF24BF96E, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE | ACELEM_NO_AT_INFO, OCELEM_NONE, @@ -161,8 +161,8 @@ static ColliderTrisElementInit sHardElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCBF96E, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCBF96E, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE | ACELEM_NO_AT_INFO, OCELEM_NONE, @@ -172,8 +172,8 @@ static ColliderTrisElementInit sHardElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCBF96E, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCBF96E, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE | ACELEM_NO_AT_INFO, OCELEM_NONE, @@ -206,8 +206,8 @@ static ColliderQuadInit sAttackQuadInit = { }, { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x01, 0x10 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x10 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index c8f0452f84..96ff5b3ff9 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -52,8 +52,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c index b3ef9d7520..ac71becd07 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.c +++ b/src/overlays/actors/ovl_En_Du/z_en_du.c @@ -60,8 +60,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index f0a5b4466e..953ee1597e 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -70,8 +70,8 @@ static ColliderCylinderInit sColliderCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x04, 0x08 }, - { 0x00000019, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_KNOCKBACK, 0x08 }, + { 0x00000019, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c index aeebc1a610..df2b2d2c59 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -67,8 +67,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, FLARE_DANCER_BODY_DMG }, - { 0x00040088, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, FLARE_DANCER_BODY_DMG }, + { 0x00040088, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, @@ -78,8 +78,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, FLARE_DANCER_BODY_DMG }, - { 0x00040008, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, FLARE_DANCER_BODY_DMG }, + { 0x00040008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -89,8 +89,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, FLARE_DANCER_BODY_DMG }, - { 0x00040008, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, FLARE_DANCER_BODY_DMG }, + { 0x00040008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -100,8 +100,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, FLARE_DANCER_BODY_DMG }, - { 0x00040008, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, FLARE_DANCER_BODY_DMG }, + { 0x00040008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -111,8 +111,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, FLARE_DANCER_BODY_DMG }, - { 0x00040008, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, FLARE_DANCER_BODY_DMG }, + { 0x00040008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -122,8 +122,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, FLARE_DANCER_BODY_DMG }, - { 0x00040008, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, FLARE_DANCER_BODY_DMG }, + { 0x00040008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -133,8 +133,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, FLARE_DANCER_BODY_DMG }, - { 0x00040008, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, FLARE_DANCER_BODY_DMG }, + { 0x00040008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -144,8 +144,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, FLARE_DANCER_BODY_DMG }, - { 0x00040008, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, FLARE_DANCER_BODY_DMG }, + { 0x00040008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -155,8 +155,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, FLARE_DANCER_BODY_DMG }, - { 0x00040008, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, FLARE_DANCER_BODY_DMG }, + { 0x00040008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -166,8 +166,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, FLARE_DANCER_BODY_DMG }, - { 0x00040008, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, FLARE_DANCER_BODY_DMG }, + { 0x00040008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -177,8 +177,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, FLARE_DANCER_BODY_DMG }, - { 0x00040008, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, FLARE_DANCER_BODY_DMG }, + { 0x00040008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -188,8 +188,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, FLARE_DANCER_BODY_DMG }, - { 0x00040008, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, FLARE_DANCER_BODY_DMG }, + { 0x00040008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c index a26b54a64a..334fc24d35 100644 --- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c +++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c @@ -45,8 +45,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, 0x08 }, - { 0x0D840008, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, 0x08 }, + { 0x0D840008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index e594e42291..8820c17de0 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -85,8 +85,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK6, - { 0x00100700, 0x03, 0x20 }, - { 0x0D900700, 0x00, 0x00 }, + { 0x00100700, HIT_SPECIAL_EFFECT_ELECTRIC, 0x20 }, + { 0x0D900700, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index f07d0ac868..ca0640377d 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -54,8 +54,8 @@ static ColliderCylinderInit D_80A12CA0 = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x09, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_9, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_NONE, @@ -74,8 +74,8 @@ static ColliderCylinderInit D_80A12CCC = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index 62cf293e0f..5de7f1e5a9 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -67,8 +67,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index dff0a70aa2..9bc08c7a4c 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -55,8 +55,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index 2c102649c3..0cf427357e 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -80,8 +80,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x04, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_KNOCKBACK, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index 9495395aa3..1d70c37e8f 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -66,8 +66,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/src/overlays/actors/ovl_En_Fw/z_en_fw.c index 1f1d6b99e5..80928b164e 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -56,8 +56,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x04 }, - { 0xFFCFFFFE, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index fc0c1363bb..e2f5d28e09 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -82,8 +82,8 @@ static ColliderCylinderInitType1 sCylinderInit1 = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x00 }, - { 0xFFCE0FDB, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCE0FDB, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, @@ -101,8 +101,8 @@ static ColliderCylinderInitType1 sCylinderInit2 = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x00 }, - { 0x0001F024, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x0001F024, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -120,8 +120,8 @@ static ColliderCylinderInitType1 sCylinderInit3 = { }, { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x02, 0x08 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_ICE, 0x08 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index bc8c75c255..cc03db16fc 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -70,8 +70,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/src/overlays/actors/ovl_En_Gb/z_en_gb.c index ccf8740470..aaedbd8560 100644 --- a/src/overlays/actors/ovl_En_Gb/z_en_gb.c +++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.c @@ -70,8 +70,8 @@ static ColliderCylinderInitType1 sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index cd5253402e..cf3a74c292 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -78,8 +78,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000702, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000702, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index c40402d602..900967f71e 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -93,8 +93,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x000007A2, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x000007A2, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index 8ac3cdcd54..f832f4b4e3 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -53,8 +53,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000722, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000722, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index 83aba60ddc..e8938ac97e 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -111,8 +111,8 @@ static ColliderCylinderInit sBodyCylinderInit = { }, { ELEM_MATERIAL_UNK1, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -124,8 +124,8 @@ static ColliderTrisElementInit sBlockTrisElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0xFFC1FFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFC1FFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -135,8 +135,8 @@ static ColliderTrisElementInit sBlockTrisElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0xFFC1FFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFC1FFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -169,8 +169,8 @@ static ColliderQuadInit sSwordQuadInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index 3c0b766413..a698d5fbaf 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -62,8 +62,8 @@ static ColliderCylinderInitType1 sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index 3d89726128..733c8519aa 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -74,8 +74,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index 39b8da508a..6718a23b64 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -95,8 +95,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000008, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/src/overlays/actors/ovl_En_Goma/z_en_goma.c index b7973fb22a..c290012270 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -88,8 +88,8 @@ static ColliderCylinderInit D_80A4B7A0 = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFDFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFDFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, @@ -108,8 +108,8 @@ static ColliderCylinderInit D_80A4B7CC = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFDFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFDFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index b4d0fbd54c..7d58731365 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -75,8 +75,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x00, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index 286af80803..a98dca4837 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -58,8 +58,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c index 29b1423035..a6c31638cb 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -56,8 +56,8 @@ static ColliderCylinderInitType1 sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c index f1ae9acbdd..86a98fd188 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -47,8 +47,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000080, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000080, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index 3d6a7cb7dc..b193f534c2 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -87,8 +87,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index 075c5f8cb0..9e4fa5d48b 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -60,8 +60,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c index ced83c19c4..f77484dca8 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -56,8 +56,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index 72a6fb9d63..14de43c857 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -57,8 +57,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index 118c54dd29..e9a7297091 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -81,8 +81,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0x00000000, 0x00, 0x00 }, - { 0x0001F824, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x0001F824, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -92,8 +92,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x0001F824, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x0001F824, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -126,8 +126,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, 0x04 }, - { 0x00100000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0x00100000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index e97d9b9f9f..4dbf4ada35 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -114,8 +114,8 @@ static ColliderCylinderInit sCylinderInit1 = { }, { ELEM_MATERIAL_UNK0, - { 0x00000400, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000400, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_ON, @@ -134,8 +134,8 @@ static ColliderCylinderInit sCylinderInit2 = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -147,8 +147,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x0001F824, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x0001F824, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_NO_AT_INFO | ACELEM_NO_DAMAGE | ACELEM_NO_SWORD_SFX | ACELEM_NO_HITMARK, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c index c7a6ccf92f..12c32b7be1 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c @@ -66,8 +66,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -79,8 +79,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index 5241d38d90..6d8304ecad 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -64,8 +64,8 @@ static ColliderCylinderInitType1 sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -77,8 +77,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index a77853b6f6..fcdeb0d10d 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -85,8 +85,8 @@ static ColliderCylinderInit sCylinderInit1 = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -105,8 +105,8 @@ static ColliderCylinderInit sCylinderInit2 = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -118,8 +118,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c index 3458916790..991ded9bf4 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c @@ -56,8 +56,8 @@ static ColliderCylinderInitType1 sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -69,8 +69,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index 757eab0a77..fca53bcd74 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -53,8 +53,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index 453ab7f659..4eefda79d8 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -49,8 +49,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c index 65a3c884d1..ba419257f6 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -71,8 +71,8 @@ static ColliderCylinderInit sColliderCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index 86e86a8065..fb0e54f101 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -62,8 +62,8 @@ static ColliderCylinderInit sCylinderInitCapturableFlame = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -82,8 +82,8 @@ static ColliderCylinderInit sCylinderInitDroppedFlame = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 0c3db73889..ad944a3957 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -98,8 +98,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, @@ -111,8 +111,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0xFFC3FFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFC3FFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_NO_AT_INFO, OCELEM_NONE, @@ -122,8 +122,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0xFFC3FFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFC3FFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_NO_AT_INFO, OCELEM_NONE, @@ -156,8 +156,8 @@ static ColliderQuadInit sQuadInit = { }, { ELEM_MATERIAL_UNK0, - { 0x20000000, 0x00, 0x40 }, - { 0x00000000, 0x00, 0x00 }, + { 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x40 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index 1c5bdbf739..952e0db3ef 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -67,8 +67,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index c147ded68e..3c7cf47292 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -75,8 +75,8 @@ static ColliderJntSphElementInit sColliderElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_It/z_en_it.c b/src/overlays/actors/ovl_En_It/z_en_it.c index b8df8d467f..b6bb36d3a3 100644 --- a/src/overlays/actors/ovl_En_It/z_en_it.c +++ b/src/overlays/actors/ovl_En_It/z_en_it.c @@ -25,8 +25,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c index 917c765c7e..89ef487ab3 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c @@ -69,8 +69,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000004, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000004, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index 7e570bdd56..d26911af1f 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -48,8 +48,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index 71a3eae57f..cd887c91e8 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -49,8 +49,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE | ACELEM_HOOKABLE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index e4b3dbf9e6..d3b163a099 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -37,8 +37,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c index 6752e92d1c..2fb2991934 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -53,8 +53,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index 9a3f2eaca1..c0c05a65d0 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -117,8 +117,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index 3a128a5b12..64e7303371 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -64,8 +64,8 @@ static ColliderCylinderInit sBodyColliderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -84,8 +84,8 @@ static ColliderCylinderInit sHeadColliderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c index f381c88492..76f69db9df 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -68,8 +68,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index 9a5a41119f..a4e5d5773f 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -79,8 +79,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x4FC00758, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x4FC00758, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index 40b10dc670..83cc7fe9c1 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -60,8 +60,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c index a1dec3b49b..49a435500f 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c @@ -38,8 +38,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK2, - { 0x00000001, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000001, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index b66ace6f3f..dd62fcabc8 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -48,8 +48,8 @@ static ColliderCylinderInit D_80AA0420 = { }, { ELEM_MATERIAL_UNK2, - { 0x00000001, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000001, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index cacb968ebe..9a4975614e 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -62,8 +62,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index e6df4523d7..ad8a44991a 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -63,8 +63,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index 2a23f0d175..94d1cf2b51 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -59,8 +59,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index 90ed9f3a68..75eb4b1d49 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -118,8 +118,8 @@ static ColliderCylinderInit sBodyColliderInit = { }, { ELEM_MATERIAL_UNK1, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -131,8 +131,8 @@ static ColliderTrisElementInit sFrontShieldingTrisElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE | ACELEM_NO_AT_INFO, OCELEM_NONE, @@ -142,8 +142,8 @@ static ColliderTrisElementInit sFrontShieldingTrisElementsInit[] = { { { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE | ACELEM_NO_AT_INFO, OCELEM_NONE, @@ -176,8 +176,8 @@ static ColliderQuadInit sAttackColliderQuadInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index 1695635c59..aae2954469 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -60,8 +60,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index 59257e93d3..42846bd7aa 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -50,8 +50,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c index 9881334a0a..e4ded4a594 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -76,8 +76,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index 187b576594..1210c34ee7 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -71,8 +71,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000004, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000004, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index bff50062b7..d4e173f2bb 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -51,8 +51,8 @@ static ColliderCylinderInitType1 sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/src/overlays/actors/ovl_En_Mu/z_en_mu.c index 78229fc754..3fd3ba25a6 100644 --- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c +++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c @@ -37,8 +37,8 @@ static ColliderCylinderInit D_80AB0BD0 = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index a91373e78c..d72977d3b0 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -87,8 +87,8 @@ static ColliderCylinderInitType1 sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 5acaf3f9ed..3a811453e4 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -106,8 +106,8 @@ static ColliderCylinderInit sCylinderInit1 = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -126,8 +126,8 @@ static ColliderCylinderInit sCylinderInit2 = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index 8949be2892..4e9ccbb9d6 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -57,8 +57,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index 2ea1ace664..066bf1476d 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -74,8 +74,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index 0799a31a4b..f52c80e291 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -55,8 +55,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_WOOD, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c index 6d80cc8bb6..79778e54c4 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -56,8 +56,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x04, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_KNOCKBACK, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index 1503bb265c..b8cd31b2ce 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -56,8 +56,8 @@ static ColliderCylinderInit sProjectileColliderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, ACELEM_ON, OCELEM_ON, @@ -76,8 +76,8 @@ static ColliderCylinderInit sOctorockColliderInit = { }, { ELEM_MATERIAL_UNK1, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 0cad597f84..7b6656b50b 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -153,8 +153,8 @@ static ColliderCylinderInitType1 sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index cd5da7dd2f..1f725248d8 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -109,8 +109,8 @@ static ColliderCylinderInit sOwlCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index 1cece3d894..7502487ccc 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -82,8 +82,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, @@ -95,8 +95,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -129,8 +129,8 @@ static ColliderQuadInit sQuadInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c index caf492b8be..fa7e94fafb 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c @@ -54,8 +54,8 @@ static ColliderCylinderInit sColliderCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index 2989292f7f..249244b5d8 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -73,8 +73,8 @@ static ColliderCylinderInit D_80AD7080 = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -93,8 +93,8 @@ static ColliderCylinderInit D_80AD70AC = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x01, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_FIRE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index b2effdffed..b1f81b70d7 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -75,8 +75,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index fcd5a3ce27..299b0df33a 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -104,8 +104,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0x4FC7FFEA, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0x4FC7FFEA, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index b5fdc43217..061720f0db 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -82,8 +82,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -95,8 +95,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 3091697443..b41be053d9 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -99,8 +99,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK1, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index e535d66edd..aeff74445a 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -117,8 +117,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x08, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_8, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index 5ed4a1ea37..e18f1cb0cd 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -114,8 +114,8 @@ static ColliderCylinderInitType1 sCylinderInit1 = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, @@ -133,8 +133,8 @@ static ColliderCylinderInitType1 sCylinderInit2 = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 43f1414308..6c64a3ef6e 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -100,8 +100,8 @@ static ColliderCylinderInitType1 sStandingCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -119,8 +119,8 @@ static ColliderCylinderInitType1 sSittingCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000101, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000101, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 23b211cfa8..ff5e3518a9 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -99,8 +99,8 @@ static ColliderCylinderInitType1 sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000080, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000080, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index e0ada94990..2e2c651bfe 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -70,8 +70,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index a777eee0d5..98ab740df9 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -59,8 +59,8 @@ static ColliderCylinderInitType1 sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x04, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_KNOCKBACK, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c index 03ef38b658..d8b479b845 100644 --- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c +++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c @@ -56,8 +56,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index f3894ac83b..5ee82311b2 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -37,8 +37,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000090, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000090, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index 8bd797a19d..43ccbba8dd 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -60,8 +60,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, @@ -71,8 +71,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index cd1c8e1d2f..1a38696515 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -204,8 +204,8 @@ static ColliderCylinderInitType1 D_80B01678 = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c index 11c33d8469..92c8b662f1 100644 --- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c +++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c @@ -45,8 +45,8 @@ static ColliderCylinderInitType1 sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 0326e57cc3..36cc87fa49 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -68,8 +68,8 @@ static ColliderCylinderInit sCylinderInit1 = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_NONE, @@ -90,8 +90,8 @@ static ColliderCylinderInit sCylinderInit2 = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -103,8 +103,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index da4e493a7a..e6e55facd9 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -67,8 +67,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_NONE, @@ -89,8 +89,8 @@ static ColliderCylinderInit sCylinderInit2 = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -102,8 +102,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 5cd96b9c63..e69aede4ed 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -58,8 +58,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index 2ba9693458..b745742836 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -53,8 +53,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFC3FFFE, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFC3FFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index b7ac898b92..a97ff743cf 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -65,8 +65,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index f8d842b7ee..bf6570d48f 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -102,8 +102,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000004, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000004, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index f81eba1e5d..550fafa726 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -163,8 +163,8 @@ static ColliderCylinderInit sBodyColliderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -183,8 +183,8 @@ static ColliderCylinderInit sShieldColliderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFC1FFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFC1FFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -203,8 +203,8 @@ static ColliderQuadInit sSwordColliderQuadInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c index e0e7ef04b2..5ad2d2108b 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -33,8 +33,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index 008028366f..08fad96d3c 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -107,8 +107,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index b5ca8502b7..4d234504e8 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -163,8 +163,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c index 361ef77182..54526030e4 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c @@ -52,8 +52,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c index 6182e0aab8..ef62bfb826 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -73,8 +73,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x03, 0x08 }, - { 0xFFCFFFFF, 0x01, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_ELECTRIC, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_ELECTRIC, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c index 4a8cee9fda..fc2a850392 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c @@ -63,8 +63,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00001000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00001000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index 26ddde0720..72a4012a4a 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -44,8 +44,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/src/overlays/actors/ovl_En_Vali/z_en_vali.c index bf9262099b..b69184006f 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -66,8 +66,8 @@ static ColliderQuadInit sQuadInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x07, 0x08 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_7, 0x08 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, @@ -86,8 +86,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x07, 0x08 }, - { 0xFFCFFFFF, 0x01, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_7, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_ELECTRIC, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index a03ea5a1fb..d67c549234 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -51,8 +51,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK6, - { 0x00100700, 0x00, 0x20 }, - { 0x00100700, 0x00, 0x00 }, + { 0x00100700, HIT_SPECIAL_EFFECT_NONE, 0x20 }, + { 0x00100700, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index 128a0af5f4..050942aac4 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -61,8 +61,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -81,8 +81,8 @@ static ColliderQuadInit sQuadInit1 = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, ACELEM_NONE, OCELEM_NONE, @@ -101,8 +101,8 @@ static ColliderQuadInit sQuadInit2 = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 37d6d31ece..0192c2cd28 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -71,8 +71,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c index 35e232c69b..919eb6bd75 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -61,8 +61,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index 344539bf5f..aed59d0990 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -67,8 +67,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, @@ -78,8 +78,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, @@ -89,8 +89,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK1, - { 0x00000000, 0x00, 0x00 }, - { 0xFFC1FFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFC1FFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, @@ -100,8 +100,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK1, - { 0x00000000, 0x00, 0x00 }, - { 0xFFC1FFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFC1FFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, @@ -134,8 +134,8 @@ static ColliderCylinderInit sBodyCylinderInit = { }, { ELEM_MATERIAL_UNK1, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -154,8 +154,8 @@ static ColliderCylinderInit sTailCylinderInit = { }, { ELEM_MATERIAL_UNK1, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c index 7cfe974b8a..a8a840d82d 100644 --- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c +++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c @@ -42,8 +42,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index 2d351c9184..bb1acebc24 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -71,8 +71,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK5, - { 0x00000000, 0x00, 0x00 }, - { 0x0FC0074A, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x0FC0074A, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index 60a247490b..e28d8f584f 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -60,8 +60,8 @@ static ColliderCylinderInitType1 sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c index 5e2cbc8c93..528fd9c0c7 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c @@ -37,8 +37,8 @@ static ColliderQuadInit sQuadInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x0001F824, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x0001F824, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index 772eceb114..ab9dc51d68 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -52,8 +52,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x04 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index 7fa645e64a..9481a81ed8 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -140,8 +140,8 @@ static ColliderCylinderInit sBodyCylinderInit = { }, { ELEM_MATERIAL_UNK1, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -160,8 +160,8 @@ static ColliderQuadInit sSwordQuadInit = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x08 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index 8de9163341..a1cca466a6 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -64,8 +64,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK1, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 3acf9fa616..a071640323 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -53,8 +53,8 @@ static ColliderCylinderInitType1 sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index 1820626285..6f55b607ff 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -98,8 +98,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index 85f0f300e9..f8b738c295 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -299,8 +299,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index a5af30c5bf..52e636c77d 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -229,8 +229,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -240,8 +240,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -251,8 +251,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -262,8 +262,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -273,8 +273,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -284,8 +284,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -295,8 +295,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -306,8 +306,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -317,8 +317,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -328,8 +328,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -339,8 +339,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, @@ -350,8 +350,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x00, 0x10 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x10 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c index 9dda7af3f0..eaedc5813c 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -43,8 +43,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000004, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000004, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c index a5938c8fca..a16c32a0d5 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -81,8 +81,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00020000, 0x00, 0x01 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00020000, HIT_SPECIAL_EFFECT_NONE, 0x01 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index b021c6314e..0ed454941f 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -71,8 +71,8 @@ static ColliderQuadInit sQuadInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00200000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00200000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, @@ -84,8 +84,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00200000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00200000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index 7ccb70299d..78faf2c0dd 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -113,8 +113,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index d1d5b69497..09675c4bc7 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -51,8 +51,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x4FC1FFFE, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x4FC1FFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index 402e4c1583..49575ed0a7 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -48,8 +48,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x4001FFFE, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x4001FFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c index 48ac3219fd..cef0fe97cf 100644 --- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c +++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c @@ -46,8 +46,8 @@ static ColliderCylinderInitToActor sCylinderInit = { }, { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index 97c898f466..6490db46ae 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -50,8 +50,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x4FC1FFF6, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x4FC1FFF6, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c index 8cfaa9599e..fe731ff59b 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -42,8 +42,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c index 3dac2d7fe4..ee56e5d203 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -51,8 +51,8 @@ static ColliderCylinderInit sCylinderInitIce = { }, { ELEM_MATERIAL_UNK0, - { 0xFFCFFFFF, 0x02, 0x00 }, - { 0x00020800, 0x00, 0x00 }, + { 0xFFCFFFFF, HIT_SPECIAL_EFFECT_ICE, 0x00 }, + { 0x00020800, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_ON, OCELEM_ON, @@ -71,8 +71,8 @@ static ColliderCylinderInit sCylinderInitHard = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x4E01F7F6, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x4E01F7F6, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index b4dd823735..a45735f2df 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -57,8 +57,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000002, 0x00, 0x01 }, - { 0x4FC00748, 0x00, 0x00 }, + { 0x00000002, HIT_SPECIAL_EFFECT_NONE, 0x01 }, + { 0x4FC00748, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index c8c0a1211f..08c20a9ff5 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -51,8 +51,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x40000040, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x40000040, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index ec7abf312a..39f3e80dc1 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -67,8 +67,8 @@ static ColliderJntSphElementInit sColliderJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00200000, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00200000, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index a327267d23..dbe4193bef 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -91,8 +91,8 @@ static ColliderTrisElementInit sRustyFloorTrisElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x40000040, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x40000040, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -102,8 +102,8 @@ static ColliderTrisElementInit sRustyFloorTrisElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x40000040, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x40000040, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -129,8 +129,8 @@ static ColliderTrisElementInit sEyeTrisElementsInit[] = { { { ELEM_MATERIAL_UNK4, - { 0x00000000, 0x00, 0x00 }, - { 0x0001F824, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x0001F824, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -140,8 +140,8 @@ static ColliderTrisElementInit sEyeTrisElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x0001F824, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x0001F824, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, @@ -167,8 +167,8 @@ static ColliderJntSphElementInit sCrystalJntSphElementsInit[] = { { { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xEFC1FFFE, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xEFC1FFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index 064dceebad..a75c504b6f 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -50,8 +50,8 @@ static ColliderCylinderInit sCylInitStand = { }, { ELEM_MATERIAL_UNK2, - { 0x00100000, 0x00, 0x00 }, - { 0xEE01FFFF, 0x00, 0x00 }, + { 0x00100000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xEE01FFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, @@ -70,8 +70,8 @@ static ColliderCylinderInit sCylInitFlame = { }, { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0x00020820, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00020820, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_NONE, diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index 4a2ba2d3d9..4719667c40 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -78,8 +78,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000002, 0x00, 0x01 }, - { 0x4FC1FFFE, 0x00, 0x00 }, + { 0x00000002, HIT_SPECIAL_EFFECT_NONE, 0x01 }, + { 0x4FC1FFFE, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index 1ba86361ed..c36b928ad1 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -65,8 +65,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000020, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000020, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index ff7fbb1b3e..0fe5048f20 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -10476,8 +10476,8 @@ static ColliderCylinderInit D_80854624 = { }, { ELEM_MATERIAL_UNK1, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, @@ -10496,8 +10496,8 @@ static ColliderQuadInit D_80854650 = { }, { ELEM_MATERIAL_UNK2, - { 0x00000100, 0x00, 0x01 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000100, HIT_SPECIAL_EFFECT_NONE, 0x01 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_NONE, OCELEM_NONE, @@ -10516,8 +10516,8 @@ static ColliderQuadInit D_808546A0 = { }, { ELEM_MATERIAL_UNK2, - { 0x00100000, 0x00, 0x00 }, - { 0xDFCFFFFF, 0x00, 0x00 }, + { 0x00100000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xDFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_NONE,