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

Colliders: elemType -> elemMaterial (#2189)

Browse source 
* elemType -> elemMaterial

* format
This commit is contained in:
Dragorn421 2024-09-17 00:11:01 +02:00 • committed by GitHub
parent 8f0e2fc29c
commit 48780cd2b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
240 changed files with 560 additions and 561 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
include/z64collision_check.h
View file

@ -99,27 +99,21 @@ typedef struct ColliderElementDamageInfoACInit {
/* 0x05 */ u8 defense; // Damage Resistance
} ColliderElementDamageInfoACInit; // size = 0x08
/**
* Affects the sound Link's sword makes when hitting it, hookability,
* and possibly other things. It's definitely not flags, as all checks
* are == or !=. Will probably need more actors decomped to truly
* understand what this is.
*/
typedef enum ElementType {
/* 0 */ ELEMTYPE_UNK0,
/* 1 */ ELEMTYPE_UNK1,
/* 2 */ ELEMTYPE_UNK2,
/* 3 */ ELEMTYPE_UNK3,
/* 4 */ ELEMTYPE_UNK4,
/* 5 */ ELEMTYPE_UNK5,
/* 6 */ ELEMTYPE_UNK6,
/* 7 */ ELEMTYPE_UNK7
} ElementType;
typedef enum ElementMaterial {
/* 0 */ ELEM_MATERIAL_UNK0,
/* 1 */ ELEM_MATERIAL_UNK1,
/* 2 */ ELEM_MATERIAL_UNK2,
/* 3 */ ELEM_MATERIAL_UNK3,
/* 4 */ ELEM_MATERIAL_UNK4,
/* 5 */ ELEM_MATERIAL_UNK5,
/* 6 */ ELEM_MATERIAL_UNK6,
/* 7 */ ELEM_MATERIAL_UNK7
} ElementMaterial;
typedef struct ColliderElement {
/* 0x00 */ ColliderElementDamageInfoAT atDmgInfo; // Damage properties when acting as an AT collider
/* 0x08 */ ColliderElementDamageInfoAC acDmgInfo; // Damage properties when acting as an AC collider
/* 0x14 */ u8 elemType; // Affects sfx reaction when attacked by Link and hookability. Full purpose unknown.
/* 0x14 */ u8 elemMaterial; // Affects sfx when attacked by Player, and interaction with hookshot and arrows.
/* 0x15 */ u8 atElemFlags; // Information flags for AT collisions
/* 0x16 */ u8 acElemFlags; // Information flags for AC collisions
/* 0x17 */ u8 ocElemFlags; // Information flags for OC collisions
@ -130,7 +124,7 @@ typedef struct ColliderElement {
} ColliderElement; // size = 0x28
typedef struct ColliderElementInit {
/* 0x00 */ u8 elemType; // Affects sfx reaction when attacked by Link and hookability. Full purpose unknown.
/* 0x00 */ u8 elemMaterial; // Affects sfx when attacked by Player, and interaction with hookshot and arrows.
/* 0x04 */ ColliderElementDamageInfoAT atDmgInfo; // Damage properties when acting as an AT collider
/* 0x0C */ ColliderElementDamageInfoACInit acDmgInfo; // Damage properties when acting as an AC collider
/* 0x14 */ u8 atElemFlags; // Information flags for AT collisions

27
src/code/z_collision_check.c
View file

@ -189,11 +189,16 @@ s32 Collider_SetElementDamageInfoAC(PlayState* play, ColliderElementDamageInfoAC
s32 Collider_InitElement(PlayState* play, ColliderElement* elem) {
static ColliderElement init = {
{ 0, 0, 0 }, { 0xFFCFFFFF, 0, 0, { 0, 0, 0 } },
ELEMTYPE_UNK0, ATELEM_NONE,
ACELEM_NONE, OCELEM_NONE,
NULL, NULL,
NULL, NULL,
{ 0, 0, 0 },
{ 0xFFCFFFFF, 0, 0, { 0, 0, 0 } },
ELEM_MATERIAL_UNK0,
ATELEM_NONE,
ACELEM_NONE,
OCELEM_NONE,
NULL,
NULL,
NULL,
NULL,
};
*elem = init;
@ -209,7 +214,7 @@ s32 Collider_DestroyElement(PlayState* play, ColliderElement* elem) {
}
s32 Collider_SetElement(PlayState* play, ColliderElement* elem, ColliderElementInit* elemInit) {
elem->elemType = elemInit->elemType;
elem->elemMaterial = elemInit->elemMaterial;
Collider_SetElementDamageInfoAT(play, &elem->atDmgInfo, &elemInit->atDmgInfo);
Collider_SetElementDamageInfoAC(play, &elem->acDmgInfo, &elemInit->acDmgInfo);
elem->atElemFlags = elemInit->atElemFlags;
@ -1584,20 +1589,20 @@ void CollisionCheck_HitSolid(PlayState* play, ColliderElement* elem, Collider* c
}
/**
* Plays a hit sound effect for AT colliders attached to Player based on the AC element's elemType.
* Plays a hit sound effect for AT colliders attached to Player based on the AC element's elemMaterial.
*/
s32 CollisionCheck_SwordHitAudio(Collider* atCol, ColliderElement* acElem) {
if (atCol->actor != NULL && atCol->actor->category == ACTORCAT_PLAYER) {
if (acElem->elemType == ELEMTYPE_UNK0) {
if (acElem->elemMaterial == ELEM_MATERIAL_UNK0) {
Audio_PlaySfxGeneral(NA_SE_IT_SWORD_STRIKE, &atCol->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
} else if (acElem->elemType == ELEMTYPE_UNK1) {
} else if (acElem->elemMaterial == ELEM_MATERIAL_UNK1) {
Audio_PlaySfxGeneral(NA_SE_IT_SWORD_STRIKE_HARD, &atCol->actor->projectedPos, 4,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
} else if (acElem->elemType == ELEMTYPE_UNK2) {
} else if (acElem->elemMaterial == ELEM_MATERIAL_UNK2) {
Audio_PlaySfxGeneral(NA_SE_NONE, &atCol->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
} else if (acElem->elemType == ELEMTYPE_UNK3) {
} else if (acElem->elemMaterial == ELEM_MATERIAL_UNK3) {
Audio_PlaySfxGeneral(NA_SE_NONE, &atCol->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
}

2
src/code/z_en_a_keep.c
View file

@ -42,7 +42,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,

2
src/code/z_en_item00.c
View file

@ -42,7 +42,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000010, 0x00, 0x00 },
ATELEM_NONE | ATELEM_SFX_NORMAL,

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

@ -33,7 +33,7 @@ static ColliderQuadInit sQuadInit = {
COLSHAPE_QUAD,
},
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x00000080, 0x00, 0x01 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_NEAREST | ATELEM_SFX_NORMAL,
@ -150,7 +150,7 @@ void ArmsHook_Shoot(ArmsHook* this, PlayState* play) {
ArmsHook_CheckForCancel(this);
if ((this->timer != 0) && (this->collider.base.atFlags & AT_HIT) &&
(this->collider.elem.atHitElem->elemType != ELEMTYPE_UNK4)) {
(this->collider.elem.atHitElem->elemMaterial != ELEM_MATERIAL_UNK4)) {
Actor* touchedActor = this->collider.base.at;
if ((touchedActor->update != NULL) && (touchedActor->flags & (ACTOR_FLAG_9 | ACTOR_FLAG_10))) {

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

@ -65,7 +65,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_HARD,

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

@ -57,7 +57,7 @@ ActorProfile Bg_Bdan_Switch_Profile = {
static ColliderJntSphElementInit sJntSphElementsInit[] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xEFC1FFFE, 0x00, 0x00 },
ATELEM_NONE,

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

@ -23,7 +23,7 @@ void func_8086EE94(BgBombwall* this, PlayState* play);
static ColliderTrisElementInit sTrisElementsInit[3] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x40000048, 0x00, 0x00 },
ATELEM_NONE,
@ -34,7 +34,7 @@ static ColliderTrisElementInit sTrisElementsInit[3] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x40000048, 0x00, 0x00 },
ATELEM_NONE,
@ -45,7 +45,7 @@ static ColliderTrisElementInit sTrisElementsInit[3] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x40000048, 0x00, 0x00 },
ATELEM_NONE,

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

@ -48,7 +48,7 @@ static ColliderQuadInit sQuadInit = {
COLSHAPE_QUAD,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000048, 0x00, 0x00 },
{ 0x00000048, 0x00, 0x00 },
ATELEM_NONE,

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

@ -40,7 +40,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,

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

@ -42,7 +42,7 @@ static ColliderCylinderInit sColCylinderInitMain = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,
@ -62,7 +62,7 @@ static ColliderCylinderInit sColCylinderInitLeftRight = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_NONE,

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

@ -41,7 +41,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x00 },
{ 0x00020800, 0x00, 0x00 },
ATELEM_NONE,

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

@ -41,7 +41,7 @@ ActorProfile Bg_Haka_Sgami_Profile = {
static ColliderTrisElementInit sTrisElementsInit[4] = {
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x20000000, 0x00, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -52,7 +52,7 @@ static ColliderTrisElementInit sTrisElementsInit[4] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x20000000, 0x00, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -63,7 +63,7 @@ static ColliderTrisElementInit sTrisElementsInit[4] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x20000000, 0x00, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -74,7 +74,7 @@ static ColliderTrisElementInit sTrisElementsInit[4] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x20000000, 0x00, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -108,7 +108,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_NONE,

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

@ -51,7 +51,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -64,7 +64,7 @@ static ColliderCylinderInit sCylinderInit = {
static ColliderTrisElementInit sTrisElementsInit[2] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00020000, 0x00, 0x00 },
ATELEM_NONE,
@ -75,7 +75,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00020000, 0x00, 0x00 },
ATELEM_NONE,

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

@ -40,7 +40,7 @@ static ColliderCylinderInit sPotColliderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,
@ -60,7 +60,7 @@ static ColliderCylinderInit sFlamesColliderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,

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

@ -42,7 +42,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,

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

@ -39,7 +39,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,

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

@ -32,7 +32,7 @@ ActorProfile Bg_Hidan_Dalm_Profile = {
static ColliderTrisElementInit sTrisElementInit[4] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000040, 0x00, 0x00 },
ATELEM_NONE,
@ -43,7 +43,7 @@ static ColliderTrisElementInit sTrisElementInit[4] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000040, 0x00, 0x00 },
ATELEM_NONE,
@ -54,7 +54,7 @@ static ColliderTrisElementInit sTrisElementInit[4] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000040, 0x00, 0x00 },
ATELEM_NONE,
@ -65,7 +65,7 @@ static ColliderTrisElementInit sTrisElementInit[4] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000040, 0x00, 0x00 },
ATELEM_NONE,

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

@ -43,7 +43,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,

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

@ -53,7 +53,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,

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

@ -28,7 +28,7 @@ static f32 sYPosOffsets[] = {
static ColliderTrisElementInit sTrisElementsInit[2] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x40000040, 0x00, 0x00 },
ATELEM_NONE,
@ -39,7 +39,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x40000040, 0x00, 0x00 },
ATELEM_NONE,

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

@ -33,7 +33,7 @@ ActorProfile Bg_Hidan_Hrock_Profile = {
static ColliderTrisElementInit sTrisElementsInit[2] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x40000040, 0x00, 0x00 },
ATELEM_NONE,
@ -44,7 +44,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x40000040, 0x00, 0x00 },
ATELEM_NONE,

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

@ -43,7 +43,7 @@ static Gfx* sBreakableWallDLists[] = {
static ColliderJntSphElementInit sJntSphElementsInit[1] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,

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

@ -51,7 +51,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,

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

@ -29,7 +29,7 @@ ActorProfile Bg_Hidan_Rsekizou_Profile = {
static ColliderJntSphElementInit sJntSphElementsInit[6] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,
@ -40,7 +40,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[6] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,
@ -51,7 +51,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[6] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,
@ -62,7 +62,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[6] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,
@ -73,7 +73,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[6] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,
@ -84,7 +84,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[6] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,

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

@ -32,7 +32,7 @@ ActorProfile Bg_Hidan_Sekizou_Profile = {
static ColliderJntSphElementInit sJntSphElementsInit[6] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,
@ -43,7 +43,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[6] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,
@ -54,7 +54,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[6] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,
@ -65,7 +65,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[6] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,
@ -76,7 +76,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[6] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,
@ -87,7 +87,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[6] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,

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

@ -36,7 +36,7 @@ ActorProfile Bg_Hidan_Sima_Profile = {
static ColliderJntSphElementInit sJntSphElementsInit[2] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,
@ -47,7 +47,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[2] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,

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

@ -50,7 +50,7 @@ static ColliderCylinderInit sCylinderInit1 = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,
@ -70,7 +70,7 @@ static ColliderCylinderInit sCylinderInit2 = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x4FC1FFF6, 0x00, 0x00 },
ATELEM_NONE,

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

@ -30,7 +30,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0x4FC007CA, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

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

@ -47,7 +47,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_NONE,

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

@ -29,7 +29,7 @@ ActorProfile Bg_Jya_Bombchuiwa_Profile = {
static ColliderJntSphElementInit sJntSphElementsInit[1] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,

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

@ -31,7 +31,7 @@ ActorProfile Bg_Jya_Bombiwa_Profile = {
static ColliderJntSphElementInit sJntSphElementsInit[] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,

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

@ -38,7 +38,7 @@ ActorProfile Bg_Jya_Goroiwa_Profile = {
static ColliderJntSphElementInit sJntSphElementsInit[] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x00, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

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

@ -37,7 +37,7 @@ ActorProfile Bg_Jya_Haheniron_Profile = {
static ColliderJntSphElementInit sJntSphElementsInit[1] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

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

@ -48,7 +48,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,

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

@ -35,7 +35,7 @@ ActorProfile Bg_Jya_Megami_Profile = {
static ColliderJntSphElementInit sJntSphElementsInit[] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00200000, 0x00, 0x00 },
ATELEM_NONE,

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

@ -31,7 +31,7 @@ static s32 sNumEyesShot;
static ColliderJntSphElementInit sJntSphElementsInit[1] = {
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0x00000000, 0x00, 0x00 },
{ 0x0001F820, 0x00, 0x00 },
ATELEM_NONE,

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

@ -34,7 +34,7 @@ ActorProfile Bg_Mizu_Bwall_Profile = {
static ColliderTrisElementInit sTrisElementInitFloor[2] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,
@ -45,7 +45,7 @@ static ColliderTrisElementInit sTrisElementInitFloor[2] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,
@ -72,7 +72,7 @@ static ColliderTrisInit sTrisInitFloor = {
static ColliderTrisElementInit sTrisElementInitRutoWall[1] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,
@ -99,7 +99,7 @@ static ColliderTrisInit sTrisInitRutoWall = {
static ColliderTrisElementInit sTrisElementInitWall[2] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,
@ -110,7 +110,7 @@ static ColliderTrisElementInit sTrisElementInitWall[2] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,

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

@ -39,7 +39,7 @@ ActorProfile Bg_Mori_Hashigo_Profile = {
static ColliderJntSphElementInit sJntSphElementsInit[1] = {
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0x00000000, 0x00, 0x00 },
{ 0x0001F820, 0x00, 0x00 },
ATELEM_NONE,

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

@ -43,7 +43,7 @@ ActorProfile Bg_Po_Event_Profile = {
static ColliderTrisElementInit sTrisElementsInit[2] = {
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0x00000000, 0x00, 0x00 },
{ 0x0001F820, 0x00, 0x00 },
ATELEM_NONE,
@ -54,7 +54,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0x00000000, 0x00, 0x00 },
{ 0x0001F820, 0x00, 0x00 },
ATELEM_NONE,

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

@ -34,7 +34,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,

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

@ -59,7 +59,7 @@ ActorProfile Bg_Spot06_Objects_Profile = {
static ColliderJntSphElementInit sJntSphItemsInit[1] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000080, 0x00, 0x00 },
ATELEM_NONE,

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

@ -34,7 +34,7 @@ ActorProfile Bg_Spot08_Bakudankabe_Profile = {
static ColliderJntSphElementInit sJntSphElementsInit[] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,
@ -45,7 +45,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,
@ -56,7 +56,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,

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

@ -38,7 +38,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,

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

@ -36,7 +36,7 @@ static s16 D_808B5DD8[][10] = {
static ColliderJntSphElementInit sJntSphElementsInit[] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x4FC1FFF6, 0x00, 0x00 },
ATELEM_NONE,
@ -70,7 +70,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,

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

@ -37,7 +37,7 @@ ActorProfile Bg_Spot18_Basket_Profile = {
static ColliderJntSphElementInit sJntSphElementsInit[2] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_NONE,
@ -48,7 +48,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[2] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,

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

@ -44,7 +44,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,

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

@ -35,7 +35,7 @@ ActorProfile Bg_Ydan_Maruta_Profile = {
static ColliderTrisElementInit sTrisElementsInit[2] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x00, 0x04 },
{ 0x00000004, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_WOOD,
@ -46,7 +46,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x00, 0x04 },
{ 0x00000004, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_WOOD,

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

@ -39,7 +39,7 @@ ActorProfile Bg_Ydan_Sp_Profile = {
static ColliderTrisElementInit sTrisItemsInit[2] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x00 },
{ 0x00020800, 0x00, 0x00 },
ATELEM_NONE,
@ -50,7 +50,7 @@ static ColliderTrisElementInit sTrisItemsInit[2] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x00 },
{ 0x00020800, 0x00, 0x00 },
ATELEM_NONE,

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

@ -13,7 +13,7 @@ static u8 D_808C7000[] = {
static ColliderJntSphElementInit sJntSphElementsInit[19] = {
{
{
ELEMTYPE_UNK3,
ELEM_MATERIAL_UNK3,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -24,7 +24,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK3,
ELEM_MATERIAL_UNK3,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -35,7 +35,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -46,7 +46,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -57,7 +57,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -68,7 +68,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -79,7 +79,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -90,7 +90,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -101,7 +101,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -112,7 +112,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -123,7 +123,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -134,7 +134,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -145,7 +145,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -156,7 +156,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -167,7 +167,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -178,7 +178,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -189,7 +189,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -200,7 +200,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -211,7 +211,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

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

@ -3,7 +3,7 @@
static ColliderJntSphElementInit sJntSphItemsInit[19] = {
{
{
ELEMTYPE_UNK3,
ELEM_MATERIAL_UNK3,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -14,7 +14,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -25,7 +25,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -36,7 +36,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -47,7 +47,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -58,7 +58,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -69,7 +69,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -80,7 +80,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -91,7 +91,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -102,7 +102,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -113,7 +113,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -124,7 +124,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -135,7 +135,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -146,7 +146,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -157,7 +157,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -168,7 +168,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -179,7 +179,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -190,7 +190,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -201,7 +201,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

4
src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
View file

@ -822,10 +822,10 @@ void BossFd2_CollisionCheck(BossFd2* this, PlayState* play) {
}
}
if (!bossFd->faceExposed) {
this->collider.elements[0].base.elemType = ELEMTYPE_UNK2;
this->collider.elements[0].base.elemMaterial = ELEM_MATERIAL_UNK2;
this->collider.base.colMaterial = COL_MATERIAL_METAL;
} else {
this->collider.elements[0].base.elemType = ELEMTYPE_UNK3;
this->collider.elements[0].base.elemMaterial = ELEM_MATERIAL_UNK3;
this->collider.base.colMaterial = COL_MATERIAL_HIT3;
}

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

@ -3,7 +3,7 @@
static ColliderJntSphElementInit sJntSphElementsInit[9] = {
{
{
ELEMTYPE_UNK3,
ELEM_MATERIAL_UNK3,
{ 0xFFCFFFFF, 0x00, 0x20 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_NONE,
@ -14,7 +14,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[9] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x20 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -25,7 +25,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[9] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x20 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -36,7 +36,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[9] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x20 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -47,7 +47,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[9] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x20 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -58,7 +58,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[9] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x20 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -69,7 +69,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[9] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x20 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -80,7 +80,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[9] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x20 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -91,7 +91,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[9] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x20 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

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

@ -67,7 +67,7 @@ static ColliderCylinderInit sDorfCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -87,7 +87,7 @@ static ColliderCylinderInit sLightBallCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK6,
ELEM_MATERIAL_UNK6,
{ 0x00100700, 0x00, 0x08 },
{ 0x0D900740, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

36
src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.inc.c
View file

@ -26,7 +26,7 @@ static u8 D_80906D78 = 0;
static ColliderJntSphElementInit sJntSphItemsInit1[] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -37,7 +37,7 @@ static ColliderJntSphElementInit sJntSphItemsInit1[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -48,7 +48,7 @@ static ColliderJntSphElementInit sJntSphItemsInit1[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -59,7 +59,7 @@ static ColliderJntSphElementInit sJntSphItemsInit1[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -70,7 +70,7 @@ static ColliderJntSphElementInit sJntSphItemsInit1[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -81,7 +81,7 @@ static ColliderJntSphElementInit sJntSphItemsInit1[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -92,7 +92,7 @@ static ColliderJntSphElementInit sJntSphItemsInit1[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -103,7 +103,7 @@ static ColliderJntSphElementInit sJntSphItemsInit1[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -114,7 +114,7 @@ static ColliderJntSphElementInit sJntSphItemsInit1[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -125,7 +125,7 @@ static ColliderJntSphElementInit sJntSphItemsInit1[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -136,7 +136,7 @@ static ColliderJntSphElementInit sJntSphItemsInit1[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -147,7 +147,7 @@ static ColliderJntSphElementInit sJntSphItemsInit1[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -158,7 +158,7 @@ static ColliderJntSphElementInit sJntSphItemsInit1[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -169,7 +169,7 @@ static ColliderJntSphElementInit sJntSphItemsInit1[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -180,7 +180,7 @@ static ColliderJntSphElementInit sJntSphItemsInit1[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -191,7 +191,7 @@ static ColliderJntSphElementInit sJntSphItemsInit1[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -218,7 +218,7 @@ static ColliderJntSphInit sJntSphInit1 = {
static ColliderJntSphElementInit sJntSphItemsInit2[] = {
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x40 },
{ 0xFFDFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -229,7 +229,7 @@ static ColliderJntSphElementInit sJntSphItemsInit2[] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x40 },
{ 0xFFDFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

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

@ -91,7 +91,7 @@ static ColliderCylinderInit sCylinderInitBody = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -111,7 +111,7 @@ static ColliderCylinderInit sCylinderInitSpear = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x30 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

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

@ -64,7 +64,7 @@ ActorProfile Boss_Goma_Profile = {
static ColliderJntSphElementInit sColliderJntSphElementInit[13] = {
{
{
ELEMTYPE_UNK3,
ELEM_MATERIAL_UNK3,
{ 0xFFCFFFFF, 0x00, 0x08 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -75,7 +75,7 @@ static ColliderJntSphElementInit sColliderJntSphElementInit[13] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x08 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -86,7 +86,7 @@ static ColliderJntSphElementInit sColliderJntSphElementInit[13] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x08 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -97,7 +97,7 @@ static ColliderJntSphElementInit sColliderJntSphElementInit[13] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x08 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -108,7 +108,7 @@ static ColliderJntSphElementInit sColliderJntSphElementInit[13] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x08 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -119,7 +119,7 @@ static ColliderJntSphElementInit sColliderJntSphElementInit[13] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x08 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -130,7 +130,7 @@ static ColliderJntSphElementInit sColliderJntSphElementInit[13] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x08 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -141,7 +141,7 @@ static ColliderJntSphElementInit sColliderJntSphElementInit[13] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x08 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -152,7 +152,7 @@ static ColliderJntSphElementInit sColliderJntSphElementInit[13] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x08 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -163,7 +163,7 @@ static ColliderJntSphElementInit sColliderJntSphElementInit[13] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x08 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -174,7 +174,7 @@ static ColliderJntSphElementInit sColliderJntSphElementInit[13] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x08 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -185,7 +185,7 @@ static ColliderJntSphElementInit sColliderJntSphElementInit[13] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x08 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -196,7 +196,7 @@ static ColliderJntSphElementInit sColliderJntSphElementInit[13] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0xFFCFFFFF, 0x00, 0x08 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

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

@ -4,7 +4,7 @@
static ColliderJntSphElementInit sJntSphElementsInit[19] = {
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -15,7 +15,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -26,7 +26,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -37,7 +37,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -48,7 +48,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -59,7 +59,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -70,7 +70,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -81,7 +81,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -92,7 +92,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -103,7 +103,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -114,7 +114,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -125,7 +125,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -136,7 +136,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -147,7 +147,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -158,7 +158,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -169,7 +169,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -180,7 +180,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -191,7 +191,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -202,7 +202,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
},
{
{
ELEMTYPE_UNK4,
ELEM_MATERIAL_UNK4,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -236,7 +236,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0xFFDFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

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

@ -3,7 +3,7 @@
static ColliderJntSphElementInit sJntSphItemsInitHand[11] = {
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -14,7 +14,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHand[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -25,7 +25,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHand[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -36,7 +36,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHand[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -47,7 +47,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHand[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -58,7 +58,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHand[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -69,7 +69,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHand[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -80,7 +80,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHand[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -91,7 +91,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHand[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -102,7 +102,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHand[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -113,7 +113,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHand[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -140,7 +140,7 @@ static ColliderJntSphInit sJntSphInitHand = {
static ColliderJntSphElementInit sJntSphItemsInitHead[11] = {
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x30 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -151,7 +151,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHead[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x30 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -162,7 +162,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHead[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x30 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -173,7 +173,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHead[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x30 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -184,7 +184,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHead[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x30 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -195,7 +195,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHead[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x30 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -206,7 +206,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHead[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x30 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -217,7 +217,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHead[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x30 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -228,7 +228,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHead[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x30 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -239,7 +239,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHead[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x30 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -250,7 +250,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHead[11] = {
},
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x30 },
{ 0x00000080, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -284,7 +284,7 @@ static ColliderCylinderInit sCylinderInitHead = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,
@ -304,7 +304,7 @@ static ColliderCylinderInit sCylinderInitHand = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x04, 0x10 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,

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

@ -141,7 +141,7 @@ static ColliderCylinderInit sCylinderInitBlasts = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x30 },
{ 0x00100000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -161,7 +161,7 @@ static ColliderCylinderInit sCylinderInitKoumeKotake = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x20 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -181,7 +181,7 @@ static ColliderCylinderInit sCylinderInitTwinrova = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x20 },
{ 0xFFCDFFFE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

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

@ -212,7 +212,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFEF, 0x03, 0x08 },
{ 0x00000010, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -225,7 +225,7 @@ static ColliderCylinderInit sCylinderInit = {
static ColliderJntSphElementInit sJntSphElementsInitSupport[1] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000010, 0x00, 0x00 },
ATELEM_NONE,
@ -252,7 +252,7 @@ static ColliderJntSphInit sJntSphInitSupport = {
static ColliderJntSphElementInit sJntSphElementsInitBari[1] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x03, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -286,7 +286,7 @@ static ColliderQuadInit sQuadInit = {
COLSHAPE_QUAD,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x03, 0x04 },
{ 0x00000010, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7,

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

@ -24,7 +24,7 @@ static ColliderCylinderInitType1 sCylinderInit1 = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,
@ -43,7 +43,7 @@ static ColliderCylinderInitType1 sCylinderInit2 = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,
@ -62,7 +62,7 @@ static ColliderCylinderInitType1 sCylinderInit3 = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,

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

@ -43,7 +43,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x07, 0x04 },
{ 0x00002000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

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

@ -40,7 +40,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000048, 0x00, 0x00 },
ATELEM_NONE,

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

@ -51,7 +51,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x10 },
{ 0x0001FFEE, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -64,7 +64,7 @@ static ColliderCylinderInit sCylinderInit = {
static ColliderJntSphElementInit sJntSphItemsInit[1] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,

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

@ -61,7 +61,7 @@ static ColliderCylinderInit sHurtCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,
@ -81,7 +81,7 @@ static ColliderCylinderInit sBlockCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00400106, 0x00, 0x00 },
ATELEM_NONE,
@ -101,7 +101,7 @@ static ColliderQuadInit sQuadInit = {
COLSHAPE_QUAD,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x08 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

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

@ -48,7 +48,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,

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

@ -47,7 +47,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,

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

@ -41,7 +41,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x01, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

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

@ -41,7 +41,7 @@ static ColliderQuadInit sColliderInit = {
COLSHAPE_QUAD,
},
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x00000020, 0x00, 0x01 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_NEAREST | ATELEM_SFX_NONE,
@ -282,7 +282,7 @@ void EnArrow_Fly(EnArrow* this, PlayState* play) {
} else {
EffectSsHitMark_SpawnCustomScale(play, 0, 150, &this->actor.world.pos);
if (atTouched && (this->collider.elem.atHitElem->elemType != ELEMTYPE_UNK4)) {
if (atTouched && (this->collider.elem.atHitElem->elemMaterial != ELEM_MATERIAL_UNK4)) {
hitActor = this->collider.base.at;
if ((hitActor->update != NULL) && !(this->collider.base.atFlags & AT_BOUNCED) &&

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

@ -40,7 +40,7 @@ static Vec3f D_809B8080 = { 0.0f, 0.0f, 32.0f };
static ColliderJntSphElementInit sJntSphElementInit[2] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000010, 0x00, 0x00 },
ATELEM_NONE,
@ -51,7 +51,7 @@ static ColliderJntSphElementInit sJntSphElementInit[2] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x00, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

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

@ -210,7 +210,7 @@ ActorProfile En_Bb_Profile = {
static ColliderJntSphElementInit sJntSphElementInit[1] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,

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

@ -45,7 +45,7 @@ ActorProfile En_Bigokuta_Profile = {
static ColliderJntSphElementInit sJntSphElementInit[1] = {
{
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x08 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_HARD,
@ -79,7 +79,7 @@ static ColliderCylinderInit sCylinderInit[] = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x08 },
{ 0xFFCFFFE7, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_HARD,
@ -96,7 +96,7 @@ static ColliderCylinderInit sCylinderInit[] = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0x20000000, 0x00, 0x08 },
{ 0xFFCFFFE7, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_HARD,

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

@ -50,7 +50,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x03, 0x08 },
{ 0xFFCFFFFF, 0x01, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,

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

@ -40,7 +40,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0x0003F828, 0x00, 0x00 },
ATELEM_NONE,
@ -53,7 +53,7 @@ static ColliderCylinderInit sCylinderInit = {
static ColliderJntSphElementInit sJntSphElementsInit[1] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000008, 0x00, 0x08 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,

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

@ -30,7 +30,7 @@ ActorProfile En_Bom_Chu_Profile = {
static ColliderJntSphElementInit sJntSphElemInit[] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,

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

@ -43,7 +43,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0x0003F828, 0x00, 0x00 },
ATELEM_NONE,
@ -56,7 +56,7 @@ static ColliderCylinderInit sCylinderInit = {
static ColliderJntSphElementInit sJntSphElementsInit[1] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000008, 0x00, 0x08 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,

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

@ -38,7 +38,7 @@ static ColliderQuadInit sQuadInit = {
COLSHAPE_QUAD,
},
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x00000010, 0x00, 0x01 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_NEAREST | ATELEM_SFX_NORMAL,

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

@ -44,7 +44,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0xFFCFFFFF, 0x03, 0x08 },
{ 0xFFCFFFFF, 0x01, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,

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

@ -27,7 +27,7 @@ ActorProfile En_Bubble_Profile = {
static ColliderJntSphElementInit sJntSphElementsInit[2] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x04 },
{ 0xFFCFD753, 0x00, 0x00 },
ATELEM_NONE,
@ -38,7 +38,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[2] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00002824, 0x00, 0x00 },
ATELEM_NONE,

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

@ -27,7 +27,7 @@ void EnButte_WaitToDie(EnButte* this, PlayState* play);
static ColliderJntSphElementInit sJntSphElementsInit[] = {
{ {
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x000, 0x00 },
ATELEM_NONE,

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

@ -55,7 +55,7 @@ static ColliderCylinderInit sCylinderInit1 = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x01, 0x08 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -75,7 +75,7 @@ static ColliderCylinderInit sCylinderInit2 = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,

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

@ -36,7 +36,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK1,
ELEM_MATERIAL_UNK1,
{ 0xFFCFFFFF, 0x03, 0x04 },
{ 0xFFCFFFFF, 0x01, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -56,7 +56,7 @@ static ColliderQuadInit sQuadInit = {
COLSHAPE_QUAD,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x03, 0x04 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

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

@ -44,7 +44,7 @@ static ColliderCylinderInit sArwingCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFDFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
@ -64,7 +64,7 @@ static ColliderCylinderInit sLaserCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFDFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

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

@ -48,7 +48,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,

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

@ -33,7 +33,7 @@ ActorProfile En_Crow_Profile = {
static ColliderJntSphElementInit sJntSphElementsInit[1] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x08 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_HARD,

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

@ -37,7 +37,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_NONE,

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

@ -63,7 +63,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_NONE,

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

@ -46,7 +46,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_NONE,

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

@ -44,7 +44,7 @@ ActorProfile En_Dekubaba_Profile = {
static ColliderJntSphElementInit sJntSphElementsInit[7] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x08 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_HARD,
@ -55,7 +55,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[7] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,
@ -66,7 +66,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[7] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,
@ -77,7 +77,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[7] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,
@ -88,7 +88,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[7] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,
@ -99,7 +99,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[7] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,
@ -110,7 +110,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[7] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,

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

@ -52,7 +52,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,

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

@ -53,7 +53,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
ATELEM_NONE,
@ -66,7 +66,7 @@ static ColliderCylinderInit sCylinderInit = {
static ColliderJntSphElementInit sJntSphElementsInit[1] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,

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

@ -73,7 +73,7 @@ static DamageTable sDamageTable = {
static ColliderJntSphElementInit sJntSphElementsInit[] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,
@ -84,7 +84,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,
@ -95,7 +95,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,
@ -106,7 +106,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,
@ -117,7 +117,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,

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

@ -58,7 +58,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_NONE | ATELEM_SFX_NORMAL,

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

@ -63,7 +63,7 @@ static ColliderCylinderInitType1 sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,

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

@ -61,7 +61,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_NONE,

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

@ -78,7 +78,7 @@ static ColliderCylinderInit sBodyCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_NONE,
@ -98,7 +98,7 @@ static ColliderQuadInit sTargetQuadInit = {
COLSHAPE_QUAD,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x0001F824, 0x00, 0x00 },
ATELEM_NONE,

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

@ -53,7 +53,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x08 },
{ 0xFFC5FFFF, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,

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

@ -51,7 +51,7 @@ ActorProfile En_Dodongo_Profile = {
static ColliderJntSphElementInit sBodyElementsInit[6] = {
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,
@ -62,7 +62,7 @@ static ColliderJntSphElementInit sBodyElementsInit[6] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,
@ -73,7 +73,7 @@ static ColliderJntSphElementInit sBodyElementsInit[6] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,
@ -84,7 +84,7 @@ static ColliderJntSphElementInit sBodyElementsInit[6] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_NONE,
@ -95,7 +95,7 @@ static ColliderJntSphElementInit sBodyElementsInit[6] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_NONE,
@ -106,7 +106,7 @@ static ColliderJntSphElementInit sBodyElementsInit[6] = {
},
{
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x0D800691, 0x00, 0x00 },
ATELEM_NONE,
@ -133,7 +133,7 @@ static ColliderJntSphInit sBodyJntSphInit = {
static ColliderTrisElementInit sHardElementsInit[3] = {
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0xF24BF96E, 0x00, 0x00 },
ATELEM_NONE,
@ -144,7 +144,7 @@ static ColliderTrisElementInit sHardElementsInit[3] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCBF96E, 0x00, 0x00 },
ATELEM_NONE,
@ -155,7 +155,7 @@ static ColliderTrisElementInit sHardElementsInit[3] = {
},
{
{
ELEMTYPE_UNK2,
ELEM_MATERIAL_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCBF96E, 0x00, 0x00 },
ATELEM_NONE,
@ -189,7 +189,7 @@ static ColliderQuadInit sAttackQuadInit = {
COLSHAPE_QUAD,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x10 },
{ 0x00000000, 0x00, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7,

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

@ -43,7 +43,7 @@ static ColliderCylinderInit sCylinderInit = {
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
ATELEM_NONE,

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