mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup extracted colliders 3: Use HIT_SPECIAL_EFFECT_, HIT_BACKLASH_ names (#2646)

Browse source 
* Cleanup extracted colliders 3: Use `HIT_SPECIAL_EFFECT_`, `HIT_BACKLASH_` names

* revert removing FLARE_DANCER_BODY_DMG (oops)
This commit is contained in:
Dragorn421 2025-06-28 23:06:42 +01:00 • committed by GitHub
parent b5f980570c
commit d45353ee33
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
241 changed files with 1029 additions and 1026 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/collision_check.h
View file

@ -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 {

4
src/code/z_en_a_keep.c
View file

@ -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,

6
src/code/z_en_item00.c
View file

@ -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,
},

4
src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
View file

@ -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,

12
src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c
View file

@ -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,

8
src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c
View file

@ -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,

20
src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c
View file

@ -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,

12
src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c
View file

@ -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,

8
src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
View file

@ -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,

16
src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
View file

@ -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,

8
src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c
View file

@ -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,

8
src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c
View file

@ -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,

24
src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
View file

@ -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,

24
src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c
View file

@ -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,

8
src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c
View file

@ -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,

8
src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
View file

@ -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,

20
src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c
View file

@ -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,

8
src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
View file

@ -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,

12
src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c
View file

@ -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,

8
src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
View file

@ -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,

8
src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c
View file

@ -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,

4
src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
View file

@ -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,

8
src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c
View file

@ -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,

8
src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c
View file

@ -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,

76
src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c
View file

@ -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,

76
src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c
View file

@ -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,

36
src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c
View file

@ -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,

8
src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
View file

@ -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,

72
src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
View file

@ -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,

8
src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
View file

@ -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,

52
src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
View file

@ -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,

80
src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c
View file

@ -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,

96
src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c
View file

@ -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,

12
src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
View file

@ -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,

16
src/overlays/actors/ovl_Boss_Va/z_boss_va.c
View file

@ -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,

12
src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
View file

@ -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,

4
src/overlays/actors/ovl_Demo_Im/z_demo_im.c
View file

@ -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,

4
src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
View file

@ -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,

4
src/overlays/actors/ovl_Door_Ana/z_door_ana.c
View file

@ -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,

8
src/overlays/actors/ovl_Door_Killer/z_door_killer.c
View file

@ -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,

12
src/overlays/actors/ovl_En_Am/z_en_am.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Ani/z_en_ani.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Anubice/z_en_anubice.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
View file

@ -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,

8
src/overlays/actors/ovl_En_Ba/z_en_ba.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Bb/z_en_bb.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Bili/z_en_bili.c
View file

@ -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,

8
src/overlays/actors/ovl_En_Bom/z_en_bom.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
View file

@ -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,

8
src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Boom/z_en_boom.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Brob/z_en_brob.c
View file

@ -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,

8
src/overlays/actors/ovl_En_Bubble/z_en_bubble.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Butte/z_en_butte.c
View file

@ -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,

8
src/overlays/actors/ovl_En_Bw/z_en_bw.c
View file

@ -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,

8
src/overlays/actors/ovl_En_Bx/z_en_bx.c
View file

@ -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,

8
src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Cow/z_en_cow.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Crow/z_en_crow.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Cs/z_en_cs.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c
View file

@ -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,

28
src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
View file

@ -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,

8
src/overlays/actors/ovl_En_Dh/z_en_dh.c
View file

@ -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,

20
src/overlays/actors/ovl_En_Dha/z_en_dha.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Dns/z_en_dns.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
View file

@ -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,

8
src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
View file

@ -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,

40
src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Dog/z_en_dog.c
View file

@ -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,

4
src/overlays/actors/ovl_En_Du/z_en_du.c
View file

@ -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,

Some files were not shown because too many files have changed in this diff Show more