mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 02:54:24 +00:00
Code Issues Projects Releases Wiki Activity

Colliders: colType -> colMaterial (#2186)

Browse source 
* colType -> colMaterial

* fixups
This commit is contained in:
Dragorn421 2024-09-12 03:18:46 +02:00 • committed by GitHub
parent 64570e871f
commit f193311013
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
249 changed files with 448 additions and 448 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
include/z64collision_check.h
View file

@ -17,23 +17,6 @@ struct PlayState;
* Bases for all shapes of colliders
*/
typedef enum ColliderType {
/* 0 */ COLTYPE_HIT0, // Blue blood, white hitmark
/* 1 */ COLTYPE_HIT1, // No blood, dust hitmark
/* 2 */ COLTYPE_HIT2, // Green blood, dust hitmark
/* 3 */ COLTYPE_HIT3, // No blood, white hitmark
/* 4 */ COLTYPE_HIT4, // Water burst, no hitmark
/* 5 */ COLTYPE_HIT5, // No blood, red hitmark
/* 6 */ COLTYPE_HIT6, // Green blood, white hitmark
/* 7 */ COLTYPE_HIT7, // Red blood, white hitmark
/* 8 */ COLTYPE_HIT8, // Blue blood, red hitmark
/* 9 */ COLTYPE_METAL,
/* 10 */ COLTYPE_NONE,
/* 11 */ COLTYPE_WOOD,
/* 12 */ COLTYPE_HARD,
/* 13 */ COLTYPE_TREE
} ColliderType;
typedef enum ColliderShape {
/* 0 */ COLSHAPE_JNTSPH,
/* 1 */ COLSHAPE_CYLINDER,
@ -42,6 +25,23 @@ typedef enum ColliderShape {
/* 4 */ COLSHAPE_MAX
} ColliderShape;
typedef enum ColliderMaterial {
/* 0 */ COL_MATERIAL_HIT0, // Blue blood, white hitmark
/* 1 */ COL_MATERIAL_HIT1, // No blood, dust hitmark
/* 2 */ COL_MATERIAL_HIT2, // Green blood, dust hitmark
/* 3 */ COL_MATERIAL_HIT3, // No blood, white hitmark
/* 4 */ COL_MATERIAL_HIT4, // Water burst, no hitmark
/* 5 */ COL_MATERIAL_HIT5, // No blood, red hitmark
/* 6 */ COL_MATERIAL_HIT6, // Green blood, white hitmark
/* 7 */ COL_MATERIAL_HIT7, // Red blood, white hitmark
/* 8 */ COL_MATERIAL_HIT8, // Blue blood, red hitmark
/* 9 */ COL_MATERIAL_METAL,
/* 10 */ COL_MATERIAL_NONE,
/* 11 */ COL_MATERIAL_WOOD,
/* 12 */ COL_MATERIAL_HARD,
/* 13 */ COL_MATERIAL_TREE
} ColliderMaterial;
typedef struct Collider {
/* 0x00 */ struct Actor* actor; // Attached actor
/* 0x04 */ struct Actor* at; // Actor attached to what it collided with as an AT collider.
@ -51,12 +51,12 @@ typedef struct Collider {
/* 0x11 */ u8 acFlags;
/* 0x12 */ u8 ocFlags1;
/* 0x13 */ u8 ocFlags2; // Flags related to which colliders it can OC collide with.
/* 0x14 */ u8 colType; // Determines hitmarks and sound effects during AC collisions. See `ColliderType` enum
/* 0x14 */ u8 colMaterial; // Determines hitmarks and sound effects during AC collisions. See `ColliderMaterial` enum
/* 0x15 */ u8 shape; // See `ColliderShape` enum
} Collider; // size = 0x18
typedef struct ColliderInit {
/* 0x00 */ u8 colType;
/* 0x00 */ u8 colMaterial;
/* 0x01 */ u8 atFlags;
/* 0x02 */ u8 acFlags;
/* 0x03 */ u8 ocFlags1;
@ -65,7 +65,7 @@ typedef struct ColliderInit {
} ColliderInit; // size = 0x06
typedef struct ColliderInitType1 {
/* 0x00 */ u8 colType;
/* 0x00 */ u8 colMaterial;
/* 0x01 */ u8 atFlags;
/* 0x02 */ u8 acFlags;
/* 0x03 */ u8 ocFlags1;

60
src/code/z_collision_check.c
View file

@ -81,7 +81,7 @@ void Collider_DrawPoly(GraphicsContext* gfxCtx, Vec3f* vA, Vec3f* vB, Vec3f* vC,
s32 Collider_InitBase(PlayState* play, Collider* col) {
static Collider init = {
NULL, NULL, NULL, NULL, AT_NONE, AC_NONE, OC1_NONE, OC2_NONE, COLTYPE_HIT3, COLSHAPE_MAX,
NULL, NULL, NULL, NULL, AT_NONE, AC_NONE, OC1_NONE, OC2_NONE, COL_MATERIAL_HIT3, COLSHAPE_MAX,
};
*col = init;
@ -93,7 +93,7 @@ s32 Collider_DestroyBase(PlayState* play, Collider* col) {
}
/**
* Uses default OC2_TYPE_1 and COLTYPE_HIT0
* Uses default OC2_TYPE_1 and COL_MATERIAL_HIT0
*/
s32 Collider_SetBaseToActor(PlayState* play, Collider* col, ColliderInitToActor* src) {
col->actor = src->actor;
@ -110,7 +110,7 @@ s32 Collider_SetBaseToActor(PlayState* play, Collider* col, ColliderInitToActor*
*/
s32 Collider_SetBaseType1(PlayState* play, Collider* col, Actor* actor, ColliderInitType1* src) {
col->actor = actor;
col->colType = src->colType;
col->colMaterial = src->colMaterial;
col->atFlags = src->atFlags;
col->acFlags = src->acFlags;
col->ocFlags1 = src->ocFlags1;
@ -121,7 +121,7 @@ s32 Collider_SetBaseType1(PlayState* play, Collider* col, Actor* actor, Collider
s32 Collider_SetBase(PlayState* play, Collider* col, Actor* actor, ColliderInit* src) {
col->actor = actor;
col->colType = src->colType;
col->colMaterial = src->colMaterial;
col->atFlags = src->atFlags;
col->acFlags = src->acFlags;
col->ocFlags1 = src->ocFlags1;
@ -339,7 +339,7 @@ s32 Collider_DestroyJntSph(PlayState* play, ColliderJntSph* jntSph) {
/**
* Sets up the ColliderJntSph using the values in src, sets it to the actor specified in src, and dynamically allocates
* the element array. Uses default OC2_TYPE_1 and COLTYPE_HIT0. Unused.
* the element array. Uses default OC2_TYPE_1 and COL_MATERIAL_HIT0. Unused.
*/
s32 Collider_SetJntSphToActor(PlayState* play, ColliderJntSph* dest, ColliderJntSphInitToActor* src) {
ColliderJntSphElement* destElem;
@ -524,7 +524,7 @@ s32 Collider_DestroyCylinder(PlayState* play, ColliderCylinder* cyl) {
/**
* Sets up the ColliderCylinder using the values in src and sets it to the actor specified in src. Uses default
* OC2_TYPE_1 and COLTYPE_0. Used only by DekuJr, who sets it to himself anyways.
* OC2_TYPE_1 and COL_MATERIAL_0. Used only by DekuJr, who sets it to himself anyways.
*/
s32 Collider_SetCylinderToActor(PlayState* play, ColliderCylinder* dest, ColliderCylinderInitToActor* src) {
Collider_SetBaseToActor(play, &dest->base, &src->base);
@ -1546,7 +1546,7 @@ void CollisionCheck_RedBloodUnused(PlayState* play, Collider* collider, Vec3f* v
void CollisionCheck_HitSolid(PlayState* play, ColliderElement* elem, Collider* collider, Vec3f* hitPos) {
s32 flags = elem->atElemFlags & ATELEM_SFX_MASK;
if (flags == ATELEM_SFX_NORMAL && collider->colType != COLTYPE_METAL) {
if (flags == ATELEM_SFX_NORMAL && collider->colMaterial != COL_MATERIAL_METAL) {
EffectSsHitMark_SpawnFixedScale(play, EFFECT_HITMARK_WHITE, hitPos);
if (collider->actor == NULL) {
Audio_PlaySfxGeneral(NA_SE_IT_SHIELD_BOUND, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
@ -1555,7 +1555,7 @@ void CollisionCheck_HitSolid(PlayState* play, ColliderElement* elem, Collider* c
Audio_PlaySfxGeneral(NA_SE_IT_SHIELD_BOUND, &collider->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
}
} else if (flags == ATELEM_SFX_NORMAL) { // collider->colType == COLTYPE_METAL
} else if (flags == ATELEM_SFX_NORMAL) { // collider->colMaterial == COL_MATERIAL_METAL
EffectSsHitMark_SpawnFixedScale(play, EFFECT_HITMARK_METAL, hitPos);
if (collider->actor == NULL) {
CollisionCheck_SpawnShieldParticlesMetal(play, hitPos);
@ -1640,24 +1640,24 @@ static ColChkBloodFunc sBloodFuncs[] = {
};
static HitInfo sHitInfo[] = {
{ BLOOD_BLUE, HIT_WHITE }, // COLTYPE_HIT0
{ BLOOD_NONE, HIT_DUST }, // COLTYPE_HIT1
{ BLOOD_GREEN, HIT_DUST }, // COLTYPE_HIT2
{ BLOOD_NONE, HIT_WHITE }, // COLTYPE_HIT3
{ BLOOD_WATER, HIT_NONE }, // COLTYPE_HIT4
{ BLOOD_NONE, HIT_RED }, // COLTYPE_HIT5
{ BLOOD_GREEN, HIT_WHITE }, // COLTYPE_HIT6
{ BLOOD_RED, HIT_WHITE }, // COLTYPE_HIT7
{ BLOOD_BLUE, HIT_RED }, // COLTYPE_HIT8
{ BLOOD_NONE, HIT_SOLID }, // COLTYPE_METAL
{ BLOOD_NONE, HIT_NONE }, // COLTYPE_NONE
{ BLOOD_NONE, HIT_SOLID }, // COLTYPE_WOOD
{ BLOOD_NONE, HIT_SOLID }, // COLTYPE_HARD
{ BLOOD_NONE, HIT_WOOD }, // COLTYPE_TREE
{ BLOOD_BLUE, HIT_WHITE }, // COL_MATERIAL_HIT0
{ BLOOD_NONE, HIT_DUST }, // COL_MATERIAL_HIT1
{ BLOOD_GREEN, HIT_DUST }, // COL_MATERIAL_HIT2
{ BLOOD_NONE, HIT_WHITE }, // COL_MATERIAL_HIT3
{ BLOOD_WATER, HIT_NONE }, // COL_MATERIAL_HIT4
{ BLOOD_NONE, HIT_RED }, // COL_MATERIAL_HIT5
{ BLOOD_GREEN, HIT_WHITE }, // COL_MATERIAL_HIT6
{ BLOOD_RED, HIT_WHITE }, // COL_MATERIAL_HIT7
{ BLOOD_BLUE, HIT_RED }, // COL_MATERIAL_HIT8
{ BLOOD_NONE, HIT_SOLID }, // COL_MATERIAL_METAL
{ BLOOD_NONE, HIT_NONE }, // COL_MATERIAL_NONE
{ BLOOD_NONE, HIT_SOLID }, // COL_MATERIAL_WOOD
{ BLOOD_NONE, HIT_SOLID }, // COL_MATERIAL_HARD
{ BLOOD_NONE, HIT_WOOD }, // COL_MATERIAL_TREE
};
/**
* Handles hitmarks, blood, and sound effects for each AC collision, determined by the AC collider's colType
* Handles hitmarks, blood, and sound effects for each AC collision, determined by the AC collider's colMaterial
*/
void CollisionCheck_HitEffects(PlayState* play, Collider* atCol, ColliderElement* atElem, Collider* acCol,
ColliderElement* acElem, Vec3f* hitPos) {
@ -1668,12 +1668,12 @@ void CollisionCheck_HitEffects(PlayState* play, Collider* atCol, ColliderElement
return;
}
if (acCol->actor != NULL) {
sBloodFuncs[sHitInfo[acCol->colType].blood](play, acCol, hitPos);
sBloodFuncs[sHitInfo[acCol->colMaterial].blood](play, acCol, hitPos);
}
if (acCol->actor != NULL) {
if (sHitInfo[acCol->colType].effect == HIT_SOLID) {
if (sHitInfo[acCol->colMaterial].effect == HIT_SOLID) {
CollisionCheck_HitSolid(play, atElem, acCol, hitPos);
} else if (sHitInfo[acCol->colType].effect == HIT_WOOD) {
} else if (sHitInfo[acCol->colMaterial].effect == HIT_WOOD) {
if (atCol->actor == NULL) {
CollisionCheck_SpawnShieldParticles(play, hitPos);
Audio_PlaySfxGeneral(NA_SE_IT_REFLECTION_WOOD, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
@ -1681,8 +1681,8 @@ void CollisionCheck_HitEffects(PlayState* play, Collider* atCol, ColliderElement
} else {
CollisionCheck_SpawnShieldParticlesWood(play, hitPos, &atCol->actor->projectedPos);
}
} else if (sHitInfo[acCol->colType].effect != HIT_NONE) {
EffectSsHitMark_SpawnFixedScale(play, sHitInfo[acCol->colType].effect, hitPos);
} else if (sHitInfo[acCol->colMaterial].effect != HIT_NONE) {
EffectSsHitMark_SpawnFixedScale(play, sHitInfo[acCol->colMaterial].effect, hitPos);
if (!(acElem->acElemFlags & ACELEM_NO_SWORD_SFX)) {
CollisionCheck_SwordHitAudio(atCol, acElem);
}
@ -1736,8 +1736,8 @@ s32 CollisionCheck_SetATvsAC(PlayState* play, Collider* atCol, ColliderElement*
acElem->acDmgInfo.hitPos.x = hitPos->x;
acElem->acDmgInfo.hitPos.y = hitPos->y;
acElem->acDmgInfo.hitPos.z = hitPos->z;
if (!(atElem->atElemFlags & ATELEM_AT_HITMARK) && acCol->colType != COLTYPE_METAL &&
acCol->colType != COLTYPE_WOOD && acCol->colType != COLTYPE_HARD) {
if (!(atElem->atElemFlags & ATELEM_AT_HITMARK) && acCol->colMaterial != COL_MATERIAL_METAL &&
acCol->colMaterial != COL_MATERIAL_WOOD && acCol->colMaterial != COL_MATERIAL_HARD) {
acElem->acElemFlags |= ACELEM_DRAW_HITMARK;
} else {
CollisionCheck_HitEffects(play, atCol, atElem, acCol, acElem, hitPos);

2
src/code/z_en_a_keep.c
View file

@ -34,7 +34,7 @@ ActorProfile En_A_Obj_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_ALL,
OC1_ON | OC1_TYPE_ALL,

2
src/code/z_en_item00.c
View file

@ -34,7 +34,7 @@ ActorProfile En_Item00_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

12
src/code/z_player_lib.c
View file

@ -1312,17 +1312,17 @@ u8 func_80090480(PlayState* play, ColliderQuad* collider, WeaponInfo* weaponInfo
}
void Player_UpdateShieldCollider(PlayState* play, Player* this, ColliderQuad* collider, Vec3f* quadSrc) {
static u8 shieldColTypes[PLAYER_SHIELD_MAX] = {
COLTYPE_METAL,
COLTYPE_WOOD,
COLTYPE_METAL,
COLTYPE_METAL,
static u8 shieldColMaterials[PLAYER_SHIELD_MAX] = {
COL_MATERIAL_METAL,
COL_MATERIAL_WOOD,
COL_MATERIAL_METAL,
COL_MATERIAL_METAL,
};
if (this->stateFlags1 & PLAYER_STATE1_22) {
Vec3f quadDest[4];
this->shieldQuad.base.colType = shieldColTypes[this->currentShield];
this->shieldQuad.base.colMaterial = shieldColMaterials[this->currentShield];
Matrix_MultVec3f(&quadSrc[0], &quadDest[0]);
Matrix_MultVec3f(&quadSrc[1], &quadDest[1]);

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

@ -25,7 +25,7 @@ ActorProfile Arms_Hook_Profile = {
static ColliderQuadInit sQuadInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_PLAYER,
AC_NONE,
OC1_NONE,

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

@ -57,7 +57,7 @@ ActorProfile Bg_Bdan_Objects_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_NONE,
OC1_NONE,

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

@ -70,7 +70,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,

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

@ -58,7 +58,7 @@ static ColliderTrisElementInit sTrisElementsInit[3] = {
static ColliderTrisInit sTrisInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -40,7 +40,7 @@ ActorProfile Bg_Breakwall_Profile = {
static ColliderQuadInit sQuadInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER | AC_TYPE_OTHER,
OC1_NONE,

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

@ -32,7 +32,7 @@ ActorProfile Bg_Ddan_Kd_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_ALL,
OC1_NONE,

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

@ -34,7 +34,7 @@ ActorProfile Bg_Dodoago_Profile = {
static ColliderCylinderInit sColCylinderInitMain = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_ALL,
OC1_NONE,
@ -54,7 +54,7 @@ static ColliderCylinderInit sColCylinderInitMain = {
static ColliderCylinderInit sColCylinderInitLeftRight = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_NONE,
OC1_ON | OC1_NO_PUSH | OC1_TYPE_ALL,

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

@ -33,7 +33,7 @@ ActorProfile Bg_Gnd_Soulmeiro_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -87,7 +87,7 @@ static ColliderTrisElementInit sTrisElementsInit[4] = {
static ColliderTrisInit sTrisInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_NONE,
OC1_NONE,
@ -100,7 +100,7 @@ static ColliderTrisInit sTrisInit = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_NONE,
OC1_ON | OC1_TYPE_ALL,

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

@ -43,7 +43,7 @@ ActorProfile Bg_Haka_Trap_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_METAL,
COL_MATERIAL_METAL,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_HARD | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_PLAYER,
@ -88,7 +88,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = {
static ColliderTrisInit sTrisInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -32,7 +32,7 @@ ActorProfile Bg_Haka_Tubo_Profile = {
static ColliderCylinderInit sPotColliderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,
@ -52,7 +52,7 @@ static ColliderCylinderInit sPotColliderInit = {
static ColliderCylinderInit sFlamesColliderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_NONE,
OC1_ON | OC1_TYPE_PLAYER,

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

@ -34,7 +34,7 @@ void BgHakaZou_DoNothing(BgHakaZou* this, PlayState* play);
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -31,7 +31,7 @@ typedef struct BgHidanCurtainParams {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_NONE,
OC1_ON | OC1_TYPE_PLAYER,

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

@ -78,7 +78,7 @@ static ColliderTrisElementInit sTrisElementInit[4] = {
static ColliderTrisInit sTrisInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -35,7 +35,7 @@ ActorProfile Bg_Hidan_Firewall_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_NONE,
OC1_ON | OC1_TYPE_PLAYER,

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

@ -45,7 +45,7 @@ ActorProfile Bg_Hidan_Fwbig_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_NONE,
OC1_ON | OC1_TYPE_PLAYER,

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

@ -52,7 +52,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = {
static ColliderTrisInit sTrisInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -57,7 +57,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = {
static ColliderTrisInit sTrisInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -56,7 +56,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -43,7 +43,7 @@ ActorProfile Bg_Hidan_Rock_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_NONE,
OC1_NONE,

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

@ -97,7 +97,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[6] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_NONE,
OC1_NONE,

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

@ -100,7 +100,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[6] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_NONE,
OC1_ON | OC1_TYPE_PLAYER,

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

@ -60,7 +60,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[2] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_NONE,
OC1_NONE,

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

@ -42,7 +42,7 @@ static Color_RGBA8 sSteamEnvColor = { 180, 180, 180, 255 };
static ColliderCylinderInit sCylinderInit1 = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_OTHER,
OC1_ON | OC1_TYPE_ALL,
@ -62,7 +62,7 @@ static ColliderCylinderInit sCylinderInit1 = {
static ColliderCylinderInit sCylinderInit2 = {
{
COLTYPE_HARD,
COL_MATERIAL_HARD,
AT_NONE,
AC_ON | AC_HARD | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -22,7 +22,7 @@ void BgIceTurara_Regrow(BgIceTurara* this, PlayState* play);
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -39,7 +39,7 @@ ActorProfile Bg_Jya_1flift_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_NONE,
OC1_ON | OC1_TYPE_ALL,

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

@ -42,7 +42,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_2,

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

@ -44,7 +44,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -51,7 +51,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_NONE,
OC1_ON | OC1_TYPE_ALL,

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

@ -50,7 +50,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_ON,
OC1_NONE,

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

@ -40,7 +40,7 @@ static Gfx* sOpaDL[] = { gPillarDL, gThroneDL };
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_ENEMY,
OC1_NONE,

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

@ -48,7 +48,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -44,7 +44,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -58,7 +58,7 @@ static ColliderTrisElementInit sTrisElementInitFloor[2] = {
static ColliderTrisInit sTrisInitFloor = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,
@ -85,7 +85,7 @@ static ColliderTrisElementInit sTrisElementInitRutoWall[1] = {
static ColliderTrisInit sTrisInitRutoWall = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,
@ -123,7 +123,7 @@ static ColliderTrisElementInit sTrisElementInitWall[2] = {
static ColliderTrisInit sTrisInitUnusedWall = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,
@ -136,7 +136,7 @@ static ColliderTrisInit sTrisInitUnusedWall = {
static ColliderTrisInit sTrisInitStingerWall = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -52,7 +52,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -67,7 +67,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = {
static ColliderTrisInit sTrisInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -26,7 +26,7 @@ void BgPoSyokudai_Draw(Actor* thisx, PlayState* play);
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_METAL,
COL_MATERIAL_METAL,
AT_NONE,
AC_ON | AC_HARD | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,

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

@ -72,7 +72,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[1] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,

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

@ -69,7 +69,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -30,7 +30,7 @@ ActorProfile Bg_Spot11_Bakudankabe_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -49,7 +49,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_HARD,
COL_MATERIAL_HARD,
AT_NONE,
AC_ON | AC_HARD | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,
@ -62,7 +62,7 @@ static ColliderJntSphInit sJntSphInit = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -61,7 +61,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[2] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_PLAYER,

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

@ -36,7 +36,7 @@ ActorProfile Bg_Toki_Swd_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_NONE,
OC1_ON | OC1_TYPE_ALL,

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

@ -59,7 +59,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = {
static ColliderTrisInit sTrisInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -63,7 +63,7 @@ static ColliderTrisElementInit sTrisItemsInit[2] = {
static ColliderTrisInit sTrisInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -224,7 +224,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_HIT3,
COL_MATERIAL_HIT3,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_PLAYER,

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

@ -214,7 +214,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[19] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_METAL,
COL_MATERIAL_METAL,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_PLAYER,

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

@ -823,10 +823,10 @@ void BossFd2_CollisionCheck(BossFd2* this, PlayState* play) {
}
if (!bossFd->faceExposed) {
this->collider.elements[0].base.elemType = ELEMTYPE_UNK2;
this->collider.base.colType = COLTYPE_METAL;
this->collider.base.colMaterial = COL_MATERIAL_METAL;
} else {
this->collider.elements[0].base.elemType = ELEMTYPE_UNK3;
this->collider.base.colType = COLTYPE_HIT3;
this->collider.base.colMaterial = COL_MATERIAL_HIT3;
}
if (this->collider.elements[0].base.acElemFlags & ACELEM_HIT) {

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

@ -104,7 +104,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[9] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_METAL,
COL_MATERIAL_METAL,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_PLAYER,

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

@ -59,7 +59,7 @@ ActorProfile Boss_Ganon_Profile = {
static ColliderCylinderInit sDorfCylinderInit = {
{
COLTYPE_HIT3,
COL_MATERIAL_HIT3,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,
@ -79,7 +79,7 @@ static ColliderCylinderInit sDorfCylinderInit = {
static ColliderCylinderInit sLightBallCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,
@ -2378,7 +2378,7 @@ void BossGanon_SetupBlock(BossGanon* this, PlayState* play) {
}
void BossGanon_Block(BossGanon* this, PlayState* play) {
this->collider.base.colType = 9;
this->collider.base.colMaterial = COL_MATERIAL_METAL;
SkelAnime_Update(&this->skelAnime);
sCape->backPush = -9.0f;
sCape->backSwayMagnitude = 0.25f;
@ -2829,7 +2829,7 @@ void BossGanon_Update(Actor* thisx, PlayState* play2) {
}
}
this->collider.base.colType = 3;
this->collider.base.colMaterial = COL_MATERIAL_HIT3;
sCape->gravity = -3.0f;
this->shockGlow = false;
this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;

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

@ -204,7 +204,7 @@ static ColliderJntSphElementInit sJntSphItemsInit1[] = {
static ColliderJntSphInit sJntSphInit1 = {
{
COLTYPE_METAL,
COL_MATERIAL_METAL,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_PLAYER,
@ -242,7 +242,7 @@ static ColliderJntSphElementInit sJntSphItemsInit2[] = {
static ColliderJntSphInit sJntSphInit2 = {
{
COLTYPE_METAL,
COL_MATERIAL_METAL,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_PLAYER,

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

@ -83,7 +83,7 @@ ActorProfile Boss_Ganondrof_Profile = {
static ColliderCylinderInit sCylinderInitBody = {
{
COLTYPE_HIT3,
COL_MATERIAL_HIT3,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,
@ -103,7 +103,7 @@ static ColliderCylinderInit sCylinderInitBody = {
static ColliderCylinderInit sCylinderInitSpear = {
{
COLTYPE_HIT3,
COL_MATERIAL_HIT3,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,
@ -773,7 +773,7 @@ void BossGanondrof_SetupBlock(BossGanondrof* this, PlayState* play) {
}
void BossGanondrof_Block(BossGanondrof* this, PlayState* play) {
this->colliderBody.base.colType = COLTYPE_METAL;
this->colliderBody.base.colMaterial = COL_MATERIAL_METAL;
SkelAnime_Update(&this->skelAnime);
this->actor.world.pos.x += this->actor.velocity.x;
this->actor.world.pos.z += this->actor.velocity.z;
@ -802,7 +802,7 @@ void BossGanondrof_Charge(BossGanondrof* this, PlayState* play) {
f32 dxCenter = thisx->world.pos.x - GND_BOSSROOM_CENTER_X;
f32 dzCenter = thisx->world.pos.z - GND_BOSSROOM_CENTER_Z;
this->colliderBody.base.colType = COLTYPE_METAL;
this->colliderBody.base.colMaterial = COL_MATERIAL_METAL;
SkelAnime_Update(&this->skelAnime);
switch (this->work[GND_ACTION_STATE]) {
case CHARGE_WINDUP:
@ -1298,7 +1298,7 @@ void BossGanondrof_Update(Actor* thisx, PlayState* play) {
PRINTF("MOVE START %d\n", this->actor.params);
this->actor.flags &= ~ACTOR_FLAG_10;
this->colliderBody.base.colType = COLTYPE_HIT3;
this->colliderBody.base.colMaterial = COL_MATERIAL_HIT3;
if (this->killActor) {
Actor_Kill(&this->actor);
return;

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

@ -209,7 +209,7 @@ static ColliderJntSphElementInit sColliderJntSphElementInit[13] = {
static ColliderJntSphInit sColliderJntSphInit = {
{
COLTYPE_HIT3,
COL_MATERIAL_HIT3,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_PLAYER,

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

@ -215,7 +215,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[19] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_PLAYER,
@ -228,7 +228,7 @@ static ColliderJntSphInit sJntSphInit = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_HIT3,
COL_MATERIAL_HIT3,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_PLAYER,

6
src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
View file

@ -2509,10 +2509,10 @@ void BossSst_HandSetDamage(BossSst* this, s32 damage) {
void BossSst_HandSetInvulnerable(BossSst* this, s32 isInv) {
this->colliderJntSph.base.acFlags &= ~AC_HIT;
if (isInv) {
this->colliderJntSph.base.colType = COLTYPE_HARD;
this->colliderJntSph.base.colMaterial = COL_MATERIAL_HARD;
this->colliderJntSph.base.acFlags |= AC_HARD;
} else {
this->colliderJntSph.base.colType = COLTYPE_HIT0;
this->colliderJntSph.base.colMaterial = COL_MATERIAL_HIT0;
this->colliderJntSph.base.acFlags &= ~AC_HARD;
}
}
@ -2522,7 +2522,7 @@ void BossSst_HeadSfx(BossSst* this, u16 sfxId) {
}
void BossSst_HandCollisionCheck(BossSst* this, PlayState* play) {
if ((this->colliderJntSph.base.acFlags & AC_HIT) && (this->colliderJntSph.base.colType != COLTYPE_HARD)) {
if ((this->colliderJntSph.base.acFlags & AC_HIT) && (this->colliderJntSph.base.colMaterial != COL_MATERIAL_HARD)) {
s32 bothHands = true;
this->colliderJntSph.base.acFlags &= ~AC_HIT;

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

@ -126,7 +126,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHand[11] = {
static ColliderJntSphInit sJntSphInitHand = {
{
COLTYPE_HIT0,
COL_MATERIAL_HIT0,
AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_TYPE_ALL,
@ -263,7 +263,7 @@ static ColliderJntSphElementInit sJntSphItemsInitHead[11] = {
static ColliderJntSphInit sJntSphInitHead = {
{
COLTYPE_HARD,
COL_MATERIAL_HARD,
AT_TYPE_ENEMY,
AC_ON | AC_HARD | AC_TYPE_PLAYER,
OC1_TYPE_ALL,
@ -276,7 +276,7 @@ static ColliderJntSphInit sJntSphInitHead = {
static ColliderCylinderInit sCylinderInitHead = {
{
COLTYPE_HIT0,
COL_MATERIAL_HIT0,
AT_NONE,
AC_NONE | AC_TYPE_PLAYER,
OC1_NONE,
@ -296,7 +296,7 @@ static ColliderCylinderInit sCylinderInitHead = {
static ColliderCylinderInit sCylinderInitHand = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_TYPE_ENEMY,
AC_NONE,
OC1_NONE,

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

@ -133,7 +133,7 @@ static Vec3f sZeroVector = { 0.0f, 0.0f, 0.0f };
static ColliderCylinderInit sCylinderInitBlasts = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ALL,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_PLAYER,
@ -153,7 +153,7 @@ static ColliderCylinderInit sCylinderInitBlasts = {
static ColliderCylinderInit sCylinderInitKoumeKotake = {
{
COLTYPE_HIT3,
COL_MATERIAL_HIT3,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_PLAYER,
@ -173,7 +173,7 @@ static ColliderCylinderInit sCylinderInitKoumeKotake = {
static ColliderCylinderInit sCylinderInitTwinrova = {
{
COLTYPE_HIT3,
COL_MATERIAL_HIT3,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,
@ -1438,7 +1438,7 @@ void BossTw_SetupSpin(BossTw* this, PlayState* play) {
void BossTw_Spin(BossTw* this, PlayState* play) {
if (this->timers[0] != 0) {
this->collider.base.colType = COLTYPE_METAL;
this->collider.base.colMaterial = COL_MATERIAL_METAL;
this->actor.shape.rot.y -= 0x3000;
if ((this->timers[0] % 4) == 0) {
@ -2848,7 +2848,7 @@ void BossTw_Update(Actor* thisx, PlayState* play) {
s16 i;
s32 pad;
this->collider.base.colType = COLTYPE_HIT3;
this->collider.base.colMaterial = COL_MATERIAL_HIT3;
Math_ApproachF(&this->fogR, play->lightCtx.fogColor[0], 1.0f, 10.0f);
Math_ApproachF(&this->fogG, play->lightCtx.fogColor[1], 1.0f, 10.0f);
Math_ApproachF(&this->fogB, play->lightCtx.fogColor[2], 1.0f, 10.0f);
@ -2976,7 +2976,7 @@ void BossTw_TwinrovaUpdate(Actor* thisx, PlayState* play2) {
this->actor.flags &= ~ACTOR_FLAG_10;
this->unk_5F8 = 0;
this->collider.base.colType = COLTYPE_HIT3;
this->collider.base.colMaterial = COL_MATERIAL_HIT3;
Math_ApproachF(&this->fogR, play->lightCtx.fogColor[0], 1.0f, 10.0f);
Math_ApproachF(&this->fogG, play->lightCtx.fogColor[1], 1.0f, 10.0f);
@ -5397,7 +5397,7 @@ void BossTw_TwinrovaSetupSpin(BossTw* this, PlayState* play) {
void BossTw_TwinrovaSpin(BossTw* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (this->timers[0] != 0) {
this->collider.base.colType = COLTYPE_METAL;
this->collider.base.colMaterial = COL_MATERIAL_METAL;
this->actor.shape.rot.y -= 0x3000;
if ((this->timers[0] % 4) == 0) {

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

@ -204,7 +204,7 @@ ActorProfile Boss_Va_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,
@ -238,7 +238,7 @@ static ColliderJntSphElementInit sJntSphElementsInitSupport[1] = {
static ColliderJntSphInit sJntSphInitSupport = {
{
COLTYPE_HIT6,
COL_MATERIAL_HIT6,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,
@ -265,7 +265,7 @@ static ColliderJntSphElementInit sJntSphElementsInitBari[1] = {
static ColliderJntSphInit sJntSphInitBari = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,
@ -278,7 +278,7 @@ static ColliderJntSphInit sJntSphInitBari = {
static ColliderQuadInit sQuadInit = {
{
COLTYPE_METAL,
COL_MATERIAL_METAL,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -17,7 +17,7 @@ void DemoGj_Draw(Actor* thisx, PlayState* play);
static ColliderCylinderInitType1 sCylinderInit1 = {
{
COLTYPE_HIT0,
COL_MATERIAL_HIT0,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,
@ -36,7 +36,7 @@ static ColliderCylinderInitType1 sCylinderInit1 = {
static ColliderCylinderInitType1 sCylinderInit2 = {
{
COLTYPE_HIT0,
COL_MATERIAL_HIT0,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,
@ -55,7 +55,7 @@ static ColliderCylinderInitType1 sCylinderInit2 = {
static ColliderCylinderInitType1 sCylinderInit3 = {
{
COLTYPE_HIT0,
COL_MATERIAL_HIT0,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -64,7 +64,7 @@ static u32 D_8098783C = 0;
static ColliderCylinderInitType1 sCylinderInit = {
{
COLTYPE_HIT0,
COL_MATERIAL_HIT0,
AT_NONE,
AC_NONE,
OC1_ON | OC1_TYPE_PLAYER,

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

@ -35,7 +35,7 @@ ActorProfile Demo_Kekkai_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,

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

@ -32,7 +32,7 @@ ActorProfile Door_Ana_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -43,7 +43,7 @@ ActorProfile Door_Killer_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_METAL,
COL_MATERIAL_METAL,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,
@ -77,7 +77,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[1] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -53,7 +53,7 @@ ActorProfile En_Am_Profile = {
static ColliderCylinderInit sHurtCylinderInit = {
{
COLTYPE_HIT5,
COL_MATERIAL_HIT5,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,
@ -73,7 +73,7 @@ static ColliderCylinderInit sHurtCylinderInit = {
static ColliderCylinderInit sBlockCylinderInit = {
{
COLTYPE_METAL,
COL_MATERIAL_METAL,
AT_NONE,
AC_ON | AC_HARD | AC_TYPE_PLAYER,
OC1_NONE,
@ -93,7 +93,7 @@ static ColliderCylinderInit sBlockCylinderInit = {
static ColliderQuadInit sQuadInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_NONE,
OC1_NONE,

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

@ -40,7 +40,7 @@ ActorProfile En_Ani_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_ENEMY,
OC1_ON | OC1_TYPE_ALL,

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

@ -39,7 +39,7 @@ ActorProfile En_Anubice_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,

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

@ -33,7 +33,7 @@ ActorProfile En_Anubice_Fire_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -33,7 +33,7 @@ ActorProfile En_Arrow_Profile = {
static ColliderQuadInit sColliderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_PLAYER,
AC_NONE,
OC1_NONE,

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

@ -64,7 +64,7 @@ static ColliderJntSphElementInit sJntSphElementInit[2] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_HIT0,
COL_MATERIAL_HIT0,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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

@ -223,7 +223,7 @@ static ColliderJntSphElementInit sJntSphElementInit[1] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_HIT3,
COL_MATERIAL_HIT3,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_PLAYER,

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

@ -58,7 +58,7 @@ static ColliderJntSphElementInit sJntSphElementInit[1] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_HIT0,
COL_MATERIAL_HIT0,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,
@ -71,7 +71,7 @@ static ColliderJntSphInit sJntSphInit = {
static ColliderCylinderInit sCylinderInit[] = {
{ {
COLTYPE_HARD,
COL_MATERIAL_HARD,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_HARD | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,
@ -88,7 +88,7 @@ static ColliderCylinderInit sCylinderInit[] = {
},
{ 50, 100, 0, { 30, 0, 12 } } },
{ {
COLTYPE_HARD,
COL_MATERIAL_HARD,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_HARD | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,

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

@ -42,7 +42,7 @@ ActorProfile En_Bili_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_HIT8,
COL_MATERIAL_HIT8,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,

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

@ -32,7 +32,7 @@ ActorProfile En_Bom_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_HIT0,
COL_MATERIAL_HIT0,
AT_NONE,
AC_ON | AC_TYPE_PLAYER | AC_TYPE_OTHER,
OC1_ON | OC1_TYPE_ALL,
@ -66,7 +66,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_HIT0,
COL_MATERIAL_HIT0,
AT_ON | AT_TYPE_ALL,
AC_NONE,
OC1_NONE,

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

@ -43,7 +43,7 @@ static ColliderJntSphElementInit sJntSphElemInit[] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_1 | OC1_TYPE_2,

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

@ -35,7 +35,7 @@ ActorProfile En_Bombf_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER | AC_TYPE_OTHER,
OC1_ON | OC1_TYPE_ALL,
@ -69,7 +69,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ALL,
AC_NONE,
OC1_NONE,

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

@ -30,7 +30,7 @@ ActorProfile En_Boom_Profile = {
static ColliderQuadInit sQuadInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_PLAYER,
AC_NONE,
OC1_NONE,

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

@ -36,7 +36,7 @@ ActorProfile En_Brob_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_HIT0,
COL_MATERIAL_HIT0,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,

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

@ -51,7 +51,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[2] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_HIT6,
COL_MATERIAL_HIT6,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,

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

@ -38,7 +38,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = {
};
static ColliderJntSphInit sColliderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_NONE,
OC1_ON | OC1_TYPE_PLAYER | OC1_TYPE_1,

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

@ -47,7 +47,7 @@ ActorProfile En_Bw_Profile = {
static ColliderCylinderInit sCylinderInit1 = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_NONE,
OC1_NONE,
@ -67,7 +67,7 @@ static ColliderCylinderInit sCylinderInit1 = {
static ColliderCylinderInit sCylinderInit2 = {
{
COLTYPE_HIT0,
COL_MATERIAL_HIT0,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_PLAYER,

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

@ -28,7 +28,7 @@ ActorProfile En_Bx_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_HIT6,
COL_MATERIAL_HIT6,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,
@ -48,7 +48,7 @@ static ColliderCylinderInit sCylinderInit = {
static ColliderQuadInit sQuadInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_NONE,
OC1_NONE,

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

@ -36,7 +36,7 @@ static Vec3f sZeroVector = { 0.0f, 0.0f, 0.0f };
static ColliderCylinderInit sArwingCylinderInit = {
{
COLTYPE_HIT3,
COL_MATERIAL_HIT3,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,
@ -56,7 +56,7 @@ static ColliderCylinderInit sArwingCylinderInit = {
static ColliderCylinderInit sLaserCylinderInit = {
{
COLTYPE_METAL,
COL_MATERIAL_METAL,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,

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

@ -40,7 +40,7 @@ ActorProfile En_Cow_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_ENEMY,
OC1_ON | OC1_TYPE_ALL,

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

@ -46,7 +46,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_HIT3,
COL_MATERIAL_HIT3,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,

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

@ -29,7 +29,7 @@ ActorProfile En_Cs_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_NONE,
OC1_ON | OC1_TYPE_ALL,

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

@ -55,7 +55,7 @@ ActorProfile En_Daiku_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_NONE,
OC1_ON | OC1_TYPE_ALL,

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

@ -38,7 +38,7 @@ ActorProfile En_Daiku_Kakariko_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_NONE,
OC1_ON | OC1_TYPE_ALL,

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

@ -123,7 +123,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[7] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_HIT6,
COL_MATERIAL_HIT6,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,
@ -299,7 +299,7 @@ void EnDekubaba_SetupWait(EnDekubaba* this) {
Actor_SetScale(&this->actor, this->size * 0.01f * 0.5f);
this->collider.base.colType = COLTYPE_HARD;
this->collider.base.colMaterial = COL_MATERIAL_HARD;
this->collider.base.acFlags |= AC_HARD;
this->timer = 45;
@ -326,7 +326,7 @@ void EnDekubaba_SetupGrow(EnDekubaba* this) {
this->collider.elements[i].base.ocElemFlags |= OCELEM_ON;
}
this->collider.base.colType = COLTYPE_HIT6;
this->collider.base.colMaterial = COL_MATERIAL_HIT6;
this->collider.base.acFlags &= ~AC_HARD;
Actor_PlaySfx(&this->actor, NA_SE_EN_DUMMY482);
this->actionFunc = EnDekubaba_Grow;
@ -1034,7 +1034,7 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) {
this->collider.base.acFlags &= ~AC_HIT;
Actor_SetDropFlagJntSph(&this->actor, &this->collider, true);
if ((this->collider.base.colType != COLTYPE_HARD) &&
if ((this->collider.base.colMaterial != COL_MATERIAL_HARD) &&
((this->actor.colChkInfo.damageEffect != DEKUBABA_DMGEFF_NONE) || (this->actor.colChkInfo.damage != 0))) {
phi_s0 = this->actor.colChkInfo.health - this->actor.colChkInfo.damage;
@ -1082,7 +1082,7 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) {
} else {
return;
}
} else if ((play->actorCtx.unk_02 != 0) && (this->collider.base.colType != COLTYPE_HARD) &&
} else if ((play->actorCtx.unk_02 != 0) && (this->collider.base.colMaterial != COL_MATERIAL_HARD) &&
(this->actionFunc != EnDekubaba_StunnedVertical) && (this->actionFunc != EnDekubaba_Hit) &&
(this->actor.colChkInfo.health != 0)) {
this->actor.colChkInfo.health--;

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

@ -44,7 +44,7 @@ ActorProfile En_Dekunuts_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_HIT6,
COL_MATERIAL_HIT6,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,

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

@ -45,7 +45,7 @@ ActorProfile En_Dh_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_HIT0,
COL_MATERIAL_HIT0,
AT_NONE,
AC_ON | AC_HARD | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_PLAYER,
@ -79,7 +79,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_HIT6,
COL_MATERIAL_HIT6,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_PLAYER,

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

@ -130,7 +130,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = {
static ColliderJntSphInit sJntSphInit = {
{
COLTYPE_HIT6,
COL_MATERIAL_HIT6,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_PLAYER | OC1_TYPE_1,

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

@ -50,7 +50,7 @@ static u8 D_809EF0B0 = false;
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_NONE,
OC1_ON | OC1_TYPE_ALL,

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

@ -56,7 +56,7 @@ ActorProfile En_Dns_Profile = {
static ColliderCylinderInitType1 sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,

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

@ -53,7 +53,7 @@ ActorProfile En_Dnt_Jiji_Profile = {
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_NONE,
OC1_ON | OC1_TYPE_ALL,

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

@ -70,7 +70,7 @@ ActorProfile En_Dnt_Nomal_Profile = {
static ColliderCylinderInit sBodyCylinderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_NONE,
OC1_ON | OC1_TYPE_ALL,
@ -90,7 +90,7 @@ static ColliderCylinderInit sBodyCylinderInit = {
static ColliderQuadInit sTargetQuadInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,

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