diff --git a/include/variables.h b/include/variables.h index 2f96222d58e..9eb71e7a5d9 100644 --- a/include/variables.h +++ b/include/variables.h @@ -206,6 +206,7 @@ extern volatile OSTime gRSPGfxTimeAcc; extern volatile OSTime gRSPOtherTimeAcc; extern volatile OSTime D_8016A578; extern volatile OSTime gRDPTimeAcc; +extern struct SpeedMeterTimeEntry* sSpeedMeterTimeEntryPtr; // declared here solely for the purpose of BSS ordering extern SfxBankEntry D_8016BAD0[9]; extern SfxBankEntry D_8016BC80[12]; diff --git a/include/z64collision_check.h b/include/z64collision_check.h index 99ad7aa76b9..4b335dca3b3 100644 --- a/include/z64collision_check.h +++ b/include/z64collision_check.h @@ -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; @@ -82,44 +82,38 @@ typedef struct ColliderInitToActor { typedef struct ColliderElementDamageInfoAT { /* 0x00 */ u32 dmgFlags; // Damage types dealt by this collider element as AT. - /* 0x04 */ u8 effect; // Damage Effect (Knockback, Fire, etc.) + /* 0x04 */ u8 playerACHitReaction; // Player reaction to a Player AC collider hitting this AT collider /* 0x05 */ u8 damage; // Damage } ColliderElementDamageInfoAT; // size = 0x08 typedef struct ColliderElementDamageInfoAC { /* 0x00 */ u32 dmgFlags; // Damage types that may affect this collider element as AC. - /* 0x04 */ u8 effect; // Damage Effect (Knockback, Fire, etc.) + /* 0x04 */ u8 playerATHitReaction; // Player reaction to a Player AT collider hitting this AC collider /* 0x05 */ u8 defense; // Damage Resistance /* 0x06 */ Vec3s hitPos; // Point of contact } ColliderElementDamageInfoAC; // size = 0x0C typedef struct ColliderElementDamageInfoACInit { /* 0x00 */ u32 dmgFlags; // Damage types that may affect this collider element as AC. - /* 0x04 */ u8 effect; // Damage Effect (Knockback, Fire, etc.) + /* 0x04 */ u8 playerATHitReaction; // Player reaction to a Player AT collider hitting this AC collider /* 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 @@ -461,6 +455,20 @@ typedef struct CollisionCheckInfoInit2 { /* 0x08 */ u8 mass; } CollisionCheckInfoInit2; +enum PlayerATHitReaction { + PLAYER_AT_HIT_REACTION_0, + PLAYER_AT_HIT_REACTION_1 +}; + +enum PlayerACHitReaction { + PLAYER_AC_HIT_REACTION_0, + PLAYER_AC_HIT_REACTION_1, + PLAYER_AC_HIT_REACTION_2, + PLAYER_AC_HIT_REACTION_3, + PLAYER_AC_HIT_REACTION_4, + PLAYER_AC_HIT_REACTION_7 = 7 +}; + typedef struct CollisionCheckInfo { /* 0x00 */ DamageTable* damageTable; /* 0x04 */ Vec3f displacement; // Amount to correct actor velocity by when colliding into a body @@ -470,9 +478,9 @@ typedef struct CollisionCheckInfo { /* 0x16 */ u8 mass; // Used to compute displacement for OC collisions /* 0x17 */ u8 health; // Note: some actors may use their own health variable instead of this one /* 0x18 */ u8 damage; // Amount to decrement health by - /* 0x19 */ u8 damageEffect; // Stores what effect should occur when hit by a weapon - /* 0x1A */ u8 atHitEffect; // Stores what effect should occur when AT connects with an AC - /* 0x1B */ u8 acHitEffect; // Stores what effect should occur when AC is touched by an AT + /* 0x19 */ u8 damageEffect; // If a damageTable is set, the effect corresponding to the damage type, as specified in the damage table + /* 0x1A */ u8 playerATHitReaction; // (for Player) Reaction from an AT collider hit + /* 0x1B */ u8 playerACHitReaction; // (for Player) Reaction from an AC collider hit } CollisionCheckInfo; // size = 0x1C DamageTable* DamageTable_Get(s32 index); diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c index 32d99f368bb..30ffc53099b 100644 --- a/src/code/fault_gc.c +++ b/src/code/fault_gc.c @@ -42,7 +42,7 @@ */ #if PLATFORM_GC -#pragma increment_block_number "gc-eu:208 gc-eu-mq:208 gc-eu-mq-dbg:208 gc-jp:208 gc-jp-ce:208 gc-jp-mq:208 gc-us:208" \ +#pragma increment_block_number "gc-eu:208 gc-eu-mq:208 gc-eu-mq-dbg:192 gc-jp:208 gc-jp-ce:208 gc-jp-mq:208 gc-us:208" \ "gc-us-mq:208" #include "global.h" diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 2c0b19d3ef7..5897d234fc0 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -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; @@ -160,7 +160,7 @@ s32 Collider_DestroyElementDamageInfoAT(PlayState* play, ColliderElementDamageIn s32 Collider_SetElementDamageInfoAT(PlayState* play, ColliderElementDamageInfoAT* dest, ColliderElementDamageInfoAT* src) { dest->dmgFlags = src->dmgFlags; - dest->effect = src->effect; + dest->playerACHitReaction = src->playerACHitReaction; dest->damage = src->damage; return true; } @@ -182,18 +182,23 @@ s32 Collider_DestroyElementDamageInfoAC(PlayState* play, ColliderElementDamageIn s32 Collider_SetElementDamageInfoAC(PlayState* play, ColliderElementDamageInfoAC* acDmgInfo, ColliderElementDamageInfoACInit* init) { acDmgInfo->dmgFlags = init->dmgFlags; - acDmgInfo->effect = init->effect; + acDmgInfo->playerATHitReaction = init->playerATHitReaction; acDmgInfo->defense = init->defense; return true; } 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; @@ -339,7 +344,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 +529,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 +1551,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 +1560,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); @@ -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); } @@ -1640,24 +1645,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 +1673,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 +1686,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); } @@ -1722,7 +1727,7 @@ s32 CollisionCheck_SetATvsAC(PlayState* play, Collider* atCol, ColliderElement* atElem->atHitElem = acElem; atElem->atElemFlags |= ATELEM_HIT; if (atCol->actor != NULL) { - atCol->actor->colChkInfo.atHitEffect = acElem->acDmgInfo.effect; + atCol->actor->colChkInfo.playerATHitReaction = acElem->acDmgInfo.playerATHitReaction; } } acCol->acFlags |= AC_HIT; @@ -1731,13 +1736,13 @@ s32 CollisionCheck_SetATvsAC(PlayState* play, Collider* atCol, ColliderElement* acElem->acHitElem = atElem; acElem->acElemFlags |= ACELEM_HIT; if (acCol->actor != NULL) { - acCol->actor->colChkInfo.acHitEffect = atElem->atDmgInfo.effect; + acCol->actor->colChkInfo.playerACHitReaction = atElem->atDmgInfo.playerACHitReaction; } 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); @@ -3002,8 +3007,8 @@ void CollisionCheck_InitInfo(CollisionCheckInfo* info) { void CollisionCheck_ResetDamage(CollisionCheckInfo* info) { info->damage = 0; info->damageEffect = 0; - info->atHitEffect = 0; - info->acHitEffect = 0; + info->playerATHitReaction = PLAYER_AT_HIT_REACTION_0; + info->playerACHitReaction = PLAYER_AC_HIT_REACTION_0; info->displacement.x = info->displacement.y = info->displacement.z = 0.0f; } diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c index 30a1398dfff..4dd96de4b6f 100644 --- a/src/code/z_common_data.c +++ b/src/code/z_common_data.c @@ -2,7 +2,7 @@ #include "region.h" #include "versions.h" -#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" +#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" ALIGNED(16) SaveContext gSaveContext; u32 D_8015FA88; diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index f99d4714cb3..b5cf49a8ca5 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -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, @@ -42,7 +42,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 94cd617756d..74b05cf067b 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -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, @@ -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, diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index ea5bf967224..0f877ef7074 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -7,7 +7,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" -#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" +#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0" typedef enum LightningBoltState { /* 0x00 */ LIGHTNING_BOLT_START, @@ -212,7 +212,7 @@ s16 sLightningFlashAlpha; s16 sSunDepthTestX; s16 sSunDepthTestY; -#pragma increment_block_number "gc-eu:112 gc-eu-mq:112 gc-jp:96 gc-jp-ce:96 gc-jp-mq:96 gc-us:96 gc-us-mq:96" +#pragma increment_block_number "gc-eu:112 gc-eu-mq:112 gc-jp:216 gc-jp-ce:216 gc-jp-mq:216 gc-us:216 gc-us-mq:216" LightNode* sNGameOverLightNode; LightInfo sNGameOverLightInfo; diff --git a/src/code/z_play.c b/src/code/z_play.c index 99bb0246813..ff5ba9c8c39 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -1,3 +1,4 @@ +#pragma increment_block_number "gc-eu:16 gc-eu-mq:16 gc-jp:16 gc-jp-ce:16 gc-jp-mq:16 gc-us:16 gc-us-mq:16" #include "global.h" #include "fault.h" @@ -10,8 +11,6 @@ #include "z64frame_advance.h" -#pragma increment_block_number "gc-eu:8 gc-eu-mq:8 gc-jp:8 gc-jp-ce:8 gc-jp-mq:8 gc-us:8 gc-us-mq:8" - TransitionTile gTransitionTile; s32 gTransitionTileState; VisMono gPlayVisMono; diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index b5a9a72c1a8..9d2fa1e3858 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -3,7 +3,7 @@ #include "assets/objects/object_link_boy/object_link_boy.h" #include "assets/objects/object_link_child/object_link_child.h" -#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" +#pragma increment_block_number "gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" typedef struct BowSlingshotStringData { /* 0x00 */ Gfx* dList; @@ -1313,16 +1313,16 @@ 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, + 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 = shieldColTypes[this->currentShield]; Matrix_MultVec3f(&quadSrc[0], &quadDest[0]); Matrix_MultVec3f(&quadSrc[1], &quadDest[1]); diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index 01564568741..1872e211c97 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -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, @@ -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))) { diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index 8ff123e07e9..055f93e200a 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index cd4eb5ef8d0..e3703419328 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c index db99f735dca..82daa4e13e9 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index fc012fa459d..4999abd9665 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -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, @@ -48,7 +48,7 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000048, 0x00, 0x00 }, { 0x00000048, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index 1909b801e6c..3fe150cc6ff 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c @@ -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, @@ -40,7 +40,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index b97a063646b..b8e3cfa33b3 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -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, @@ -42,7 +42,7 @@ static ColliderCylinderInit sColCylinderInitMain = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_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, @@ -62,7 +62,7 @@ static ColliderCylinderInit sColCylinderInitLeftRight = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c index 6f531fd6f12..17a3ea45082 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c @@ -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, @@ -41,7 +41,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x00 }, { 0x00020800, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c index a86d14723bb..ec78726b04b 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c @@ -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, @@ -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, @@ -108,7 +108,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index e914e070bf7..2210299c769 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -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, @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index c4e543af40a..5e8e61ba275 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -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, @@ -40,7 +40,7 @@ static ColliderCylinderInit sPotColliderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, ATELEM_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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c index 33629f1427a..9b7ed31904e 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c @@ -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, @@ -42,7 +42,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index 7201e8e6e03..dfd72893153 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c index 028f2e4a23f..83e984ee7b9 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c index 493072c3699..8b120e6dab2 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c index db86da31730..cc18c4edef4 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c index 053e5382a6d..19458d56b1b 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c index b59e5a3fd9d..3ef030dedd9 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index 5f4d7457a5b..05e513a461b 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -43,7 +43,7 @@ static Gfx* sBreakableWallDLists[] = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, ATELEM_NONE, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c index 0f40dd34701..02d864f83f9 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c index e08e64df985..eb69f0d0b91 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c index 91a32c7de39..d512fd4820e 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c index eb38ad23267..06f5b2a308c 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index fa5554f8d12..652b83ad0f7 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -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, @@ -50,7 +50,7 @@ static ColliderCylinderInit sCylinderInit1 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -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, @@ -70,7 +70,7 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x4FC1FFF6, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c index 59eeb3190a5..a9a560bc093 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index 0f81ee93735..1110d2dbb8a 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -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, @@ -47,7 +47,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index 59ecf2b27d1..061ef48fd13 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index bacf471b9b3..a9d953fb72b 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -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, @@ -44,7 +44,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c index 5a4898763e9..0eacd23e704 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c index 670bbef0079..0f100259bdd 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c index ccfb377a4ab..86e857d1939 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c @@ -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, @@ -48,7 +48,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index e54bc920404..eed30742806 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -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, @@ -48,7 +48,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c index 12117cbf7e0..4e2dea2a9c3 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c @@ -31,7 +31,7 @@ static s32 sNumEyesShot; static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x0001F820, 0x00, 0x00 }, ATELEM_NONE, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index 3af6a730d4d..6c16b95e613 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -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, @@ -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, @@ -72,7 +72,7 @@ static ColliderTrisInit sTrisInitFloor = { static ColliderTrisElementInit sTrisElementInitRutoWall[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, ATELEM_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, @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index adab13681e6..3b54cc8e35b 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index 04fb0eb7823..017f18606db 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c index d02a9ddeb38..9dae9b2a5dc 100644 --- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c +++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c @@ -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, @@ -34,7 +34,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index 916a977c274..aa5b56024b6 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index 4427ebd827d..39126bcde91 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -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, @@ -69,7 +69,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index 465740952ff..43dd1e73b9a 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -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, @@ -38,7 +38,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index a9429e4c629..5f5c06d0ed5 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -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, @@ -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, @@ -70,7 +70,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index 1289560e2d0..d41f0d86b9f 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index a13d872ab82..e25280ed0bd 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -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, @@ -44,7 +44,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c index fd0f8ac0b1e..dad395c928a 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c index de0ccd7a918..6e5a1010fb9 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c index 189b0b94fc1..d4ac8f7f03b 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c index 2e437fdf83f..83aa550fdea 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index 4e043faa3a8..ff8a55f1a9e 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -822,11 +822,11 @@ 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.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.base.colType = COLTYPE_HIT3; + this->collider.elements[0].base.elemMaterial = ELEM_MATERIAL_UNK3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; } if (this->collider.elements[0].base.acElemFlags & ACELEM_HIT) { diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c index 4ec5065401d..1098d44c3f9 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index 6ee60c21599..1482292694a 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -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, @@ -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, @@ -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, @@ -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, @@ -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; diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.inc.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.inc.c index bcb07e383d1..a67c0e560af 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.inc.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.inc.c @@ -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, @@ -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, @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index 5f34b94ddca..7a8f1a7bf6a 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -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, @@ -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, @@ -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, @@ -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, @@ -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; diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index 6c6bb04d345..9b52c8a52f7 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c index 0ae73dadb6c..58d807607cd 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c @@ -4,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, @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index 26cac6647b0..db08bc13f29 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -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; diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c index f73bfac8ecc..cc06356aa8c 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c @@ -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, @@ -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, @@ -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, @@ -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, @@ -284,7 +284,7 @@ static ColliderCylinderInit sCylinderInitHead = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -296,7 +296,7 @@ static ColliderCylinderInit sCylinderInitHead = { static ColliderCylinderInit sCylinderInitHand = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_TYPE_ENEMY, AC_NONE, OC1_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, diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 8c372064be2..cfa80a6dcbb 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -464,7 +464,7 @@ void BossTw_Init(Actor* thisx, PlayState* play2) { if (this->actor.params == TW_FIRE_BLAST || this->actor.params == TW_FIRE_BLAST_GROUND) { this->actionFunc = BossTw_BlastFire; - this->collider.elem.atDmgInfo.effect = 1; + this->collider.elem.atDmgInfo.playerACHitReaction = PLAYER_AC_HIT_REACTION_1; } else if (this->actor.params == TW_ICE_BLAST || this->actor.params == TW_ICE_BLAST_GROUND) { this->actionFunc = BossTw_BlastIce; } else if (this->actor.params >= TW_DEATHBALL_KOTAKE) { @@ -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) { diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index ccd5466034b..2ab39454f04 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index fa28e7cc80e..4072758cc91 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -17,14 +17,14 @@ void DemoGj_Draw(Actor* thisx, PlayState* play); static ColliderCylinderInitType1 sCylinderInit1 = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, ATELEM_NONE, @@ -36,14 +36,14 @@ static ColliderCylinderInitType1 sCylinderInit1 = { static ColliderCylinderInitType1 sCylinderInit2 = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, ATELEM_NONE, @@ -55,14 +55,14 @@ static ColliderCylinderInitType1 sCylinderInit2 = { static ColliderCylinderInitType1 sCylinderInit3 = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index 4eafb3aec8e..b126337e95f 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -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, diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index 92c22e925f5..1fe96ebb63b 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index 8208e7c6e15..7ad60136617 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -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, @@ -40,7 +40,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0x00000048, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c index 711b8611830..a8ca1c5cd3a 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -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, @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index 48625a2e4d4..69a27936d93 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -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, @@ -61,7 +61,7 @@ static ColliderCylinderInit sHurtCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -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, @@ -81,7 +81,7 @@ static ColliderCylinderInit sBlockCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00400106, 0x00, 0x00 }, ATELEM_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, @@ -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, diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index 65f421de0bf..2ccec626d05 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -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, @@ -48,7 +48,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c index 13a326f939d..f6742f9810a 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -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, @@ -47,7 +47,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c index 82b124a8334..1b2a1e01853 100644 --- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c +++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index 4fc29db648a..fcf51b77e0f 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -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, @@ -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) && diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/src/overlays/actors/ovl_En_Ba/z_en_ba.c index 6becbc72f9a..af2e435b20b 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 6bf75bba555..3348d03250a 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -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, @@ -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, @@ -351,7 +351,7 @@ void EnBb_Init(Actor* thisx, PlayState* play) { thisx->naviEnemyId = NAVI_ENEMY_RED_BUBBLE; thisx->colChkInfo.damageTable = &sDamageTableRed; this->flameEnvColor.r = 255; - this->collider.elements[0].base.atDmgInfo.effect = 1; + this->collider.elements[0].base.atDmgInfo.playerACHitReaction = PLAYER_AC_HIT_REACTION_1; EnBb_SetupRed(play, this); break; case ENBB_WHITE: diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index fef21743616..65a839aae6c 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/src/overlays/actors/ovl_En_Bili/z_en_bili.c index d3c0271f0d1..3c75eff91e6 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -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, @@ -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, @@ -141,7 +141,7 @@ void EnBili_Destroy(Actor* thisx, PlayState* play) { void EnBili_SetupFloatIdle(EnBili* this) { this->actor.speed = 0.7f; - this->collider.elem.acDmgInfo.effect = 1; // Shock? + this->collider.elem.acDmgInfo.playerATHitReaction = PLAYER_AT_HIT_REACTION_1; // Shock? this->timer = 32; this->actor.home.pos.y = this->actor.world.pos.y; this->actor.gravity = 0.0f; @@ -237,7 +237,7 @@ void EnBili_SetupDie(EnBili* this) { */ void EnBili_SetupStunned(EnBili* this) { this->timer = 80; - this->collider.elem.acDmgInfo.effect = 0; + this->collider.elem.acDmgInfo.playerATHitReaction = PLAYER_AT_HIT_REACTION_0; this->actor.gravity = -1.0f; this->actor.speed = 0.0f; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 150, COLORFILTER_BUFFLAG_XLU, 80); diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 9cdfaf7e0fa..611e5062f37 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -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, @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index 30eda27b5de..f5deec72852 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index c148ea4e0d0..aa0030bb8ee 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -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, @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index fc9a9c110cf..af6f0e77d23 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.c b/src/overlays/actors/ovl_En_Brob/z_en_brob.c index 1238cceb84c..0e16b6dcfd2 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.c +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index b883a523785..2d97696d657 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -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, @@ -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, @@ -98,7 +98,7 @@ u32 func_809CBCBC(EnBubble* this) { ColliderElement* elem = &this->colliderSphere.elements[0].base; elem->atDmgInfo.dmgFlags = DMG_EXPLOSIVE; - elem->atDmgInfo.effect = 0; + elem->atDmgInfo.playerACHitReaction = PLAYER_AC_HIT_REACTION_0; elem->atDmgInfo.damage = 4; elem->atElemFlags = ATELEM_ON; this->actor.velocity.y = 0.0f; diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index 98c31006029..4a93d3f8dd9 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index c6d0d17183b..ea40f4d340c 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -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, @@ -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, @@ -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, @@ -75,7 +75,7 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -766,7 +766,7 @@ void EnBw_Update(Actor* thisx, PlayState* play2) { func_8002836C(play, &thisx->world.pos, &velocity, &accel, &sp50, &sp4C, 0x3C, 0, 0x14); } if (this->unk_248 <= 0.4f) { - this->collider1.elem.atDmgInfo.effect = 0; + this->collider1.elem.atDmgInfo.playerACHitReaction = PLAYER_AC_HIT_REACTION_0; if (((play->gameplayFrames & 1) == 0) && (this->unk_220 < 5) && (this->unk_23C == 0)) { accel.y = -0.1f; velocity.x = Rand_CenteredFloat(4.0f); @@ -786,7 +786,7 @@ void EnBw_Update(Actor* thisx, PlayState* play2) { 20.0f - (this->unk_248 * 40.0f)); } } else { - this->collider1.elem.atDmgInfo.effect = 1; + this->collider1.elem.atDmgInfo.playerACHitReaction = PLAYER_AC_HIT_REACTION_1; } this->unk_234 = Actor_TestFloorInDirection(thisx, play, 50.0f, thisx->world.rot.y); diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index cc3f881b7d9..64d44b27f50 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -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, @@ -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, @@ -48,7 +48,7 @@ static ColliderCylinderInit sCylinderInit = { static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -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, diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c index 1350ebc8d0c..921f4d016d0 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -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, @@ -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, @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index 6b6c80339b3..dc0b1b727a0 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -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, @@ -48,7 +48,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index 6c78f8f5055..54c261ccd90 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c index 85ae528bb42..c1fb998abb0 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c @@ -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, @@ -37,7 +37,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index 48215978c47..6ed7d21d5d9 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -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, @@ -63,9 +63,9 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + ELEM_MATERIAL_UNK0, + { 0x00000000, PLAYER_AC_HIT_REACTION_0, 0x00 }, + { 0x00000000, PLAYER_AT_HIT_REACTION_0, 0x00 }, ATELEM_NONE, ACELEM_NONE, OCELEM_ON, diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index 9116940a630..be0bb46fa3f 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -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, @@ -46,7 +46,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index 04dd2e24bfc..1e89ac5ff87 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -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, @@ -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--; diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index ff005e5895f..3577d1394b2 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -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, @@ -52,7 +52,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index fd224646d20..f1cbd0cb5bd 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -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, @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index e193d17db84..15bb64753c0 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index 9a40d4a927c..8f74b445837 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -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, @@ -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, diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index e7a082260ea..b9eddea6222 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -56,14 +56,14 @@ ActorProfile En_Dns_Profile = { static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index 057bc5bdd7e..d2c99660bb5 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -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, @@ -61,7 +61,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index 94a6531c524..c71075f3090 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -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, @@ -78,7 +78,7 @@ static ColliderCylinderInit sBodyCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, @@ -90,7 +90,7 @@ static ColliderCylinderInit sBodyCylinderInit = { static ColliderQuadInit sTargetQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -98,7 +98,7 @@ static ColliderQuadInit sTargetQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x0001F824, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c index 468d9cf7e4c..7b5d7a7586a 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -45,7 +45,7 @@ ActorProfile En_Dodojr_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -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, diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index ef09744a7c7..0a4242d0207 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -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, @@ -119,7 +119,7 @@ static ColliderJntSphElementInit sBodyElementsInit[6] = { static ColliderJntSphInit sBodyJntSphInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -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, @@ -168,7 +168,7 @@ static ColliderTrisElementInit sHardElementsInit[3] = { static ColliderTrisInit sHardTrisInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, @@ -181,7 +181,7 @@ static ColliderTrisInit sHardTrisInit = { static ColliderQuadInit sAttackQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_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, diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index 320bfbc98b6..49b8c83ba33 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -35,7 +35,7 @@ ActorProfile En_Dog_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -43,7 +43,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c index d6ca5252df4..735f991231e 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.c +++ b/src/overlays/actors/ovl_En_Du/z_en_du.c @@ -36,7 +36,7 @@ ActorProfile En_Du_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -44,7 +44,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index d9b561492ea..63e509986bc 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -49,7 +49,7 @@ ActorProfile En_Eiyer_Profile = { static ColliderCylinderInit sColCylInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -57,7 +57,7 @@ static ColliderCylinderInit sColCylInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x04, 0x08 }, { 0x00000019, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c index c8796a5cda9..4ff76c923e4 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -42,7 +42,7 @@ ActorProfile En_Fd_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[12] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040088, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -53,7 +53,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -64,7 +64,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -75,7 +75,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -86,7 +86,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -97,7 +97,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -108,7 +108,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -119,7 +119,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -130,7 +130,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -141,7 +141,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -152,7 +152,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -163,7 +163,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -176,7 +176,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c index 8fc3fc29fc2..472ff44b25e 100644 --- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c +++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c @@ -26,7 +26,7 @@ ActorProfile En_Fd_Fire_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -34,7 +34,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x08 }, { 0x0D840008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index b606f653023..ced412103cd 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -58,7 +58,7 @@ ActorProfile En_Fhg_Fire_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -66,7 +66,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK6, + ELEM_MATERIAL_UNK6, { 0x00100700, 0x03, 0x20 }, { 0x0D900700, 0x00, 0x00 }, ATELEM_ON, diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index aa629e33a29..e07030cab7f 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -29,7 +29,7 @@ ActorProfile En_Fire_Rock_Profile = { static ColliderCylinderInit D_80A12CA0 = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -37,7 +37,7 @@ static ColliderCylinderInit D_80A12CA0 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x09, 0x08 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -49,7 +49,7 @@ static ColliderCylinderInit D_80A12CA0 = { static ColliderCylinderInit D_80A12CCC = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -57,7 +57,7 @@ static ColliderCylinderInit D_80A12CCC = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x08 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index 0e2c3341794..d642e8e0ac3 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -49,7 +49,7 @@ ActorProfile En_Firefly_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x08 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, @@ -62,7 +62,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, @@ -118,7 +118,7 @@ static InitChainEntry sInitChain[] = { void EnFirefly_Extinguish(EnFirefly* this) { this->actor.params += 2; - this->collider.elements[0].base.atDmgInfo.effect = 0; // None + this->collider.elements[0].base.atDmgInfo.playerACHitReaction = PLAYER_AC_HIT_REACTION_0; // None this->auraType = KEESE_AURA_NONE; this->onFire = false; this->actor.naviEnemyId = NAVI_ENEMY_KEESE; @@ -130,7 +130,7 @@ void EnFirefly_Ignite(EnFirefly* this) { } else { this->actor.params -= 2; } - this->collider.elements[0].base.atDmgInfo.effect = 1; // Fire + this->collider.elements[0].base.atDmgInfo.playerACHitReaction = PLAYER_AC_HIT_REACTION_1; // Fire this->auraType = KEESE_AURA_FIRE; this->onFire = true; this->actor.naviEnemyId = NAVI_ENEMY_FIRE_KEESE; @@ -174,10 +174,10 @@ void EnFirefly_Init(Actor* thisx, PlayState* play) { } if (this->actor.params == KEESE_ICE_FLY) { - this->collider.elements[0].base.atDmgInfo.effect = 2; // Ice + this->collider.elements[0].base.atDmgInfo.playerACHitReaction = PLAYER_AC_HIT_REACTION_2; // Ice this->actor.naviEnemyId = NAVI_ENEMY_ICE_KEESE; } else { - this->collider.elements[0].base.atDmgInfo.effect = 0; // Nothing + this->collider.elements[0].base.atDmgInfo.playerACHitReaction = PLAYER_AC_HIT_REACTION_0; // Nothing this->actor.naviEnemyId = NAVI_ENEMY_KEESE; } diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index 757eddd05c9..e86d8de3b62 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -40,7 +40,7 @@ static f32 D_80A17018 = 0.0f; static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -53,7 +53,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index b7515210d28..9483d29d199 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -58,7 +58,7 @@ ActorProfile En_Floormas_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -66,7 +66,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x04, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, @@ -181,13 +181,13 @@ void EnFloormas_Destroy(Actor* thisx, PlayState* play) { } void EnFloormas_MakeInvulnerable(EnFloormas* this) { - this->collider.base.colType = COLTYPE_HARD; + this->collider.base.colMaterial = COL_MATERIAL_HARD; this->collider.base.acFlags |= AC_HARD; this->actionTarget = 0x28; } void EnFloormas_MakeVulnerable(EnFloormas* this) { - this->collider.base.colType = COLTYPE_HIT0; + this->collider.base.colMaterial = COL_MATERIAL_HIT0; this->actionTarget = 0; this->collider.base.acFlags &= ~AC_HARD; } @@ -980,7 +980,7 @@ void EnFloormas_ColliderCheck(EnFloormas* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem, true); if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { - if (this->collider.base.colType != COLTYPE_HARD) { + if (this->collider.base.colMaterial != COL_MATERIAL_HARD) { isSmall = false; if (this->actor.scale.x < 0.01f) { isSmall = true; @@ -1063,7 +1063,7 @@ void EnFloormas_Update(Actor* thisx, PlayState* play) { Actor_SetFocus(&this->actor, this->actor.scale.x * 2500.0f); - if (this->collider.base.colType == COLTYPE_HARD) { + if (this->collider.base.colMaterial == COL_MATERIAL_HARD) { if (this->actionTarget != 0) { this->actionTarget--; } @@ -1106,14 +1106,14 @@ void EnFloormas_Draw(Actor* thisx, PlayState* play) { OPEN_DISPS(play->state.gfxCtx, "../z_en_floormas.c", 2318); Gfx_SetupDL_25Opa(play->state.gfxCtx); - if (this->collider.base.colType == COLTYPE_HARD) { + if (this->collider.base.colMaterial == COL_MATERIAL_HARD) { func_80026230(play, &sMergeColor, this->actionTarget % 0x28, 0x28); } POLY_OPA_DISP = SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnFloormas_OverrideLimbDraw, EnFloormas_PostLimbDraw, this, POLY_OPA_DISP); - if (this->collider.base.colType == COLTYPE_HARD) { + if (this->collider.base.colMaterial == COL_MATERIAL_HARD) { func_80026608(play); } @@ -1126,13 +1126,13 @@ void EnFloormas_DrawHighlighted(Actor* thisx, PlayState* play) { OPEN_DISPS(play->state.gfxCtx, "../z_en_floormas.c", 2352); Gfx_SetupDL_25Xlu(play->state.gfxCtx); - if (this->collider.base.colType == COLTYPE_HARD) { + if (this->collider.base.colMaterial == COL_MATERIAL_HARD) { func_80026690(play, &sMergeColor, this->actionTarget % 0x28, 0x28); } POLY_XLU_DISP = SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnFloormas_OverrideLimbDraw, EnFloormas_PostLimbDraw, this, POLY_XLU_DISP); - if (this->collider.base.colType == COLTYPE_HARD) { + if (this->collider.base.colMaterial == COL_MATERIAL_HARD) { func_80026A6C(play); } diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index 5c65d7bf418..4bbd5b946e1 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -42,7 +42,7 @@ ActorProfile En_Fu_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -50,7 +50,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/src/overlays/actors/ovl_En_Fw/z_en_fw.c index cc20ea25a58..50bc3e3b7b5 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -39,7 +39,7 @@ ActorProfile En_Fw_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x04 }, { 0xFFCFFFFE, 0x00, 0x00 }, ATELEM_NONE, @@ -52,7 +52,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index 6aec8f91265..c7b14455b35 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -59,14 +59,14 @@ ActorProfile En_Fz_Profile = { static ColliderCylinderInitType1 sCylinderInit1 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x00 }, { 0xFFCE0FDB, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -78,14 +78,14 @@ static ColliderCylinderInitType1 sCylinderInit1 = { static ColliderCylinderInitType1 sCylinderInit2 = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x00 }, { 0x0001F024, 0x00, 0x00 }, ATELEM_NONE, @@ -97,14 +97,14 @@ static ColliderCylinderInitType1 sCylinderInit2 = { static ColliderCylinderInitType1 sCylinderInit3 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x02, 0x08 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index 12659edf688..e1d62586116 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -41,7 +41,7 @@ static s16 sCollectedCount = 0; static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -49,7 +49,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/src/overlays/actors/ovl_En_Gb/z_en_gb.c index e63259cb92a..ade8bd08998 100644 --- a/src/overlays/actors/ovl_En_Gb/z_en_gb.c +++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.c @@ -46,14 +46,14 @@ static EnGbCagedSoulInfo sCagedSoulInfo[] = { static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, @@ -66,14 +66,14 @@ static ColliderCylinderInitType1 sCylinderInit = { static ColliderCylinderInitType1 sBottlesCylindersInit[] = { { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, @@ -84,14 +84,14 @@ static ColliderCylinderInitType1 sBottlesCylindersInit[] = { }, { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, @@ -102,14 +102,14 @@ static ColliderCylinderInitType1 sBottlesCylindersInit[] = { }, { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index 56fb1dd27ec..a91ee4d61c0 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -53,7 +53,7 @@ ActorProfile En_Ge1_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -61,7 +61,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000702, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index a5903e21f0f..6ae95e0c764 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -69,7 +69,7 @@ ActorProfile En_Ge2_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -77,7 +77,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x000007A2, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index 68be541e7a2..7cedafafc9a 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -33,7 +33,7 @@ ActorProfile En_Ge3_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -41,7 +41,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000722, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index d9fed96d1ee..8d09f453422 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -83,7 +83,7 @@ ActorProfile En_GeldB_Profile = { static ColliderCylinderInit sBodyCylInit = { { - COLTYPE_HIT5, + COL_MATERIAL_HIT5, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -91,7 +91,7 @@ static ColliderCylinderInit sBodyCylInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -104,7 +104,7 @@ static ColliderCylinderInit sBodyCylInit = { static ColliderTrisElementInit sBlockTrisElementsInit[2] = { { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0xFFC1FFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -115,7 +115,7 @@ static ColliderTrisElementInit sBlockTrisElementsInit[2] = { }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0xFFC1FFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -128,7 +128,7 @@ static ColliderTrisElementInit sBlockTrisElementsInit[2] = { static ColliderTrisInit sBlockTrisInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, @@ -141,7 +141,7 @@ static ColliderTrisInit sBlockTrisInit = { static ColliderQuadInit sSwordQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -149,7 +149,7 @@ static ColliderQuadInit sSwordQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index 68fca33fdd2..ef83de3033e 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -40,14 +40,14 @@ ActorProfile En_Gm_Profile = { static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index 95cf647b3ac..eb94a708a34 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -48,7 +48,7 @@ ActorProfile En_Go_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -56,7 +56,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index 0b2a31e00c4..3d779dbbd92 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -66,7 +66,7 @@ static Vec3f sAccel = { 0.0f, 0.3f, 0.0f }; static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -74,7 +74,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/src/overlays/actors/ovl_En_Goma/z_en_goma.c index 747a46f8a08..ceb7b3649d3 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -56,7 +56,7 @@ ActorProfile En_Goma_Profile = { static ColliderCylinderInit D_80A4B7A0 = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -64,7 +64,7 @@ static ColliderCylinderInit D_80A4B7A0 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0xFFDFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -76,7 +76,7 @@ static ColliderCylinderInit D_80A4B7A0 = { static ColliderCylinderInit D_80A4B7CC = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -84,7 +84,7 @@ static ColliderCylinderInit D_80A4B7CC = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0xFFDFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index 71cdfb185c3..3439d0f717a 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -58,7 +58,7 @@ ActorProfile En_Goroiwa_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x00, 0x04 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -71,7 +71,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index d5a2e2eb57e..9cbe909eb32 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -35,7 +35,7 @@ ActorProfile En_Gs_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -43,7 +43,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c index 41fd2d9439d..79c27bec42d 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -34,7 +34,7 @@ ActorProfile En_Guest_Profile = { static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c index 0151dc78779..a339b3c3f44 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -29,7 +29,7 @@ ActorProfile En_Hata_Profile = { // Unused Collider and CollisionCheck data static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -37,7 +37,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000080, 0x00, 0x00 }, ATELEM_NONE | ATELEM_SFX_NORMAL, diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index ac47fef9926..a4911f9a930 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -64,7 +64,7 @@ ActorProfile En_Heishi2_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -72,7 +72,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index 4b22137ce32..aa9c72cc5ad 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -39,7 +39,7 @@ ActorProfile En_Heishi3_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -47,7 +47,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c index ec04d982b5f..4161b4c6479 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -37,7 +37,7 @@ static u32 sMaskReactionSets[] = { MASK_REACTION_SET_HEISHI4_1, MASK_REACTION_SE static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -45,7 +45,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index af3083c97a3..e692c309af7 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -41,7 +41,7 @@ ActorProfile En_Hintnuts_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -49,7 +49,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index 507b5216070..c98881645d9 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -63,7 +63,7 @@ ActorProfile En_Honotrap_Profile = { static ColliderTrisElementInit sTrisElementsInit[2] = { { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x0001F824, 0x00, 0x00 }, ATELEM_NONE, @@ -74,7 +74,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x0001F824, 0x00, 0x00 }, ATELEM_NONE, @@ -87,7 +87,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = { static ColliderTrisInit sTrisInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -100,7 +100,7 @@ static ColliderTrisInit sTrisInit = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -108,7 +108,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00100000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index 6b1c908785f..44dc68f52ac 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -80,7 +80,7 @@ ActorProfile En_Horse_Profile = { static ColliderCylinderInit sCylinderInit1 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_TYPE_PLAYER, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -88,7 +88,7 @@ static ColliderCylinderInit sCylinderInit1 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000400, 0x00, 0x04 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, @@ -100,7 +100,7 @@ static ColliderCylinderInit sCylinderInit1 = { static ColliderCylinderInit sCylinderInit2 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -108,7 +108,7 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -121,7 +121,7 @@ static ColliderCylinderInit sCylinderInit2 = { static ColliderJntSphElementInit sJntSphItemsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x0001F824, 0x00, 0x00 }, ATELEM_NONE, @@ -134,7 +134,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, diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c index a02efe93420..06129939479 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c @@ -44,7 +44,7 @@ static f32 splaySpeeds[] = { 2.0f / 3.0f, 2.0f / 3.0f, 1.0f, 1.0f, 1.0f, 2.0f / static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -52,7 +52,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, @@ -65,7 +65,7 @@ static ColliderCylinderInit sCylinderInit = { static ColliderJntSphElementInit sJntSphElementsInit[] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, @@ -78,7 +78,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index ff33ecbe372..a626ae27f35 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -38,14 +38,14 @@ static AnimationHeader* sAnimations[] = { static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, @@ -58,7 +58,7 @@ static ColliderCylinderInitType1 sCylinderInit = { static ColliderJntSphElementInit sJntSphElementInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, @@ -71,7 +71,7 @@ static ColliderJntSphElementInit sJntSphElementInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index 278039ed437..79e89987623 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -59,7 +59,7 @@ static AnimationHeader* sAnimations[] = { static ColliderCylinderInit sCylinderInit1 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -67,7 +67,7 @@ static ColliderCylinderInit sCylinderInit1 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, @@ -79,7 +79,7 @@ static ColliderCylinderInit sCylinderInit1 = { static ColliderCylinderInit sCylinderInit2 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -87,7 +87,7 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, @@ -100,7 +100,7 @@ static ColliderCylinderInit sCylinderInit2 = { static ColliderJntSphElementInit sJntSphElementsInit[] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, @@ -113,7 +113,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c index acfa90aa602..dd8068cd2cd 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c @@ -36,14 +36,14 @@ static f32 splaySpeeds[] = { 2.0f / 3.0f }; static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, @@ -56,7 +56,7 @@ static ColliderCylinderInitType1 sCylinderInit = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, @@ -69,7 +69,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index f5f07ff45e9..c3a301f1f77 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -32,7 +32,7 @@ ActorProfile En_Hs_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -40,7 +40,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index 267258ee7a5..18fc3cb880d 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -30,7 +30,7 @@ ActorProfile En_Hs2_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -38,7 +38,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c index b5d86df314d..718cb218079 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -46,7 +46,7 @@ ActorProfile En_Hy_Profile = { static ColliderCylinderInit sColCylInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -54,7 +54,7 @@ static ColliderCylinderInit sColCylInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index 2ae77026e11..ecd1ad5d3e5 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -38,7 +38,7 @@ ActorProfile En_Ice_Hono_Profile = { static ColliderCylinderInit sCylinderInitCapturableFlame = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -46,7 +46,7 @@ static ColliderCylinderInit sCylinderInitCapturableFlame = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, @@ -58,7 +58,7 @@ static ColliderCylinderInit sCylinderInitCapturableFlame = { static ColliderCylinderInit sCylinderInitDroppedFlame = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_OTHER, AC_NONE, OC1_ON | OC1_TYPE_2, @@ -66,7 +66,7 @@ static ColliderCylinderInit sCylinderInitDroppedFlame = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 4dd20ca3c95..003e5a5c3bd 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -67,7 +67,7 @@ void EnIk_StartDefeatCutscene(Actor* thisx, PlayState* play); static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -75,7 +75,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -88,7 +88,7 @@ static ColliderCylinderInit sCylinderInit = { static ColliderTrisElementInit sTrisElementsInit[2] = { { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0xFFC3FFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -99,7 +99,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = { }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0xFFC3FFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -112,7 +112,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = { static ColliderTrisInit sTrisInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, @@ -125,7 +125,7 @@ static ColliderTrisInit sTrisInit = { static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -133,7 +133,7 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x00, 0x40 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index 3b63d0434c9..e13d95dfd3a 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -38,7 +38,7 @@ ActorProfile En_In_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -46,7 +46,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 7ad1fe0d803..b98c864f9f0 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -57,7 +57,7 @@ ActorProfile En_Insect_Profile = { static ColliderJntSphElementInit sColliderItemInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -70,7 +70,7 @@ static ColliderJntSphElementInit sColliderItemInit[1] = { static ColliderJntSphInit sColliderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_PLAYER | OC1_TYPE_1, diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index 441bc3064e3..a14b34e9221 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -62,7 +62,7 @@ static EnIshiEffectSpawnFunc sDustSpawnFuncs[] = { EnIshi_SpawnDustSmall, EnIshi static ColliderCylinderInit sCylinderInits[] = { { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -70,7 +70,7 @@ static ColliderCylinderInit sCylinderInits[] = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x4FC1FFFE, 0x00, 0x00 }, ATELEM_NONE, @@ -81,7 +81,7 @@ static ColliderCylinderInit sCylinderInits[] = { }, { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -89,7 +89,7 @@ static ColliderCylinderInit sCylinderInits[] = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x4FC1FFF6, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_It/z_en_it.c b/src/overlays/actors/ovl_En_It/z_en_it.c index 8445812f79e..312ceec96e8 100644 --- a/src/overlays/actors/ovl_En_It/z_en_it.c +++ b/src/overlays/actors/ovl_En_It/z_en_it.c @@ -14,7 +14,7 @@ void EnIt_Update(Actor* thisx, PlayState* play); static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_NO_PUSH, @@ -22,7 +22,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c index 02ed7fa2b37..999e97cd246 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c @@ -48,7 +48,7 @@ static s32 sUnused2[] = { 0, 0 }; static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -56,7 +56,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000004, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index 17c4b041b49..2aa7b7582df 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -30,7 +30,7 @@ ActorProfile En_Js_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -38,7 +38,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index 91f61490994..ff2084c256d 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -24,7 +24,7 @@ void func_80A8FAA4(EnKakasi* this, PlayState* play); static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -32,7 +32,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index ae3e104f627..b624b5f8902 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -12,7 +12,7 @@ static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -20,7 +20,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c index bca4a7f43e1..04bf6fe4c30 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -28,7 +28,7 @@ void func_80A91A90(EnKakasi3* this, PlayState* play); static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -36,7 +36,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index 2989f8e088a..496e034c7b7 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -90,7 +90,7 @@ ActorProfile En_Kanban_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -98,7 +98,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index 705f98b38fd..f17108e82e1 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -43,7 +43,7 @@ ActorProfile En_Karebaba_Profile = { static ColliderCylinderInit sBodyColliderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -51,7 +51,7 @@ static ColliderCylinderInit sBodyColliderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -63,7 +63,7 @@ static ColliderCylinderInit sBodyColliderInit = { static ColliderCylinderInit sHeadColliderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -71,7 +71,7 @@ static ColliderCylinderInit sHeadColliderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, @@ -123,7 +123,7 @@ void EnKarebaba_Destroy(Actor* thisx, PlayState* play) { void EnKarebaba_ResetCollider(EnKarebaba* this) { this->bodyCollider.dim.radius = 7; this->bodyCollider.dim.height = 25; - this->bodyCollider.base.colType = COLTYPE_HARD; + this->bodyCollider.base.colMaterial = COL_MATERIAL_HARD; this->bodyCollider.base.acFlags |= AC_HARD; this->bodyCollider.elem.acDmgInfo.dmgFlags = DMG_DEFAULT; this->headCollider.dim.height = 25; @@ -153,7 +153,7 @@ void EnKarebaba_SetupAwaken(EnKarebaba* this) { void EnKarebaba_SetupUpright(EnKarebaba* this) { if (this->actionFunc != EnKarebaba_Spin) { Actor_SetScale(&this->actor, 0.01f); - this->bodyCollider.base.colType = COLTYPE_HIT6; + this->bodyCollider.base.colMaterial = COL_MATERIAL_HIT6; this->bodyCollider.base.acFlags &= ~AC_HARD; this->bodyCollider.elem.acDmgInfo.dmgFlags = !LINK_IS_ADULT ? ((DMG_SWORD | DMG_BOOMERANG) & ~DMG_JUMP_MASTER) : (DMG_SWORD | DMG_BOOMERANG); diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c index 0c738afefeb..0681a5374ff 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -44,7 +44,7 @@ ActorProfile En_Ko_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -52,7 +52,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index 48f0043d9df..eacb01ca3ec 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -57,7 +57,7 @@ static s16 sObjectIds[] = { OBJECT_GAMEPLAY_FIELD_KEEP, OBJECT_KUSA, OBJECT_KUSA static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER | OC1_TYPE_2, @@ -65,7 +65,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x4FC00758, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index 43c72e71493..bf65d64276e 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -36,7 +36,7 @@ ActorProfile En_Kz_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -44,7 +44,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c index 74bc53af1f6..9acedc1552e 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c @@ -26,7 +26,7 @@ ActorProfile En_M_Fire1_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, @@ -34,7 +34,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000001, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index 6303391a6e9..590e95945b6 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -26,7 +26,7 @@ ActorProfile En_M_Thunder_Profile = { static ColliderCylinderInit D_80AA0420 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, @@ -34,7 +34,7 @@ static ColliderCylinderInit D_80AA0420 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000001, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index caf06ced845..e8db7223ea6 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -37,7 +37,7 @@ ActorProfile En_Ma1_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -45,7 +45,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index 1f56ab1d710..b77c0cf6416 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -31,7 +31,7 @@ ActorProfile En_Ma2_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -39,7 +39,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index f547ba3251c..7838b0e88f2 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -34,7 +34,7 @@ ActorProfile En_Ma3_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -42,7 +42,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index 8796955aa69..c30273c7255 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -91,7 +91,7 @@ void EnMb_ClubDamaged(EnMb* this, PlayState* play); static ColliderCylinderInit sBodyColliderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -99,7 +99,7 @@ static ColliderCylinderInit sBodyColliderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -112,7 +112,7 @@ static ColliderCylinderInit sBodyColliderInit = { static ColliderTrisElementInit sFrontShieldingTrisInit[2] = { { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -123,7 +123,7 @@ static ColliderTrisElementInit sFrontShieldingTrisInit[2] = { }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -136,7 +136,7 @@ static ColliderTrisElementInit sFrontShieldingTrisInit[2] = { static ColliderTrisInit sFrontShieldingInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, @@ -149,7 +149,7 @@ static ColliderTrisInit sFrontShieldingInit = { static ColliderQuadInit sAttackColliderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -157,7 +157,7 @@ static ColliderQuadInit sAttackColliderInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index 04f5e03ce0b..260caab51a7 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -35,7 +35,7 @@ ActorProfile En_Md_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -43,7 +43,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index 31e89655ce3..916fd43cfa4 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -30,7 +30,7 @@ ActorProfile En_Mk_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -38,7 +38,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c index 7606f8d9e34..e26a04a1340 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -53,7 +53,7 @@ ActorProfile En_Mm_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -61,7 +61,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index d5cb108400b..6ce9857f443 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -49,7 +49,7 @@ ActorProfile En_Mm2_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -57,7 +57,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000004, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 3f8ad8d7ca8..f8d17a043dd 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -34,7 +34,7 @@ ActorProfile En_Ms_Profile = { static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/src/overlays/actors/ovl_En_Mu/z_en_mu.c index af1c6d32ef5..7ea28d994da 100644 --- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c +++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c @@ -19,7 +19,7 @@ s16 EnMu_UpdateTalkState(PlayState* play, Actor* thisx); static ColliderCylinderInit D_80AB0BD0 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -27,7 +27,7 @@ static ColliderCylinderInit D_80AB0BD0 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index 270e59bbcc7..1f81368c0fd 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -60,14 +60,14 @@ void EnNb_Draw(Actor* thisx, PlayState* play); static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_PLAYER, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 430012ebf61..508a4e543a4 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -75,7 +75,7 @@ static u8 sUpperRiverSpawned = false; static ColliderCylinderInit sCylinderInit1 = { { - COLTYPE_HIT5, + COL_MATERIAL_HIT5, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON, @@ -83,7 +83,7 @@ static ColliderCylinderInit sCylinderInit1 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -95,7 +95,7 @@ static ColliderCylinderInit sCylinderInit1 = { static ColliderCylinderInit sCylinderInit2 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -103,7 +103,7 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index 066ef78c628..ef35aa62bed 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -33,7 +33,7 @@ ActorProfile En_Niw_Girl_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -41,7 +41,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index 439af090f93..e9a01b4ffb3 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -48,7 +48,7 @@ static s16 D_80ABB3B4[] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -56,7 +56,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index 18b98fbc16f..51f3bbdd43b 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -36,7 +36,7 @@ ActorProfile En_Nutsball_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -44,7 +44,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_WOOD, diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index c95daad7466..00ba57f4adc 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -44,7 +44,7 @@ ActorProfile En_Nwc_Profile = { static ColliderJntSphElementInit sJntSphElementInit = { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -56,7 +56,7 @@ static ColliderJntSphElementInit sJntSphElementInit = { static ColliderJntSphInitType1 sJntSphInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c index dadd2359eba..2c04b71db83 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -38,7 +38,7 @@ ActorProfile En_Ny_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x04, 0x08 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -51,7 +51,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sColliderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -140,7 +140,7 @@ void EnNy_Init(Actor* thisx, PlayState* play) { PRINTF("En_Ny_actor_move2[ %x ] ！！\n", EnNy_UpdateUnused); this->actor.colChkInfo.mass = 0xFF; this->actor.update = EnNy_UpdateUnused; - this->collider.base.colType = COLTYPE_METAL; + this->collider.base.colMaterial = COL_MATERIAL_METAL; } } diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index f20ed91de4d..d8cdb2cfbc7 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -33,7 +33,7 @@ ActorProfile En_Okuta_Profile = { static ColliderCylinderInit sProjectileColliderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -41,7 +41,7 @@ static ColliderCylinderInit sProjectileColliderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, @@ -53,7 +53,7 @@ static ColliderCylinderInit sProjectileColliderInit = { static ColliderCylinderInit sOctorockColliderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -61,7 +61,7 @@ static ColliderCylinderInit sOctorockColliderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index e8a86a7d3fc..abb78246f1e 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -127,14 +127,14 @@ ActorProfile En_Ossan_Profile = { // Unused collider static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE | ATELEM_SFX_NORMAL, diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index 7cdc19b979a..96bfc75e919 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -79,7 +79,7 @@ ActorProfile En_Owl_Profile = { static ColliderCylinderInit sOwlCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -87,7 +87,7 @@ static ColliderCylinderInit sOwlCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index 0a21d5d3868..25439957366 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -54,7 +54,7 @@ ActorProfile En_Peehat_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_WOOD, + COL_MATERIAL_WOOD, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -62,7 +62,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -75,7 +75,7 @@ static ColliderCylinderInit sCylinderInit = { static ColliderJntSphElementInit sJntSphElemInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -88,7 +88,7 @@ static ColliderJntSphElementInit sJntSphElemInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -101,7 +101,7 @@ static ColliderJntSphInit sJntSphInit = { static ColliderQuadInit sQuadInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, @@ -109,7 +109,7 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c index 768bbcb279b..d6c53488623 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c @@ -33,7 +33,7 @@ ActorProfile En_Po_Desert_Profile = { static ColliderCylinderInit sColliderInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -41,7 +41,7 @@ static ColliderCylinderInit sColliderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index 36ea062472f..b56fef391fc 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -8,6 +8,8 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_po_field/object_po_field.h" +#pragma increment_block_number "gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" + #define FLAGS \ (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_IGNORE_QUAKE) @@ -48,7 +50,7 @@ ActorProfile En_Po_Field_Profile = { static ColliderCylinderInit D_80AD7080 = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -56,7 +58,7 @@ static ColliderCylinderInit D_80AD7080 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -68,7 +70,7 @@ static ColliderCylinderInit D_80AD7080 = { static ColliderCylinderInit D_80AD70AC = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -76,7 +78,7 @@ static ColliderCylinderInit D_80AD70AC = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index 2ab6611aa11..511d3fd5e0a 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -48,7 +48,7 @@ ActorProfile En_Po_Relay_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -56,7 +56,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index 739e137cfee..a648327dc68 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -77,7 +77,7 @@ ActorProfile En_Po_Sisters_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -85,7 +85,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0x4FC7FFEA, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -211,7 +211,7 @@ void EnPoSisters_Init(Actor* thisx, PlayState* play) { func_80AD9AA8(this, play); } else { this->actor.flags &= ~(ACTOR_FLAG_9 | ACTOR_FLAG_14); - this->collider.elem.elemType = ELEMTYPE_UNK4; + this->collider.elem.elemMaterial = ELEM_MATERIAL_UNK4; this->collider.elem.acDmgInfo.dmgFlags |= DMG_DEKU_NUT; this->collider.base.ocFlags1 = OC1_NONE; func_80AD9C24(this, NULL); @@ -267,7 +267,7 @@ void func_80AD943C(EnPoSisters* this) { void func_80AD944C(EnPoSisters* this) { if (this->unk_22E.a != 0) { - this->collider.base.colType = COLTYPE_METAL; + this->collider.base.colMaterial = COL_MATERIAL_METAL; this->collider.base.acFlags |= AC_HARD; } Animation_MorphToLoop(&this->skelAnime, &gPoeSistersAttackAnim, -5.0f); @@ -280,7 +280,7 @@ void func_80AD944C(EnPoSisters* this) { void func_80AD94E0(EnPoSisters* this) { this->actor.speed = 5.0f; if (this->unk_194 == 0) { - this->collider.base.colType = COLTYPE_METAL; + this->collider.base.colMaterial = COL_MATERIAL_METAL; this->collider.base.acFlags |= AC_HARD; Animation_MorphToLoop(&this->skelAnime, &gPoeSistersAttackAnim, -5.0f); } @@ -294,7 +294,7 @@ void func_80AD9568(EnPoSisters* this) { Animation_MorphToLoop(&this->skelAnime, &gPoeSistersFloatAnim, -3.0f); this->actor.world.rot.y = this->actor.yawTowardsPlayer + 0x8000; if (this->unk_194 != 0) { - this->collider.base.colType = COLTYPE_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; this->collider.base.acFlags &= ~AC_HARD; } this->actionFunc = func_80ADA9E8; @@ -431,7 +431,7 @@ void func_80AD9C24(EnPoSisters* this, PlayState* play) { this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; this->unk_19C = 100; this->unk_199 = 32; - this->collider.base.colType = COLTYPE_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; this->collider.base.acFlags &= ~AC_HARD; if (play != NULL) { vec.x = this->actor.world.pos.x; @@ -673,7 +673,7 @@ void func_80ADA8C0(EnPoSisters* this, PlayState* play) { this->actor.shape.rot.y += (384.0f * this->skelAnime.endFrame) * 3.0f; if (this->unk_19A == 0 && ABS((s16)(this->actor.shape.rot.y - this->actor.world.rot.y)) < 0x1000) { if (this->unk_194 != 0) { - this->collider.base.colType = COLTYPE_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; this->collider.base.acFlags &= ~AC_HARD; func_80AD93C4(this); } else { @@ -1147,7 +1147,7 @@ void func_80ADC10C(EnPoSisters* this, PlayState* play) { sp24.z = this->actor.world.pos.z; Item_DropCollectible(play, &sp24, ITEM00_ARROWS_SMALL); } - } else if (this->collider.base.colType == 9 || + } else if (this->collider.base.colMaterial == COL_MATERIAL_METAL || (this->actor.colChkInfo.damageEffect == 0 && this->actor.colChkInfo.damage == 0)) { if (this->unk_194 == 0) { this->actor.freezeTimer = 0; diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index 1092ecabcee..9e8f56721e3 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -56,7 +56,7 @@ ActorProfile En_Poh_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -64,7 +64,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -77,7 +77,7 @@ static ColliderCylinderInit sCylinderInit = { static ColliderJntSphElementInit D_80AE1AA0[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -90,7 +90,7 @@ static ColliderJntSphElementInit D_80AE1AA0[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 5e9af39bea8..96ea4ea33bf 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -66,7 +66,7 @@ ActorProfile En_Rd_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -74,7 +74,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index 75a3e49eeca..f258a055b6a 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -89,7 +89,7 @@ ActorProfile En_Reeba_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT5, + COL_MATERIAL_HIT5, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -97,7 +97,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x08, 0x08 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -132,7 +132,7 @@ void EnReeba_Init(Actor* thisx, PlayState* play) { // "Reeba Boss Appears %f" PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ リーバぼす登場 ☆☆☆☆☆ %f\n" VT_RST, this->scale); this->actor.colChkInfo.health = 20; - this->collider.elem.atDmgInfo.effect = 4; + this->collider.elem.atDmgInfo.playerACHitReaction = PLAYER_AC_HIT_REACTION_4; this->collider.elem.atDmgInfo.damage = 16; Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_ENEMY); } diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index 6abb326ed8f..985083560c4 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -85,14 +85,14 @@ static char* sDropNames[] = { static ColliderCylinderInitType1 sCylinderInit1 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -104,14 +104,14 @@ static ColliderCylinderInitType1 sCylinderInit1 = { static ColliderCylinderInitType1 sCylinderInit2 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_NO_PUSH | OC1_TYPE_PLAYER, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 1a80885f300..c0443bf1195 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -71,7 +71,7 @@ void EnRu1_DrawXlu(EnRu1* this, PlayState* play); static ColliderCylinderInitType1 sCylinderInit1 = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_PLAYER, @@ -83,7 +83,7 @@ static ColliderCylinderInitType1 sCylinderInit1 = { static ColliderCylinderInitType1 sCylinderInit2 = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_ON | OC1_TYPE_PLAYER, diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 9bcb6c8d722..733aefd47de 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -45,7 +45,7 @@ void func_80AF2AB4(EnRu2* this, PlayState* play); static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index 70c12a09f83..4434ce9410d 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -47,7 +47,7 @@ ActorProfile En_Sa_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -55,7 +55,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index 108c6663a5f..647d321273b 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -39,7 +39,7 @@ ActorProfile En_Sb_Profile = { static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c index 602dbe0d326..8eb853a808b 100644 --- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c +++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c @@ -35,7 +35,7 @@ ActorProfile En_Shopnuts_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -43,7 +43,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index 50a8a1479df..f6619976d87 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -20,7 +20,7 @@ void func_80AFB950(EnSi* this, PlayState* play); static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_NO_PUSH | OC1_TYPE_ALL, @@ -28,7 +28,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000090, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index 2d1a4aad6c5..824528d5d9f 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -43,7 +43,7 @@ void EnSkb_Death(EnSkb* this, PlayState* play); static ColliderJntSphElementInit sJntSphElementsInit[2] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x04 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -54,7 +54,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[2] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -67,7 +67,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, diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index a630995c9ee..d589c9c4e24 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -173,14 +173,14 @@ ActorProfile En_Skj_Profile = { static ColliderCylinderInitType1 D_80B01678 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_NONE, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x0, 0x08 }, { 0xFFCFFFFF, 0x0, 0x0 }, ATELEM_ON | ATELEM_SFX_NORMAL, diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c index a893e4766b6..14da6adb973 100644 --- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c +++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c @@ -30,14 +30,14 @@ ActorProfile En_Skjneedle_Profile = { static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_NONE, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index d9767205758..09fa048caee 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -44,7 +44,7 @@ ActorProfile En_Ssh_Profile = { static ColliderCylinderInit sCylinderInit1 = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -52,7 +52,7 @@ static ColliderCylinderInit sCylinderInit1 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -66,7 +66,7 @@ static CollisionCheckInfoInit2 sColChkInfoInit = { 1, 0, 0, 0, MASS_IMMOVABLE }; static ColliderCylinderInit sCylinderInit2 = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -74,7 +74,7 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, @@ -87,7 +87,7 @@ static ColliderCylinderInit sCylinderInit2 = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x04 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -100,7 +100,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -205,9 +205,9 @@ void EnSsh_InitColliders(EnSsh* this, PlayState* play) { this->colCylinder[1].elem.acDmgInfo.dmgFlags = DMG_DEFAULT & ~(DMG_ARROW | DMG_MAGIC_FIRE | DMG_HOOKSHOT | DMG_HAMMER_SWING | DMG_EXPLOSIVE | DMG_DEKU_NUT) & ~(DMG_MAGIC_LIGHT | DMG_MAGIC_ICE); - this->colCylinder[2].base.colType = COLTYPE_METAL; + this->colCylinder[2].base.colMaterial = COL_MATERIAL_METAL; this->colCylinder[2].elem.acElemFlags = ACELEM_ON | ACELEM_HOOKABLE | ACELEM_NO_AT_INFO; - this->colCylinder[2].elem.elemType = ELEMTYPE_UNK2; + this->colCylinder[2].elem.elemMaterial = ELEM_MATERIAL_UNK2; this->colCylinder[2].elem.acDmgInfo.dmgFlags = DMG_DEFAULT & ~(DMG_ARROW | DMG_MAGIC_FIRE | DMG_HOOKSHOT | DMG_HAMMER_SWING | DMG_EXPLOSIVE | DMG_DEKU_NUT); diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index d70fd9b3fee..69b1f172447 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -37,7 +37,7 @@ ActorProfile En_St_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -45,7 +45,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -59,7 +59,7 @@ static CollisionCheckInfoInit2 sColChkInit = { 2, 0, 0, 0, MASS_IMMOVABLE }; static ColliderCylinderInit sCylinderInit2 = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -67,7 +67,7 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, @@ -80,7 +80,7 @@ static ColliderCylinderInit sCylinderInit2 = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x04 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -93,7 +93,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -291,9 +291,9 @@ void EnSt_InitColliders(EnSt* this, PlayState* play) { DMG_DEFAULT & ~(DMG_MAGIC_FIRE | DMG_ARROW | DMG_HOOKSHOT | DMG_HAMMER_SWING | DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT) & ~(DMG_MAGIC_LIGHT | DMG_MAGIC_ICE); - this->colCylinder[2].base.colType = COLTYPE_METAL; + this->colCylinder[2].base.colMaterial = COL_MATERIAL_METAL; this->colCylinder[2].elem.acElemFlags = ACELEM_ON | ACELEM_HOOKABLE | ACELEM_NO_AT_INFO; - this->colCylinder[2].elem.elemType = ELEMTYPE_UNK2; + this->colCylinder[2].elem.elemMaterial = ELEM_MATERIAL_UNK2; this->colCylinder[2].elem.acDmgInfo.dmgFlags = DMG_DEFAULT & ~(DMG_MAGIC_FIRE | DMG_ARROW | DMG_HOOKSHOT | DMG_HAMMER_SWING | DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT); diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index d70c5e16945..c5fb6dbaa32 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -38,7 +38,7 @@ ActorProfile En_Sth_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -46,7 +46,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index 5846ecc09e3..2e1091eda7e 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -34,13 +34,13 @@ ActorProfile En_Sw_Profile = { static ColliderJntSphElementInit sJntSphItemsInit[1] = { { - { ELEMTYPE_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0xFFC3FFFE, 0x00, 0x00 }, 0x01, 0x05, 0x01 }, + { ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0xFFC3FFFE, 0x00, 0x00 }, 0x01, 0x05, 0x01 }, { 2, { { 0, -300, 0 }, 21 }, 100 }, }, }; static ColliderJntSphInit sJntSphInit = { - { COLTYPE_HIT6, 0x11, 0x09, 0x39, 0x10, COLSHAPE_JNTSPH }, + { COL_MATERIAL_HIT6, 0x11, 0x09, 0x39, 0x10, COLSHAPE_JNTSPH }, 1, sJntSphItemsInit, }; diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 31a28f9744d..566a866f9ab 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -40,7 +40,7 @@ ActorProfile En_Syateki_Niw_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT5, + COL_MATERIAL_HIT5, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -48,7 +48,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index 45e449992fa..5d5c2cd3a15 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -71,7 +71,7 @@ ActorProfile En_Ta_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -79,7 +79,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000004, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index 44db5bb0801..4dba9ede581 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -139,7 +139,7 @@ ActorProfile En_Test_Profile = { static ColliderCylinderInit sBodyColliderInit = { { - COLTYPE_HIT5, + COL_MATERIAL_HIT5, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -147,7 +147,7 @@ static ColliderCylinderInit sBodyColliderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -159,7 +159,7 @@ static ColliderCylinderInit sBodyColliderInit = { static ColliderCylinderInit sShieldColliderInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, @@ -167,7 +167,7 @@ static ColliderCylinderInit sShieldColliderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFC1FFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -179,7 +179,7 @@ static ColliderCylinderInit sShieldColliderInit = { static ColliderQuadInit sSwordColliderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -187,7 +187,7 @@ static ColliderQuadInit sSwordColliderInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c index edd86bd1a56..bcce7782a2c 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -18,7 +18,7 @@ void EnTg_SpinIfNotTalking(EnTg* this, PlayState* play); static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -26,7 +26,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index 09914205a00..eb28e6a164a 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -89,7 +89,7 @@ ActorProfile En_Tite_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -102,7 +102,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 7a1dd4b8a71..06d5a1c6088 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -138,7 +138,7 @@ s32 EnTkEff_CreateDflt(EnTk* this, Vec3f* pos, u8 duration, f32 size, f32 growth static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -146,7 +146,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index 9d88eda5b89..cff6978c6af 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -103,7 +103,7 @@ void EnTorch2_Init(Actor* thisx, PlayState* play2) { this->cylinder.base.acFlags = AC_ON | AC_TYPE_PLAYER; this->meleeWeaponQuads[0].base.atFlags = this->meleeWeaponQuads[1].base.atFlags = AT_ON | AT_TYPE_ENEMY; this->meleeWeaponQuads[0].base.acFlags = this->meleeWeaponQuads[1].base.acFlags = AC_ON | AC_HARD | AC_TYPE_PLAYER; - this->meleeWeaponQuads[0].base.colType = this->meleeWeaponQuads[1].base.colType = COLTYPE_METAL; + this->meleeWeaponQuads[0].base.colMaterial = this->meleeWeaponQuads[1].base.colMaterial = COL_MATERIAL_METAL; this->meleeWeaponQuads[0].elem.atDmgInfo.damage = this->meleeWeaponQuads[1].elem.atDmgInfo.damage = 8; this->meleeWeaponQuads[0].elem.acElemFlags = this->meleeWeaponQuads[1].elem.acElemFlags = ACELEM_ON; this->shieldQuad.base.atFlags = AT_ON | AT_TYPE_ENEMY; @@ -697,11 +697,11 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { sDodgeRollState = (this->invincibilityTimer > 0) ? 2 : 0; } if (this->invincibilityTimer != 0) { - this->cylinder.base.colType = COLTYPE_NONE; - this->cylinder.elem.elemType = ELEMTYPE_UNK5; + this->cylinder.base.colMaterial = COL_MATERIAL_NONE; + this->cylinder.elem.elemMaterial = ELEM_MATERIAL_UNK5; } else { - this->cylinder.base.colType = COLTYPE_HIT5; - this->cylinder.elem.elemType = ELEMTYPE_UNK1; + this->cylinder.base.colMaterial = COL_MATERIAL_HIT5; + this->cylinder.elem.elemMaterial = ELEM_MATERIAL_UNK1; } /* * Handles the jump movement onto Link's sword. Dark Link doesn't move during the diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c index d450acc0bd6..89b7bb356ef 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c @@ -32,7 +32,7 @@ ActorProfile En_Toryo_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -40,7 +40,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c index 6319ac9b1e1..a6be2f60fbe 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -54,7 +54,7 @@ ActorProfile En_Tp_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x03, 0x08 }, { 0xFFCFFFFF, 0x01, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -67,7 +67,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_NONE, diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c index 5157cdf20f2..8cf807dcad7 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c @@ -48,14 +48,14 @@ ActorProfile En_Trap_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_NO_PUSH | OC1_TYPE_1 | OC1_TYPE_2, OC2_TYPE_1, COLSHAPE_CYLINDER, }, - { ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00001000, 0x00, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON }, + { ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00001000, 0x00, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON }, { 30, 20, 0, { 0, 0, 0 } }, }; diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index e32db459691..c122d39684a 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -22,7 +22,7 @@ void EnTuboTrap_Fly(EnTuboTrap* this, PlayState* play); static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -30,7 +30,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x04 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/src/overlays/actors/ovl_En_Vali/z_en_vali.c index bc98ba6cf3e..7ed4ea068b0 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -43,7 +43,7 @@ ActorProfile En_Vali_Profile = { static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -51,9 +51,9 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, - { 0xFFCFFFFF, 0x07, 0x08 }, - { 0x00000000, 0x00, 0x00 }, + ELEM_MATERIAL_UNK0, + { 0xFFCFFFFF, PLAYER_AC_HIT_REACTION_7, 0x08 }, + { 0x00000000, PLAYER_AT_HIT_REACTION_0, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, @@ -63,7 +63,7 @@ static ColliderQuadInit sQuadInit = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT8, + COL_MATERIAL_HIT8, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -71,9 +71,9 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, - { 0xFFCFFFFF, 0x07, 0x08 }, - { 0xFFCFFFFF, 0x01, 0x00 }, + ELEM_MATERIAL_UNK0, + { 0xFFCFFFFF, PLAYER_AC_HIT_REACTION_7, 0x08 }, + { 0xFFCFFFFF, PLAYER_AT_HIT_REACTION_1, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, @@ -258,7 +258,7 @@ void EnVali_SetupStunned(EnVali* this) { this->timer = 80; this->actor.velocity.y = 0.0f; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_XLU, 80); - this->bodyCollider.elem.acDmgInfo.effect = 0; + this->bodyCollider.elem.acDmgInfo.playerATHitReaction = PLAYER_AT_HIT_REACTION_0; Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); this->actor.velocity.y = 1.0f; this->actionFunc = EnVali_Stunned; @@ -448,7 +448,7 @@ void EnVali_Stunned(EnVali* this, PlayState* play) { } if (this->timer == 0) { - this->bodyCollider.elem.acDmgInfo.effect = 1; // Shock? + this->bodyCollider.elem.acDmgInfo.playerATHitReaction = PLAYER_AT_HIT_REACTION_1; // Shock? EnVali_SetupFloatIdle(this); } } diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index 8553fcad22e..1a8f8d2275d 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -30,7 +30,7 @@ ActorProfile En_Vb_Ball_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -38,7 +38,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK6, + ELEM_MATERIAL_UNK6, { 0x00100700, 0x00, 0x20 }, { 0x00100700, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index c938fec0f90..1fe315ae2ff 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -37,7 +37,7 @@ ActorProfile En_Vm_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -45,7 +45,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -57,7 +57,7 @@ static ColliderCylinderInit sCylinderInit = { static ColliderQuadInit sQuadInit1 = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -65,7 +65,7 @@ static ColliderQuadInit sQuadInit1 = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, @@ -77,7 +77,7 @@ static ColliderQuadInit sQuadInit1 = { static ColliderQuadInit sQuadInit2 = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -85,7 +85,7 @@ static ColliderQuadInit sQuadInit2 = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index b50c55776fb..73462780536 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -52,7 +52,7 @@ ActorProfile En_Wallmas_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -60,7 +60,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c index 2a710a36431..3d3387fcd2a 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -40,7 +40,7 @@ ActorProfile En_Weiyer_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -48,7 +48,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index aff693da0e1..8d2e130c1ce 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -46,7 +46,7 @@ s32 EnWf_DodgeRanged(PlayState* play, EnWf* this); static ColliderJntSphElementInit sJntSphItemsInit[4] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x04 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -57,7 +57,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[4] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x04 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -68,7 +68,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[4] = { }, { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xFFC1FFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -79,7 +79,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[4] = { }, { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xFFC1FFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -92,7 +92,7 @@ static ColliderJntSphElementInit sJntSphItemsInit[4] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -105,7 +105,7 @@ static ColliderJntSphInit sJntSphInit = { static ColliderCylinderInit sBodyCylinderInit = { { - COLTYPE_HIT5, + COL_MATERIAL_HIT5, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -113,7 +113,7 @@ static ColliderCylinderInit sBodyCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -125,7 +125,7 @@ static ColliderCylinderInit sBodyCylinderInit = { static ColliderCylinderInit sTailCylinderInit = { { - COLTYPE_HIT5, + COL_MATERIAL_HIT5, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -133,7 +133,7 @@ static ColliderCylinderInit sTailCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c index f95aae46b1a..3b5f2384efa 100644 --- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c +++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c @@ -23,7 +23,7 @@ void EnWonderItem_RollDrop(EnWonderItem* this, PlayState* play); static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -31,7 +31,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index 0fb8813a9a0..f893a1b06c5 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -47,7 +47,7 @@ ActorProfile En_Wood02_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_TREE, + COL_MATERIAL_TREE, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -55,7 +55,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK5, + ELEM_MATERIAL_UNK5, { 0x00000000, 0x00, 0x00 }, { 0x0FC0074A, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index 0671dfc6fac..591c6776489 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -32,14 +32,14 @@ void EnXc_DrawSquintingEyes(Actor* thisx, PlayState* play); static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_PLAYER, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, @@ -1395,7 +1395,7 @@ void func_80B3F3D8(void) { Sfx_PlaySfxCentered2(NA_SE_PL_SKIP); } -#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-jp:128 gc-jp-ce:128 gc-jp-mq:64 gc-us:128 gc-us-mq:64" +#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-jp:64 gc-jp-ce:64 gc-jp-mq:64 gc-us:64 gc-us-mq:64" void EnXc_PlayDiveSFX(Vec3f* src, PlayState* play) { static Vec3f D_80B42DA0; diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c index e45d92ba270..83a24f5f2bb 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c @@ -16,7 +16,7 @@ void func_80B42F74(EnYabusameMark* this, PlayState* play); static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -24,7 +24,7 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x0001F824, 0x00, 0x00 }, ATELEM_NONE | ATELEM_SFX_NORMAL, diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index ba5cc91a8d7..8ac0995c590 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -32,7 +32,7 @@ ActorProfile En_Yukabyun_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_NO_PUSH | OC1_TYPE_ALL, @@ -40,7 +40,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x04 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index f945ac7a352..128733c1659 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -113,7 +113,7 @@ ActorProfile En_Zf_Profile = { static ColliderCylinderInit sBodyCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -121,7 +121,7 @@ static ColliderCylinderInit sBodyCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -133,7 +133,7 @@ static ColliderCylinderInit sBodyCylinderInit = { static ColliderQuadInit sSwordQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, @@ -141,7 +141,7 @@ static ColliderQuadInit sSwordQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index 5c756b5bb5c..e3c9b3083f6 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -41,7 +41,7 @@ ActorProfile En_Zl1_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -49,7 +49,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index cd177f338d8..93bb8e3e084 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -25,14 +25,14 @@ void func_80B59AD0(EnZl3* this, PlayState* play); static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_PLAYER, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index 05317ed7ae2..fc4d5631330 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -72,7 +72,7 @@ ActorProfile En_Zl4_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -80,7 +80,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index 0af3e70f74c..a9dcda3ef58 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -276,7 +276,7 @@ void EnZo_TreadWaterRipples(EnZo* this, f32 scale, f32 targetScale, u8 alpha) { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -284,7 +284,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 087e9dfc2ff..fc01136ebae 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -15,7 +15,7 @@ #include "cic6105.h" #endif -#pragma increment_block_number "gc-eu:136 gc-eu-mq:136 gc-jp:138 gc-jp-ce:138 gc-jp-mq:138 gc-us:138 gc-us-mq:138" +#pragma increment_block_number "gc-eu:130 gc-eu-mq:130 gc-jp:132 gc-jp-ce:132 gc-jp-mq:132 gc-us:132 gc-us-mq:132" #define FLAGS ACTOR_FLAG_4 @@ -204,7 +204,7 @@ static u8 sSinkingLureFound = false; static ColliderJntSphElementInit sJntSphElementsInit[12] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -215,7 +215,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -226,7 +226,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -237,7 +237,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -248,7 +248,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -259,7 +259,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -270,7 +270,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -281,7 +281,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -292,7 +292,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -303,7 +303,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -314,7 +314,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -325,7 +325,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -338,7 +338,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_TYPE_ENEMY, AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c index fb4618a12b8..bebe9549830 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -20,7 +20,7 @@ void func_80B86BC8(ItemShield* this, PlayState* play); static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -28,7 +28,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000004, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c index 1986ddba965..3895bac8be3 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -46,7 +46,7 @@ ActorProfile Magic_Fire_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, @@ -54,7 +54,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00020000, 0x00, 0x01 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 8867ae1b840..4bb8ce0cf65 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -46,7 +46,7 @@ static u8 D_80B8E670 = 0; static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, @@ -54,7 +54,7 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00200000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -67,7 +67,7 @@ static ColliderQuadInit sQuadInit = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00200000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -80,7 +80,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index 9157deeeebf..a9cded57483 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -86,7 +86,7 @@ ActorProfile Obj_Bean_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_PLAYER, @@ -94,7 +94,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index d728309122a..1b4e31cd9d4 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -32,7 +32,7 @@ ActorProfile Obj_Bombiwa_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -40,9 +40,9 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x4FC1FFFE, 0x00, 0x00 }, + ELEM_MATERIAL_UNK0, + { 0x00000000, PLAYER_AC_HIT_REACTION_0, 0x00 }, + { 0x4FC1FFFE, PLAYER_AT_HIT_REACTION_0, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index b1536273b9c..0198ddfc8fb 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -35,7 +35,7 @@ ActorProfile Obj_Comb_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x4001FFFE, 0x00, 0x00 }, ATELEM_NONE, @@ -48,7 +48,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index 91d25e44671..ba43d40a46b 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -28,7 +28,7 @@ ActorProfile Obj_Hamishi_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -36,7 +36,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x4FC1FFF6, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c index 0d7737401b6..11b671c4b4e 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -28,7 +28,7 @@ ActorProfile Obj_Hana_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -36,7 +36,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c index 1c35eef8654..18b90b55846 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -31,7 +31,7 @@ ActorProfile Obj_Ice_Poly_Profile = { static ColliderCylinderInit sCylinderInitIce = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -39,7 +39,7 @@ static ColliderCylinderInit sCylinderInitIce = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x02, 0x00 }, { 0x00020800, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, @@ -51,7 +51,7 @@ static ColliderCylinderInit sCylinderInitIce = { static ColliderCylinderInit sCylinderInitHard = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, @@ -59,7 +59,7 @@ static ColliderCylinderInit sCylinderInitHard = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x4E01F7F6, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index dedcb559b36..f3b101e48e4 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -36,7 +36,7 @@ ActorProfile Obj_Kibako_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -44,7 +44,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000002, 0x00, 0x01 }, { 0x4FC00748, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index f1300c3c987..58e578c059f 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -31,7 +31,7 @@ ActorProfile Obj_Kibako2_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -39,7 +39,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x40000040, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index 050d6226cac..6f723d292a5 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -50,7 +50,7 @@ ActorProfile Obj_Lightswitch_Profile = { static ColliderJntSphElementInit sColliderJntSphElementInit[] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00200000, 0x00, 0x00 }, ATELEM_NONE, @@ -62,7 +62,7 @@ static ColliderJntSphElementInit sColliderJntSphElementInit[] = { }; static ColliderJntSphInit sColliderJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index cffb07fd4f3..1d4dc9ae00d 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -74,7 +74,7 @@ static f32 sFocusHeights[] = { static ColliderTrisElementInit sRustyFloorTrisElementsInit[2] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x40000040, 0x00, 0x00 }, ATELEM_NONE, @@ -85,7 +85,7 @@ static ColliderTrisElementInit sRustyFloorTrisElementsInit[2] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x40000040, 0x00, 0x00 }, ATELEM_NONE, @@ -98,7 +98,7 @@ static ColliderTrisElementInit sRustyFloorTrisElementsInit[2] = { static ColliderTrisInit sRustyFloorTrisInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -112,7 +112,7 @@ static ColliderTrisInit sRustyFloorTrisInit = { static ColliderTrisElementInit sEyeTrisElementsInit[2] = { { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x0001F824, 0x00, 0x00 }, ATELEM_NONE, @@ -123,7 +123,7 @@ static ColliderTrisElementInit sEyeTrisElementsInit[2] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x0001F824, 0x00, 0x00 }, ATELEM_NONE, @@ -136,7 +136,7 @@ static ColliderTrisElementInit sEyeTrisElementsInit[2] = { static ColliderTrisInit sEyeTrisInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -150,7 +150,7 @@ static ColliderTrisInit sEyeTrisInit = { static ColliderJntSphElementInit sCrystalJntSphElementInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xEFC1FFFE, 0x00, 0x00 }, ATELEM_NONE, @@ -163,7 +163,7 @@ static ColliderJntSphElementInit sCrystalJntSphElementInit[1] = { static ColliderJntSphInit sCrystalJntSphInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index 9c8a3ef213c..cc8fe0106ab 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -30,7 +30,7 @@ ActorProfile Obj_Syokudai_Profile = { static ColliderCylinderInit sCylInitStand = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -38,7 +38,7 @@ static ColliderCylinderInit sCylInitStand = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00100000, 0x00, 0x00 }, { 0xEE01FFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -50,7 +50,7 @@ static ColliderCylinderInit sCylInitStand = { static ColliderCylinderInit sCylInitFlame = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -58,7 +58,7 @@ static ColliderCylinderInit sCylInitFlame = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0x00020820, 0x00, 0x00 }, ATELEM_NONE, @@ -78,7 +78,7 @@ static InitChainEntry sInitChain[] = { static s32 sLitTorchCount; void ObjSyokudai_Init(Actor* thisx, PlayState* play) { - static u8 sColTypesStand[] = { 0x09, 0x0B, 0x0B }; + static u8 sColTypesStand[] = { COL_MATERIAL_METAL, COL_MATERIAL_WOOD, COL_MATERIAL_WOOD }; s32 pad; ObjSyokudai* this = (ObjSyokudai*)thisx; s32 torchType = PARAMS_GET_NOSHIFT(this->actor.params, 12, 4); @@ -88,7 +88,7 @@ void ObjSyokudai_Init(Actor* thisx, PlayState* play) { Collider_InitCylinder(play, &this->colliderStand); Collider_SetCylinder(play, &this->colliderStand, &this->actor, &sCylInitStand); - this->colliderStand.base.colType = sColTypesStand[PARAMS_GET_NOMASK(this->actor.params, 12)]; + this->colliderStand.base.colMaterial = sColTypesStand[PARAMS_GET_NOMASK(this->actor.params, 12)]; Collider_InitCylinder(play, &this->colliderFlame); Collider_SetCylinder(play, &this->colliderFlame, &this->actor, &sCylInitFlame); diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index ab73a0c9fa2..9747279d79a 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -56,7 +56,7 @@ static Gfx* D_80BA1B8C[] = { gPotFragmentDL, object_tsubo_DL_001960 }; static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_ON | AT_TYPE_PLAYER, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -64,7 +64,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000002, 0x00, 0x01 }, { 0x4FC1FFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index b89dfcd5ef5..c92b8a04ad6 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -41,7 +41,7 @@ typedef enum FairySpawnerState { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -49,7 +49,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000020, 0x00, 0x00 }, ATELEM_NONE, diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 3d594f31d87..75aadca5691 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -4408,7 +4408,7 @@ void func_8083821C(Player* this) { } void func_80838280(Player* this) { - if (this->actor.colChkInfo.acHitEffect == 1) { + if (this->actor.colChkInfo.playerACHitReaction == PLAYER_AC_HIT_REACTION_1) { func_8083821C(this); } Player_PlayVoiceSfx(this, NA_SE_VO_LI_FALL_L); @@ -4518,7 +4518,7 @@ s32 func_808382DC(Player* this, PlayState* play) { } } - if (sp64 && (this->shieldQuad.elem.acHitElem->atDmgInfo.effect == 1)) { + if (sp64 && (this->shieldQuad.elem.acHitElem->atDmgInfo.playerACHitReaction == 1)) { func_8083819C(this, play); } @@ -4541,11 +4541,11 @@ s32 func_808382DC(Player* this, PlayState* play) { if (this->stateFlags1 & PLAYER_STATE1_27) { sp4C = 0; - } else if (this->actor.colChkInfo.acHitEffect == 2) { + } else if (this->actor.colChkInfo.playerACHitReaction == PLAYER_AC_HIT_REACTION_2) { sp4C = 3; - } else if (this->actor.colChkInfo.acHitEffect == 3) { + } else if (this->actor.colChkInfo.playerACHitReaction == PLAYER_AC_HIT_REACTION_3) { sp4C = 4; - } else if (this->actor.colChkInfo.acHitEffect == 4) { + } else if (this->actor.colChkInfo.playerACHitReaction == PLAYER_AC_HIT_REACTION_4) { sp4C = 1; } else { func_80838280(this); @@ -8602,7 +8602,7 @@ s32 func_80842DF4(PlayState* play, Player* this) { if ((func_80842AC4(play, this) == 0) && (this->heldItemAction != PLAYER_IA_HAMMER)) { func_80842B7C(play, this); - if (this->actor.colChkInfo.atHitEffect == 1) { + if (this->actor.colChkInfo.playerATHitReaction == PLAYER_AT_HIT_REACTION_1) { this->actor.colChkInfo.damage = 8; func_80837C0C(play, this, 4, 0.0f, 0.0f, this->actor.shape.rot.y, 20); return 1; @@ -9894,7 +9894,7 @@ void Player_Action_80846578(Player* this, PlayState* play) { static ColliderCylinderInit D_80854624 = { { - COLTYPE_HIT5, + COL_MATERIAL_HIT5, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -9902,7 +9902,7 @@ static ColliderCylinderInit D_80854624 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -9914,7 +9914,7 @@ static ColliderCylinderInit D_80854624 = { static ColliderQuadInit D_80854650 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, @@ -9922,7 +9922,7 @@ static ColliderQuadInit D_80854650 = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000100, 0x00, 0x01 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -9934,7 +9934,7 @@ static ColliderQuadInit D_80854650 = { static ColliderQuadInit D_808546A0 = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_PLAYER, AC_ON | AC_HARD | AC_TYPE_ENEMY, OC1_NONE, @@ -9942,7 +9942,7 @@ static ColliderQuadInit D_808546A0 = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00100000, 0x00, 0x00 }, { 0xDFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, diff --git a/tools/namefixer.py b/tools/namefixer.py index 150d094c44e..8349032befb 100755 --- a/tools/namefixer.py +++ b/tools/namefixer.py @@ -216,13 +216,13 @@ "bumper.flags":"bumper.dmgFlags", "maskA ":"ocFlags1 ", "maskB ":"ocFlags2 ", - ".base.type":".base.colType", - "COLTYPE_UNK11":"COLTYPE_HARD", - "COLTYPE_UNK12":"COLTYPE_WOOD", - "COLTYPE_UNK13":"COLTYPE_TREE", - "COLTYPE_METAL_SHIELD":"COLTYPE_METAL", - "COLTYPE_UNK10":"COLTYPE_NONE", - "COLTYPE_UNK":"COLTYPE_HIT", + ".base.type":".base.colMaterial", + "COL_MATERIAL_UNK11":"COL_MATERIAL_HARD", + "COL_MATERIAL_UNK12":"COL_MATERIAL_WOOD", + "COL_MATERIAL_UNK13":"COL_MATERIAL_TREE", + "COL_MATERIAL_METAL_SHIELD":"COL_MATERIAL_METAL", + "COL_MATERIAL_UNK10":"COL_MATERIAL_NONE", + "COL_MATERIAL_UNK":"COL_MATERIAL_HIT", "info.flags":"info.elemtype", "ColliderBody":"ColliderInfo", "ColliderJntSphItem":"ColliderJntSphElement", diff --git a/tools/overlayhelpers/colliderinit.py b/tools/overlayhelpers/colliderinit.py index b82b781d837..be1a18ea8c7 100755 --- a/tools/overlayhelpers/colliderinit.py +++ b/tools/overlayhelpers/colliderinit.py @@ -10,20 +10,20 @@ T_ACTOR = '_Actor' TYPE_ENUM = [ - "COLTYPE_HIT0", - "COLTYPE_HIT1", - "COLTYPE_HIT2", - "COLTYPE_HIT3", - "COLTYPE_HIT4", - "COLTYPE_HIT5", - "COLTYPE_HIT6", - "COLTYPE_HIT7", - "COLTYPE_HIT8", - "COLTYPE_METAL", - "COLTYPE_NONE", - "COLTYPE_WOOD", - "COLTYPE_HARD", - "COLTYPE_TREE" ] + "COL_MATERIAL_HIT0", + "COL_MATERIAL_HIT1", + "COL_MATERIAL_HIT2", + "COL_MATERIAL_HIT3", + "COL_MATERIAL_HIT4", + "COL_MATERIAL_HIT5", + "COL_MATERIAL_HIT6", + "COL_MATERIAL_HIT7", + "COL_MATERIAL_HIT8", + "COL_MATERIAL_METAL", + "COL_MATERIAL_NONE", + "COL_MATERIAL_WOOD", + "COL_MATERIAL_HARD", + "COL_MATERIAL_TREE" ] SHAPE_ENUM = [ "COLSHAPE_JNTSPH", @@ -31,14 +31,14 @@ "COLSHAPE_TRIS", "COLSHAPE_QUAD" ] -ELEMTYPE_UNKENUM = [ - "ELEMTYPE_UNK0", - "ELEMTYPE_UNK1", - "ELEMTYPE_UNK2", - "ELEMTYPE_UNK3", - "ELEMTYPE_UNK4", - "ELEMTYPE_UNK5", - "ELEMTYPE_UNK6"] +ELEM_MATERIAL_UNKENUM = [ + "ELEM_MATERIAL_UNK0", + "ELEM_MATERIAL_UNK1", + "ELEM_MATERIAL_UNK2", + "ELEM_MATERIAL_UNK3", + "ELEM_MATERIAL_UNK4", + "ELEM_MATERIAL_UNK5", + "ELEM_MATERIAL_UNK6"] ATFLAGS_ENUM = [ "AT_ON", @@ -254,7 +254,7 @@ def GetItems(data, off, count, structf, fmt, size): cItem = struct.unpack_from(structf, data, off + 0x18 + ioff) if cBody[0] < 7: - cBody[0] = ELEMTYPE_UNKENUM[cBody[0]] + cBody[0] = ELEM_MATERIAL_UNKENUM[cBody[0]] else: cBody[0] = '0x{0:02X}'.format(cBody[0]) @@ -302,7 +302,7 @@ def GetCylinder(data, off, type): cCyl16 = struct.unpack_from(sf_Cylinder16, data, off + 0x20) if cBody[0] < 7: - cBody[0] = ELEMTYPE_UNKENUM[cBody[0]] + cBody[0] = ELEM_MATERIAL_UNKENUM[cBody[0]] else: cBody[0] = '0x{0:02X}'.format(cBody[0]) @@ -335,7 +335,7 @@ def GetQuad(data, off, type): cQuad = struct.unpack_from(sf_Quad, data, off + 0x20) if cBody[0] < 7: - cBody[0] = ELEMTYPE_UNKENUM[cBody[0]] + cBody[0] = ELEM_MATERIAL_UNKENUM[cBody[0]] else: cBody[0] = '0x{0:02X}'.format(cBody[0])