From a3aa58a5c303013656ef58ca2e1633be8869d310 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Fri, 15 Mar 2024 22:52:29 +0100 Subject: [PATCH 01/12] name fields under scrutinity uniquely --- docs/tutorial/introduction.md | 2 +- include/z64actor.h | 8 +-- include/z64collision_check.h | 28 ++++---- src/code/z_actor.c | 44 ++++++------ src/code/z_collision_check.c | 71 ++++++++++--------- src/code/z_player_lib.c | 2 +- .../actors/ovl_Arms_Hook/z_arms_hook.c | 2 +- .../actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c | 2 +- .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 6 +- src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 2 +- src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c | 16 ++--- .../actors/ovl_Boss_Ganon/z_boss_ganon.c | 16 ++--- .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 8 +-- .../ovl_Boss_Ganondrof/z_boss_ganondrof.c | 12 ++-- .../actors/ovl_Boss_Goma/z_boss_goma.c | 6 +- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 12 ++-- src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 18 ++--- src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 18 ++--- src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 14 ++-- .../actors/ovl_Door_Killer/z_door_killer.c | 4 +- src/overlays/actors/ovl_En_Am/z_en_am.c | 18 ++--- .../actors/ovl_En_Anubice/z_en_anubice.c | 2 +- .../ovl_En_Anubice_Fire/z_en_anubice_fire.c | 2 +- src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 6 +- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 14 ++-- .../actors/ovl_En_Bigokuta/z_en_bigokuta.c | 8 +-- src/overlays/actors/ovl_En_Bili/z_en_bili.c | 10 +-- src/overlays/actors/ovl_En_Bom/z_en_bom.c | 2 +- src/overlays/actors/ovl_En_Brob/z_en_brob.c | 8 +-- .../actors/ovl_En_Bubble/z_en_bubble.c | 8 +-- src/overlays/actors/ovl_En_Bw/z_en_bw.c | 10 +-- src/overlays/actors/ovl_En_Crow/z_en_crow.c | 8 +-- .../actors/ovl_En_Dekubaba/z_en_dekubaba.c | 26 +++---- .../actors/ovl_En_Dekunuts/z_en_dekunuts.c | 8 +-- src/overlays/actors/ovl_En_Dh/z_en_dh.c | 24 +++---- src/overlays/actors/ovl_En_Dha/z_en_dha.c | 2 +- .../actors/ovl_En_Dodojr/z_en_dodojr.c | 4 +- .../actors/ovl_En_Dodongo/z_en_dodongo.c | 20 +++--- src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c | 18 ++--- src/overlays/actors/ovl_En_Fd/z_en_fd.c | 2 +- .../actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c | 2 +- .../actors/ovl_En_Firefly/z_en_firefly.c | 12 ++-- .../actors/ovl_En_Floormas/z_en_floormas.c | 34 ++++----- src/overlays/actors/ovl_En_Fw/z_en_fw.c | 2 +- src/overlays/actors/ovl_En_Fz/z_en_fz.c | 2 +- .../actors/ovl_En_G_Switch/z_en_g_switch.c | 2 +- src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 4 +- src/overlays/actors/ovl_En_GeldB/z_en_geldb.c | 10 +-- src/overlays/actors/ovl_En_Goma/z_en_goma.c | 2 +- src/overlays/actors/ovl_En_Gs/z_en_gs.c | 2 +- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 2 +- src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 2 +- .../actors/ovl_En_Kanban/z_en_kanban.c | 2 +- .../actors/ovl_En_Karebaba/z_en_karebaba.c | 8 +-- .../actors/ovl_En_M_Thunder/z_en_m_thunder.c | 6 +- src/overlays/actors/ovl_En_Mb/z_en_mb.c | 14 ++-- .../actors/ovl_En_Nutsball/z_en_nutsball.c | 2 +- src/overlays/actors/ovl_En_Ny/z_en_ny.c | 4 +- src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 6 +- .../actors/ovl_En_Peehat/z_en_peehat.c | 14 ++-- .../actors/ovl_En_Po_Field/z_en_po_field.c | 4 +- .../ovl_En_Po_Sisters/z_en_po_sisters.c | 28 ++++---- src/overlays/actors/ovl_En_Poh/z_en_poh.c | 4 +- src/overlays/actors/ovl_En_Rd/z_en_rd.c | 2 +- src/overlays/actors/ovl_En_Reeba/z_en_reeba.c | 6 +- src/overlays/actors/ovl_En_Rr/z_en_rr.c | 8 +-- src/overlays/actors/ovl_En_Sb/z_en_sb.c | 2 +- src/overlays/actors/ovl_En_Skb/z_en_skb.c | 12 ++-- src/overlays/actors/ovl_En_Skj/z_en_skj.c | 2 +- src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 22 +++--- src/overlays/actors/ovl_En_St/z_en_st.c | 28 ++++---- src/overlays/actors/ovl_En_Sw/z_en_sw.c | 4 +- src/overlays/actors/ovl_En_Test/z_en_test.c | 20 +++--- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 8 +-- .../actors/ovl_En_Torch2/z_en_torch2.c | 20 +++--- src/overlays/actors/ovl_En_Tp/z_en_tp.c | 8 +-- src/overlays/actors/ovl_En_Vali/z_en_vali.c | 20 +++--- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 14 ++-- .../actors/ovl_En_Weiyer/z_en_weiyer.c | 4 +- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 16 ++--- .../ovl_En_Wonder_Item/z_en_wonder_item.c | 4 +- src/overlays/actors/ovl_En_Zf/z_en_zf.c | 12 ++-- .../actors/ovl_Magic_Fire/z_magic_fire.c | 4 +- .../actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c | 2 +- src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c | 2 +- .../actors/ovl_Obj_Hamishi/z_obj_hamishi.c | 2 +- .../actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c | 2 +- .../actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 6 +- .../actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 2 +- .../actors/ovl_player_actor/z_player.c | 28 ++++---- tools/namefixer.py | 2 +- 91 files changed, 461 insertions(+), 460 deletions(-) diff --git a/docs/tutorial/introduction.md b/docs/tutorial/introduction.md index b9a658d531b..f2f3b789108 100644 --- a/docs/tutorial/introduction.md +++ b/docs/tutorial/introduction.md @@ -33,7 +33,7 @@ void func_80A13098(EnFirefly* this) { } else { this->actor.params -= 2; } - this->collider.list->body.atDmgInfo.effect = 1; + this->collider.list->body.atDmgInfo.effect_ColliderElementDamageInfoAT = 1; this->auraType = 1; this->onFire = 1; this->actor.naviEnemyId = 0x11; diff --git a/include/z64actor.h b/include/z64actor.h index 088a90ab754..699ea874d08 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -126,10 +126,10 @@ typedef struct { /* 0x14 */ s16 cylYShift; // Unused. Purpose inferred from Cylinder16 and CollisionCheck_CylSideVsLineSeg /* 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 + /* 0x18 */ u8 damage_CollisionCheckInfo; // Amount to decrement health by + /* 0x19 */ u8 damageEffect_CollisionCheckInfo; // Stores what effect should occur when hit by a weapon + /* 0x1A */ u8 atHitEffect_CollisionCheckInfo; // Stores what effect should occur when AT connects with an AC + /* 0x1B */ u8 acHitEffect_CollisionCheckInfo; // Stores what effect should occur when AC is touched by an AT } CollisionCheckInfo; // size = 0x1C typedef struct { diff --git a/include/z64collision_check.h b/include/z64collision_check.h index aa69dedb072..63710b3fed0 100644 --- a/include/z64collision_check.h +++ b/include/z64collision_check.h @@ -46,12 +46,12 @@ typedef struct { /* 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 colType_Collider; // Determines hitmarks and sound effects during AC collisions. See `ColliderType` enum /* 0x15 */ u8 shape; // See `ColliderShape` enum } Collider; // size = 0x18 typedef struct { - /* 0x00 */ u8 colType; + /* 0x00 */ u8 colType_ColliderInit; /* 0x01 */ u8 atFlags; /* 0x02 */ u8 acFlags; /* 0x03 */ u8 ocFlags1; @@ -60,7 +60,7 @@ typedef struct { } ColliderInit; // size = 0x06 typedef struct { - /* 0x00 */ u8 colType; + /* 0x00 */ u8 colType_ColliderInitType1; /* 0x01 */ u8 atFlags; /* 0x02 */ u8 acFlags; /* 0x03 */ u8 ocFlags1; @@ -76,22 +76,22 @@ typedef struct { } ColliderInitToActor; // size = 0x08 typedef struct { - /* 0x00 */ u32 dmgFlags; // Damage types dealt by this collider element as AT. - /* 0x04 */ u8 effect; // Damage Effect (Knockback, Fire, etc.) - /* 0x05 */ u8 damage; // Damage + /* 0x00 */ u32 dmgFlags_ColliderElementDamageInfoAT; // Damage types dealt by this collider element as AT. + /* 0x04 */ u8 effect_ColliderElementDamageInfoAT; // Damage Effect (Knockback, Fire, etc.) + /* 0x05 */ u8 damage_ColliderElementDamageInfoAT; // Damage } ColliderElementDamageInfoAT; // size = 0x08 typedef struct { - /* 0x00 */ u32 dmgFlags; // Damage types that may affect this collider element as AC. - /* 0x04 */ u8 effect; // Damage Effect (Knockback, Fire, etc.) - /* 0x05 */ u8 defense; // Damage Resistance + /* 0x00 */ u32 dmgFlags_ColliderElementDamageInfoAC; // Damage types that may affect this collider element as AC. + /* 0x04 */ u8 effect_ColliderElementDamageInfoAC; // Damage Effect (Knockback, Fire, etc.) + /* 0x05 */ u8 defense_ColliderElementDamageInfoAC; // Damage Resistance /* 0x06 */ Vec3s hitPos; // Point of contact } ColliderElementDamageInfoAC; // size = 0x0C typedef struct { - /* 0x00 */ u32 dmgFlags; // Damage types that may affect this collider element as AC. - /* 0x04 */ u8 effect; // Damage Effect (Knockback, Fire, etc.) - /* 0x05 */ u8 defense; // Damage Resistance + /* 0x00 */ u32 dmgFlags_ColliderElementDamageInfoACInit; // Damage types that may affect this collider element as AC. + /* 0x04 */ u8 effect_ColliderElementDamageInfoACInit; // Damage Effect (Knockback, Fire, etc.) + /* 0x05 */ u8 defense_ColliderElementDamageInfoACInit; // Damage Resistance } ColliderElementDamageInfoACInit; // size = 0x08 /** @@ -114,7 +114,7 @@ typedef enum { 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 elemType_ColliderElement; // Affects sfx reaction when attacked by Link and hookability. Full purpose unknown. /* 0x15 */ u8 atElemFlags; // Information flags for AT collisions /* 0x16 */ u8 acElemFlags; // Information flags for AC collisions /* 0x17 */ u8 ocElemFlags; // Information flags for OC collisions @@ -125,7 +125,7 @@ typedef struct ColliderElement { } ColliderElement; // size = 0x28 typedef struct { - /* 0x00 */ u8 elemType; // Affects sfx reaction when attacked by Link and hookability. Full purpose unknown. + /* 0x00 */ u8 elemType_ColliderElementInit; // Affects sfx reaction when attacked by Link and hookability. Full purpose unknown. /* 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 diff --git a/src/code/z_actor.c b/src/code/z_actor.c index d9b7f579c55..d85085e8ea5 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -4312,10 +4312,10 @@ u8 func_800355E4(PlayState* play, Collider* collider) { } u8 Actor_ApplyDamage(Actor* actor) { - if (actor->colChkInfo.damage >= actor->colChkInfo.health) { + if (actor->colChkInfo.damage_CollisionCheckInfo >= actor->colChkInfo.health) { actor->colChkInfo.health = 0; } else { - actor->colChkInfo.health -= actor->colChkInfo.damage; + actor->colChkInfo.health -= actor->colChkInfo.damage_CollisionCheckInfo; } return actor->colChkInfo.health; @@ -4324,24 +4324,24 @@ u8 Actor_ApplyDamage(Actor* actor) { void Actor_SetDropFlag(Actor* actor, ColliderElement* elem, s32 freezeFlag) { if (elem->acHitElem == NULL) { actor->dropFlag = 0x00; - } else if (freezeFlag && (elem->acHitElem->atDmgInfo.dmgFlags & (DMG_UNKNOWN_1 | DMG_MAGIC_ICE | DMG_MAGIC_FIRE))) { - actor->freezeTimer = elem->acHitElem->atDmgInfo.damage; + } else if (freezeFlag && (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_UNKNOWN_1 | DMG_MAGIC_ICE | DMG_MAGIC_FIRE))) { + actor->freezeTimer = elem->acHitElem->atDmgInfo.damage_ColliderElementDamageInfoAT; actor->dropFlag = 0x00; - } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_FIRE) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_FIRE) { actor->dropFlag = 0x01; - } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_ICE) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_ICE) { actor->dropFlag = 0x02; - } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_UNK1) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_UNK1) { actor->dropFlag = 0x04; - } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_UNK2) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_UNK2) { actor->dropFlag = 0x08; - } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_UNK3) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_UNK3) { actor->dropFlag = 0x10; - } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_LIGHT) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_LIGHT) { actor->dropFlag = 0x20; - } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_MAGIC_LIGHT) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_MAGIC_LIGHT) { if (freezeFlag) { - actor->freezeTimer = elem->acHitElem->atDmgInfo.damage; + actor->freezeTimer = elem->acHitElem->atDmgInfo.damage_ColliderElementDamageInfoAT; } actor->dropFlag = 0x40; } else { @@ -4361,24 +4361,24 @@ void Actor_SetDropFlagJntSph(Actor* actor, ColliderJntSph* jntSph, s32 freezeFla if (elem->acHitElem == NULL) { flag = 0x00; } else if (freezeFlag && - (elem->acHitElem->atDmgInfo.dmgFlags & (DMG_UNKNOWN_1 | DMG_MAGIC_ICE | DMG_MAGIC_FIRE))) { - actor->freezeTimer = elem->acHitElem->atDmgInfo.damage; + (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_UNKNOWN_1 | DMG_MAGIC_ICE | DMG_MAGIC_FIRE))) { + actor->freezeTimer = elem->acHitElem->atDmgInfo.damage_ColliderElementDamageInfoAT; flag = 0x00; - } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_FIRE) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_FIRE) { flag = 0x01; - } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_ICE) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_ICE) { flag = 0x02; - } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_UNK1) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_UNK1) { flag = 0x04; - } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_UNK2) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_UNK2) { flag = 0x08; - } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_UNK3) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_UNK3) { flag = 0x10; - } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_LIGHT) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_LIGHT) { flag = 0x20; - } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_MAGIC_LIGHT) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_MAGIC_LIGHT) { if (freezeFlag) { - actor->freezeTimer = elem->acHitElem->atDmgInfo.damage; + actor->freezeTimer = elem->acHitElem->atDmgInfo.damage_ColliderElementDamageInfoAT; } flag = 0x40; } else { diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 14822cf1cd0..7fc9966aa7a 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -103,7 +103,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->colType_Collider = src->colType_ColliderInitType1; col->atFlags = src->atFlags; col->acFlags = src->acFlags; col->ocFlags1 = src->ocFlags1; @@ -114,7 +114,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->colType_Collider = src->colType_ColliderInit; col->atFlags = src->atFlags; col->acFlags = src->acFlags; col->ocFlags1 = src->ocFlags1; @@ -152,9 +152,9 @@ s32 Collider_DestroyElementDamageInfoAT(PlayState* play, ColliderElementDamageIn s32 Collider_SetElementDamageInfoAT(PlayState* play, ColliderElementDamageInfoAT* dest, ColliderElementDamageInfoAT* src) { - dest->dmgFlags = src->dmgFlags; - dest->effect = src->effect; - dest->damage = src->damage; + dest->dmgFlags_ColliderElementDamageInfoAT = src->dmgFlags_ColliderElementDamageInfoAT; + dest->effect_ColliderElementDamageInfoAT = src->effect_ColliderElementDamageInfoAT; + dest->damage_ColliderElementDamageInfoAT = src->damage_ColliderElementDamageInfoAT; return true; } @@ -174,9 +174,9 @@ s32 Collider_DestroyElementDamageInfoAC(PlayState* play, ColliderElementDamageIn s32 Collider_SetElementDamageInfoAC(PlayState* play, ColliderElementDamageInfoAC* acDmgInfo, ColliderElementDamageInfoACInit* init) { - acDmgInfo->dmgFlags = init->dmgFlags; - acDmgInfo->effect = init->effect; - acDmgInfo->defense = init->defense; + acDmgInfo->dmgFlags_ColliderElementDamageInfoAC = init->dmgFlags_ColliderElementDamageInfoACInit; + acDmgInfo->effect_ColliderElementDamageInfoAC = init->effect_ColliderElementDamageInfoACInit; + acDmgInfo->defense_ColliderElementDamageInfoAC = init->defense_ColliderElementDamageInfoACInit; return true; } @@ -202,7 +202,7 @@ s32 Collider_DestroyElement(PlayState* play, ColliderElement* elem) { } s32 Collider_SetElement(PlayState* play, ColliderElement* elem, ColliderElementInit* elemInit) { - elem->elemType = elemInit->elemType; + elem->elemType_ColliderElement = elemInit->elemType_ColliderElementInit; Collider_SetElementDamageInfoAT(play, &elem->atDmgInfo, &elemInit->atDmgInfo); Collider_SetElementDamageInfoAC(play, &elem->acDmgInfo, &elemInit->acDmgInfo); elem->atElemFlags = elemInit->atElemFlags; @@ -1386,7 +1386,8 @@ s32 CollisionCheck_IsElementNotAC(ColliderElement* elem) { * If the AT element has no dmgFlags in common with the AC element, no collision happens. */ s32 CollisionCheck_NoSharedFlags(ColliderElement* atElem, ColliderElement* acElem) { - if (!(atElem->atDmgInfo.dmgFlags & acElem->acDmgInfo.dmgFlags)) { + if (!(atElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & + acElem->acDmgInfo.dmgFlags_ColliderElementDamageInfoAC)) { return true; } return false; @@ -1536,7 +1537,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->colType_Collider != COLTYPE_METAL) { EffectSsHitMark_SpawnFixedScale(play, EFFECT_HITMARK_WHITE, hitPos); if (collider->actor == NULL) { Audio_PlaySfxGeneral(NA_SE_IT_SHIELD_BOUND, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, @@ -1545,7 +1546,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->colType_Collider == COLTYPE_METAL EffectSsHitMark_SpawnFixedScale(play, EFFECT_HITMARK_METAL, hitPos); if (collider->actor == NULL) { CollisionCheck_SpawnShieldParticlesMetal(play, hitPos); @@ -1574,20 +1575,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 elemType_ColliderElement. */ s32 CollisionCheck_SwordHitAudio(Collider* atCol, ColliderElement* acElem) { if (atCol->actor != NULL && atCol->actor->category == ACTORCAT_PLAYER) { - if (acElem->elemType == ELEMTYPE_UNK0) { + if (acElem->elemType_ColliderElement == ELEMTYPE_UNK0) { Audio_PlaySfxGeneral(NA_SE_IT_SWORD_STRIKE, &atCol->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - } else if (acElem->elemType == ELEMTYPE_UNK1) { + } else if (acElem->elemType_ColliderElement == ELEMTYPE_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->elemType_ColliderElement == ELEMTYPE_UNK2) { Audio_PlaySfxGeneral(NA_SE_NONE, &atCol->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - } else if (acElem->elemType == ELEMTYPE_UNK3) { + } else if (acElem->elemType_ColliderElement == ELEMTYPE_UNK3) { Audio_PlaySfxGeneral(NA_SE_NONE, &atCol->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } @@ -1647,7 +1648,7 @@ static HitInfo sHitInfo[] = { }; /** - * 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 colType_Collider */ void CollisionCheck_HitEffects(PlayState* play, Collider* atCol, ColliderElement* atElem, Collider* acCol, ColliderElement* acElem, Vec3f* hitPos) { @@ -1658,12 +1659,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->colType_Collider].blood](play, acCol, hitPos); } if (acCol->actor != NULL) { - if (sHitInfo[acCol->colType].effect == HIT_SOLID) { + if (sHitInfo[acCol->colType_Collider].effect == HIT_SOLID) { CollisionCheck_HitSolid(play, atElem, acCol, hitPos); - } else if (sHitInfo[acCol->colType].effect == HIT_WOOD) { + } else if (sHitInfo[acCol->colType_Collider].effect == HIT_WOOD) { if (atCol->actor == NULL) { CollisionCheck_SpawnShieldParticles(play, hitPos); Audio_PlaySfxGeneral(NA_SE_IT_REFLECTION_WOOD, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, @@ -1671,8 +1672,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->colType_Collider].effect != HIT_NONE) { + EffectSsHitMark_SpawnFixedScale(play, sHitInfo[acCol->colType_Collider].effect, hitPos); if (!(acElem->acElemFlags & ACELEM_NO_SWORD_SFX)) { CollisionCheck_SwordHitAudio(atCol, acElem); } @@ -1712,7 +1713,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.atHitEffect_CollisionCheckInfo = acElem->acDmgInfo.effect_ColliderElementDamageInfoAC; } } acCol->acFlags |= AC_HIT; @@ -1721,13 +1722,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.acHitEffect_CollisionCheckInfo = atElem->atDmgInfo.effect_ColliderElementDamageInfoAT; } 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->colType_Collider != COLTYPE_METAL && + acCol->colType_Collider != COLTYPE_WOOD && acCol->colType_Collider != COLTYPE_HARD) { acElem->acElemFlags |= ACELEM_DRAW_HITMARK; } else { CollisionCheck_HitEffects(play, atCol, atElem, acCol, acElem, hitPos); @@ -2988,10 +2989,10 @@ void CollisionCheck_InitInfo(CollisionCheckInfo* info) { * Resets ColisionCheckInfo fields other than DamageTable, mass, and dim. */ void CollisionCheck_ResetDamage(CollisionCheckInfo* info) { - info->damage = 0; - info->damageEffect = 0; - info->atHitEffect = 0; - info->acHitEffect = 0; + info->damage_CollisionCheckInfo = 0; + info->damageEffect_CollisionCheckInfo = 0; + info->atHitEffect_CollisionCheckInfo = 0; + info->acHitEffect_CollisionCheckInfo = 0; info->displacement.x = info->displacement.y = info->displacement.z = 0.0f; } @@ -3055,13 +3056,13 @@ void CollisionCheck_ApplyDamage(PlayState* play, CollisionCheckContext* colChkCt ASSERT(elem->acHitElem != NULL, "pclobj_elem->ac_hit_elem != NULL", "../z_collision_check.c", 6493); tbl = col->actor->colChkInfo.damageTable; if (tbl == NULL) { - damage = (f32)elem->acHitElem->atDmgInfo.damage - elem->acDmgInfo.defense; + damage = (f32)elem->acHitElem->atDmgInfo.damage_ColliderElementDamageInfoAT - elem->acDmgInfo.defense_ColliderElementDamageInfoAC; if (damage < 0) { damage = 0; } } else { s32 i; - u32 flags = elem->acHitElem->atDmgInfo.dmgFlags; + u32 flags = elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT; for (i = 0; i < 32; i++, flags >>= 1) { if (flags == 1) { @@ -3070,10 +3071,10 @@ void CollisionCheck_ApplyDamage(PlayState* play, CollisionCheckContext* colChkCt } damage = tbl->table[i] & 0xF; - col->actor->colChkInfo.damageEffect = tbl->table[i] >> 4 & 0xF; + col->actor->colChkInfo.damageEffect_CollisionCheckInfo = tbl->table[i] >> 4 & 0xF; } if (!(col->acFlags & AC_HARD)) { - col->actor->colChkInfo.damage += damage; + col->actor->colChkInfo.damage_CollisionCheckInfo += damage; } } diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 5fc1c4863dc..bfaddd7596d 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -1256,7 +1256,7 @@ void Player_UpdateShieldCollider(PlayState* play, Player* this, ColliderQuad* co if (this->stateFlags1 & PLAYER_STATE1_22) { Vec3f quadDest[4]; - this->shieldQuad.base.colType = shieldColTypes[this->currentShield]; + this->shieldQuad.base.colType_Collider = 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 9552c454601..8d28fdcf645 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -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->elemType_ColliderElement != ELEMTYPE_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_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index f5396acc28a..2cb736ff9fb 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 @@ -96,7 +96,7 @@ void BgDdanKd_CheckForExplosions(BgDdanKd* this, PlayState* play) { explosive = Actor_GetCollidedExplosive(play, &this->collider.base); if (explosive != NULL) { - PRINTF("dam %d\n", this->dyna.actor.colChkInfo.damage); + PRINTF("dam %d\n", this->dyna.actor.colChkInfo.damage_CollisionCheckInfo); explosive->params = 2; } diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index a502fb6f2e5..7b8dc7fe5d8 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -1242,8 +1242,8 @@ void BossDodongo_UpdateDamage(BossDodongo* this, PlayState* play) { if (this->collider.elements[i].base.acElemFlags & ACELEM_HIT) { acHitElem = this->collider.elements[i].base.acHitElem; - if ((acHitElem->atDmgInfo.dmgFlags & DMG_BOOMERANG) || - (acHitElem->atDmgInfo.dmgFlags & DMG_SLINGSHOT)) { + if ((acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_BOOMERANG) || + (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SLINGSHOT)) { this->collider.elements[i].base.acElemFlags &= ~ACELEM_HIT; this->unk_1C0 = 2; BossDodongo_SetupWalk(this); @@ -1258,7 +1258,7 @@ void BossDodongo_UpdateDamage(BossDodongo* this, PlayState* play) { this->collider.elements[0].base.acElemFlags &= ~ACELEM_HIT; acHitElem = this->collider.elements[0].base.acHitElem; if ((this->actionFunc == BossDodongo_Vulnerable) || (this->actionFunc == BossDodongo_LayDown)) { - swordDamage = damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags); + swordDamage = damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT); if (damage != 0) { Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_K_DAMAGE); diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index 6ba94dbed53..7d1f4cc909b 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -1291,7 +1291,7 @@ void BossFd_CollisionCheck(BossFd* this, PlayState* play) { headCollider->base.acElemFlags &= ~ACELEM_HIT; acHitElem = headCollider->base.acHitElem; this->actor.colChkInfo.health -= 2; - if (acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_ICE) { + if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_ICE) { this->actor.colChkInfo.health -= 2; } if ((s8)this->actor.colChkInfo.health <= 2) { 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 7a0895bdc1d..71e840f6326 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.elemType_ColliderElement = ELEMTYPE_UNK2; + this->collider.base.colType_Collider = COLTYPE_METAL; } else { - this->collider.elements[0].base.elemType = ELEMTYPE_UNK3; - this->collider.base.colType = COLTYPE_HIT3; + this->collider.elements[0].base.elemType_ColliderElement = ELEMTYPE_UNK3; + this->collider.base.colType_Collider = COLTYPE_HIT3; } if (this->collider.elements[0].base.acElemFlags & ACELEM_HIT) { @@ -834,7 +834,7 @@ void BossFd2_CollisionCheck(BossFd2* this, PlayState* play) { acHitElem = this->collider.elements[0].base.acHitElem; if (!bossFd->faceExposed) { - if (acHitElem->atDmgInfo.dmgFlags & DMG_HAMMER) { + if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HAMMER) { bossFd->actor.colChkInfo.health -= 2; if ((s8)bossFd->actor.colChkInfo.health <= 2) { bossFd->actor.colChkInfo.health = 1; @@ -865,12 +865,12 @@ void BossFd2_CollisionCheck(BossFd2* this, PlayState* play) { u8 canKill = false; u8 damage; - if ((damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags)) == 0) { - damage = (acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_ICE) ? 4 : 2; + if ((damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT)) == 0) { + damage = (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_ICE) ? 4 : 2; } else { canKill = true; } - if (acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT) { + if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT) { damage = 0; } if (((s8)bossFd->actor.colChkInfo.health > 2) || canKill) { 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 04987243692..971f8c0e15a 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -2370,7 +2370,7 @@ void BossGanon_SetupBlock(BossGanon* this, PlayState* play) { } void BossGanon_Block(BossGanon* this, PlayState* play) { - this->collider.base.colType = 9; + this->collider.base.colType_Collider = 9; SkelAnime_Update(&this->skelAnime); sCape->backPush = -9.0f; sCape->backSwayMagnitude = 0.25f; @@ -2691,14 +2691,14 @@ void BossGanon_UpdateDamage(BossGanon* this, PlayState* play) { acHitElem = this->collider.elem.acHitElem; if ((this->actionFunc == BossGanon_HitByLightBall) || (this->actionFunc == BossGanon_ChargeBigMagic)) { - if (acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_LIGHT) { + if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_LIGHT) { BossGanon_SetupVulnerable(this, play); this->timers[2] = 0; Actor_PlaySfx(&this->actor, NA_SE_EN_GANON_DAMAGE1); this->unk_1A6 = 15; } } else if ((this->actionFunc == BossGanon_Vulnerable) && (this->unk_1C2 >= 3)) { - if (!(acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT)) { + if (!(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT)) { u8 hitWithSword = false; u8 damage; Vec3f sp50; @@ -2712,7 +2712,7 @@ void BossGanon_UpdateDamage(BossGanon* this, PlayState* play) { 0x1E); } - damage = flags = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags); + damage = flags = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT); if (flags == 0) { damage = 2; @@ -2746,7 +2746,7 @@ void BossGanon_UpdateDamage(BossGanon* this, PlayState* play) { sCape->tearTimer = 1; } } - } else if (acHitElem->atDmgInfo.dmgFlags & DMG_RANGED) { + } else if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_RANGED) { Actor_PlaySfx(&this->actor, 0); for (i = 0; i < ARRAY_COUNT(sCape->strands); i++) { @@ -2821,7 +2821,7 @@ void BossGanon_Update(Actor* thisx, PlayState* play2) { } } - this->collider.base.colType = 3; + this->collider.base.colType_Collider = 3; sCape->gravity = -3.0f; this->shockGlow = false; this->actor.flags &= ~ACTOR_FLAG_0; @@ -3941,7 +3941,7 @@ void BossGanon_LightBall_Update(Actor* thisx, PlayState* play2) { this->collider.base.acFlags &= ~AC_HIT; - if ((hitWithBottle == false) && (acHitElem->atDmgInfo.dmgFlags & DMG_SHIELD)) { + if ((hitWithBottle == false) && (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SHIELD)) { spBA = 2; Audio_PlaySfxGeneral(NA_SE_IT_SHIELD_REFLECT_MG, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, @@ -4427,7 +4427,7 @@ void func_808E2544(Actor* thisx, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; - if (!(acHitElem->atDmgInfo.dmgFlags & DMG_SHIELD) || Player_HasMirrorShieldEquipped(play)) { + if (!(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SHIELD) || Player_HasMirrorShieldEquipped(play)) { Rumble_Request(this->actor.xyzDistToPlayerSq, 180, 20, 100); this->unk_1C2 = 0xC; this->actor.speed = -30.0f; diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index ced201f7b15..f3536b3d17e 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -1899,13 +1899,13 @@ void BossGanon2_CollisionCheck(BossGanon2* this, PlayState* play) { if (this->unk_424.elements[0].base.acElemFlags & ACELEM_HIT) { this->unk_424.elements[0].base.acElemFlags &= ~ACELEM_HIT; acHitElem = this->unk_424.elements[0].base.acHitElem; - if ((acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_LIGHT) && (this->actionFunc != func_80900890)) { + if ((acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_LIGHT) && (this->actionFunc != func_80900890)) { func_809000A0(this, play); Actor_PlaySfx(&this->actor, NA_SE_EN_FANTOM_HIT_THUNDER); Actor_PlaySfx(&this->actor, NA_SE_EN_MGANON_DAMAGE); Audio_StopSfxById(NA_SE_EN_MGANON_UNARI); } else if ((this->actionFunc == func_80900890) && - (acHitElem->atDmgInfo.dmgFlags & (DMG_JUMP_MASTER | DMG_SPIN_MASTER | DMG_SLASH_MASTER))) { + (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_JUMP_MASTER | DMG_SPIN_MASTER | DMG_SLASH_MASTER))) { this->unk_316 = 60; this->unk_342 = 5; Actor_PlaySfx(&this->actor, NA_SE_EN_MGANON_DAMAGE); @@ -1937,8 +1937,8 @@ void BossGanon2_CollisionCheck(BossGanon2* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_EN_MGANON_DAMAGE); Audio_StopSfxById(NA_SE_EN_MGANON_UNARI); phi_v1_2 = 1; - if (acHitElem->atDmgInfo.dmgFlags & (DMG_JUMP_MASTER | DMG_SPIN_MASTER | DMG_SLASH_MASTER)) { - if (acHitElem->atDmgInfo.dmgFlags & DMG_JUMP_MASTER) { + if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_JUMP_MASTER | DMG_SPIN_MASTER | DMG_SLASH_MASTER)) { + if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_JUMP_MASTER) { phi_v1_2 = 4; } else { phi_v1_2 = 2; 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 dae6502be4b..f2edacb80ad 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -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.colType_Collider = COLTYPE_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.colType_Collider = COLTYPE_METAL; SkelAnime_Update(&this->skelAnime); switch (this->work[GND_ACTION_STATE]) { case CHARGE_WINDUP: @@ -1239,14 +1239,14 @@ void BossGanondrof_CollisionCheck(BossGanondrof* this, PlayState* play) { } if (this->flyMode != GND_FLY_PAINTING) { if (acHit && (this->actionFunc != BossGanondrof_Stunned) && - (acHitElem->atDmgInfo.dmgFlags & DMG_RANGED)) { + (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_RANGED)) { Actor_PlaySfx(&this->actor, NA_SE_NONE); PRINTF("hit != 0 \n"); } else if (this->actionFunc != BossGanondrof_Charge) { if (this->returnCount == 0) { u8 dmg; u8 canKill = false; - s32 dmgFlags = acHitElem->atDmgInfo.dmgFlags; + s32 dmgFlags = acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT; if (dmgFlags & DMG_HOOKSHOT) { return; @@ -1273,7 +1273,7 @@ void BossGanondrof_CollisionCheck(BossGanondrof* this, PlayState* play) { } else { Actor_PlaySfx(&this->actor, NA_SE_NONE); } - } else if (acHit && (acHitElem->atDmgInfo.dmgFlags & DMG_RANGED)) { + } else if (acHit && (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_RANGED)) { this->work[GND_INVINC_TIMER] = 10; this->actor.colChkInfo.health -= 2; horse->hitTimer = 20; @@ -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.colType_Collider = COLTYPE_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 bdbf0fcf035..a189add10a2 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -1820,7 +1820,7 @@ void BossGoma_UpdateHit(BossGoma* this, PlayState* play) { BossGoma_SetupFallStruckDown(this); Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_DAM2); } else if (this->actionFunc == BossGoma_FloorStunned && - (damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags)) != 0) { + (damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT)) != 0) { this->actor.colChkInfo.health -= damage; if ((s8)this->actor.colChkInfo.health > 0) { @@ -1834,14 +1834,14 @@ void BossGoma_UpdateHit(BossGoma* this, PlayState* play) { this->invincibilityFrames = 10; } else if (this->actionFunc != BossGoma_FloorStunned && this->patienceTimer != 0 && - (acHitElem->atDmgInfo.dmgFlags & (DMG_SLINGSHOT | DMG_DEKU_NUT))) { + (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_SLINGSHOT | DMG_DEKU_NUT))) { Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_DAM2); Audio_StopSfxById(NA_SE_EN_GOMA_CRY1); this->invincibilityFrames = 10; BossGoma_SetupFloorStunned(this); this->sfxFaintTimer = 100; - if (acHitElem->atDmgInfo.dmgFlags & DMG_DEKU_NUT) { + if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_DEKU_NUT) { this->framesUntilNextAction = 40; } else { this->framesUntilNextAction = 90; diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index 94021d0ee1c..f906fcdb185 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -1154,14 +1154,14 @@ void BossMo_TentCollisionCheck(BossMo* this, PlayState* play) { } acHitElem = this->tentCollider.elements[i1].base.acHitElem; this->work[MO_TENT_INVINC_TIMER] = 5; - if (acHitElem->atDmgInfo.dmgFlags & DMG_MAGIC_FIRE) { + if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_MAGIC_FIRE) { Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_CUT); this->cutIndex = 15; this->meltIndex = this->cutIndex + 1; this->work[MO_TENT_ACTION_STATE] = MO_TENT_CUT; this->timers[0] = 40; this->cutScale = 1.0f; - } else if (acHitElem->atDmgInfo.dmgFlags & (DMG_JUMP_MASTER | DMG_JUMP_GIANT | DMG_SPIN_MASTER | + } else if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_JUMP_MASTER | DMG_JUMP_GIANT | DMG_SPIN_MASTER | DMG_SPIN_GIANT | DMG_SLASH_GIANT | DMG_SLASH_MASTER)) { this->playerHitTimer = 5; } @@ -1755,13 +1755,13 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) { // "hit!!" PRINTF("Core_Damage_check 当り！！\n"); this->coreCollider.base.acFlags &= ~AC_HIT; - if ((acHitElem->atDmgInfo.dmgFlags & DMG_MAGIC_FIRE) && (this->work[MO_TENT_ACTION_STATE] == MO_CORE_ATTACK)) { + if ((acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_MAGIC_FIRE) && (this->work[MO_TENT_ACTION_STATE] == MO_CORE_ATTACK)) { this->work[MO_TENT_ACTION_STATE] = MO_CORE_RETREAT; } // "hit 2 !!" PRINTF("Core_Damage_check 当り 2 ！！\n"); if ((this->work[MO_TENT_ACTION_STATE] != MO_CORE_UNDERWATER) && (this->work[MO_TENT_INVINC_TIMER] == 0)) { - u8 damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags); + u8 damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT); if ((damage != 0) && (this->work[MO_TENT_ACTION_STATE] < MO_CORE_ATTACK)) { // "sword hit !!" @@ -1799,8 +1799,8 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) { } } this->work[MO_TENT_INVINC_TIMER] = 10; - } else if (!(acHitElem->atDmgInfo.dmgFlags & DMG_SHIELD) && - (acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT)) { + } else if (!(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SHIELD) && + (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT)) { if (this->work[MO_TENT_ACTION_STATE] >= MO_CORE_ATTACK) { Sfx_PlaySfxAtPos(&sMorphaTent1->tentTipPos, NA_SE_EN_MOFER_CUT); sMorphaTent1->cutIndex = this->work[MO_CORE_POS_IN_TENT]; 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 dd2136039db..560a04fc2b5 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -873,7 +873,7 @@ void BossSst_HeadStunned(BossSst* this, PlayState* play) { void BossSst_HeadSetupVulnerable(BossSst* this) { Animation_MorphToLoop(&this->skelAnime, &gBongoHeadStunnedAnim, -5.0f); this->colliderCyl.base.acFlags |= AC_ON; - this->colliderCyl.elem.acDmgInfo.dmgFlags = DMG_SWORD | DMG_DEKU_STICK; + this->colliderCyl.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_SWORD | DMG_DEKU_STICK; this->actor.speed = 0.0f; this->colliderJntSph.elements[10].base.acElemFlags |= (ACELEM_ON | ACELEM_HOOKABLE); this->colliderJntSph.elements[0].base.acElemFlags &= ~ACELEM_ON; @@ -932,7 +932,7 @@ void BossSst_HeadDamage(BossSst* this, PlayState* play) { void BossSst_HeadSetupRecover(BossSst* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gBongoHeadRecoverAnim, -5.0f); this->colliderCyl.base.acFlags &= ~AC_ON; - this->colliderCyl.elem.acDmgInfo.dmgFlags = DMG_DEFAULT; + this->colliderCyl.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_DEFAULT; this->colliderJntSph.elements[10].base.acElemFlags &= ~(ACELEM_ON | ACELEM_HOOKABLE); this->colliderJntSph.elements[0].base.acElemFlags |= ACELEM_ON; this->vVanish = true; @@ -2500,17 +2500,17 @@ void BossSst_HandSetDamage(BossSst* this, s32 damage) { this->colliderJntSph.base.atFlags |= AT_ON; for (i = 0; i < 11; i++) { - this->colliderJntSph.elements[i].base.atDmgInfo.damage = damage; + this->colliderJntSph.elements[i].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 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.colType_Collider = COLTYPE_HARD; this->colliderJntSph.base.acFlags |= AC_HARD; } else { - this->colliderJntSph.base.colType = COLTYPE_HIT0; + this->colliderJntSph.base.colType_Collider = COLTYPE_HIT0; this->colliderJntSph.base.acFlags &= ~AC_HARD; } } @@ -2520,11 +2520,11 @@ 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.colType_Collider != COLTYPE_HARD)) { s32 bothHands = true; this->colliderJntSph.base.acFlags &= ~AC_HIT; - if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); this->colliderJntSph.base.acFlags &= ~AC_ON; this->colliderJntSph.base.ocFlags1 &= ~OC1_NO_PUSH; @@ -2535,7 +2535,7 @@ void BossSst_HandCollisionCheck(BossSst* this, PlayState* play) { } this->actor.flags &= ~ACTOR_FLAG_0; - if (this->actor.colChkInfo.damageEffect == 3) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 3) { BossSst_HandSetupFrozen(this); } else { BossSst_HandSetupReel(this); @@ -2555,7 +2555,7 @@ void BossSst_HandCollisionCheck(BossSst* this, PlayState* play) { void BossSst_HeadCollisionCheck(BossSst* this, PlayState* play) { if (this->colliderCyl.base.acFlags & AC_HIT) { this->colliderCyl.base.acFlags &= ~AC_HIT; - if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { if (this->actionFunc == BossSst_HeadVulnerable) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); 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 43722451508..1ac40266c03 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -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.effect_ColliderElementDamageInfoAT = 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.colType_Collider = COLTYPE_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.colType_Collider = COLTYPE_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.colType_Collider = COLTYPE_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); @@ -3097,7 +3097,7 @@ void BossTw_TwinrovaUpdate(Actor* thisx, PlayState* play2) { ColliderElement* acHitElem = this->collider.elem.acHitElem; this->collider.base.acFlags &= ~AC_HIT; - if (acHitElem->atDmgInfo.dmgFlags & (DMG_SLINGSHOT | DMG_ARROW)) {} + if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_SLINGSHOT | DMG_ARROW)) {} } } else if (this->collider.base.acFlags & AC_HIT) { u8 damage; @@ -3106,7 +3106,7 @@ void BossTw_TwinrovaUpdate(Actor* thisx, PlayState* play2) { this->collider.base.acFlags &= ~AC_HIT; swordDamage = false; - damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags); + damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT); if (damage == 0) { damage = 2; @@ -3114,7 +3114,7 @@ void BossTw_TwinrovaUpdate(Actor* thisx, PlayState* play2) { swordDamage = true; } - if (!(acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT)) { + if (!(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT)) { if (((s8)this->actor.colChkInfo.health < 3) && !swordDamage) { damage = 0; } @@ -4338,7 +4338,7 @@ s32 BossTw_BlastShieldCheck(BossTw* this, PlayState* play) { this->collider.base.atFlags &= ~AT_HIT; acHitElem = this->collider.elem.acHitElem; - if (acHitElem->atDmgInfo.dmgFlags & DMG_SHIELD) { + if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SHIELD) { this->work[INVINC_TIMER] = 7; play->envCtx.lightBlend = 1.0f; Rumble_Request(0.0f, 100, 5, 4); @@ -5435,7 +5435,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.colType_Collider = COLTYPE_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 49a3b69f638..6920b5c3deb 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -1128,7 +1128,7 @@ void BossVa_BodyPhase2(BossVa* this, PlayState* play) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 160); this->actor.colorFilterTimer = this->invincibilityTimer; } else { - this->colliderBody.elem.acDmgInfo.dmgFlags = DMG_BOOMERANG; + this->colliderBody.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_BOOMERANG; } } @@ -1138,7 +1138,7 @@ void BossVa_BodyPhase2(BossVa* this, PlayState* play) { if (this->colliderBody.base.ac->id == ACTOR_EN_BOOM) { sPhase2Timer &= 0xFE00; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 160); - this->colliderBody.elem.acDmgInfo.dmgFlags = DMG_SWORD | DMG_BOOMERANG | DMG_DEKU_STICK; + this->colliderBody.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_SWORD | DMG_BOOMERANG | DMG_DEKU_STICK; } else { sKillBari++; if ((this->actor.colorFilterTimer != 0) && !(this->actor.colorFilterParams & 0x4000)) { @@ -1217,7 +1217,7 @@ void BossVa_BodyPhase2(BossVa* this, PlayState* play) { } void BossVa_SetupBodyPhase3(BossVa* this) { - this->colliderBody.elem.acDmgInfo.dmgFlags = DMG_BOOMERANG; + this->colliderBody.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_BOOMERANG; this->actor.speed = 0.0f; sPhase3StopMoving = false; BossVa_SetupAction(this, BossVa_BodyPhase3); @@ -1371,11 +1371,11 @@ void BossVa_BodyPhase4(BossVa* this, PlayState* play) { if (this->timer >= 0) { if (this->invincibilityTimer == 0) { this->invincibilityTimer = 8; - if (this->actor.colChkInfo.damageEffect != 1) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 1) { this->actor.world.rot.y = this->actor.yawTowardsPlayer; Actor_PlaySfx(&this->actor, NA_SE_EN_BALINADE_DAMAGE); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 12); - sPhase4HP -= this->actor.colChkInfo.damage; + sPhase4HP -= this->actor.colChkInfo.damage_CollisionCheckInfo; if (sPhase4HP <= 0) { this->timer = 0; sFightPhase++; @@ -1421,7 +1421,7 @@ void BossVa_BodyPhase4(BossVa* this, PlayState* play) { } Math_SmoothStepToF(&this->actor.speed, ((sFightPhase - PHASE_4 + 1) * 1.5f) + 4.0f, 1.0f, 0.25f, 0.0f); } - this->colliderBody.elem.acDmgInfo.dmgFlags = DMG_BOOMERANG; + this->colliderBody.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_BOOMERANG; } else { Math_SmoothStepToS(&this->vaBodySpinRate, 0, 1, 0x96, 0); if (this->timer > 0) { @@ -1429,7 +1429,7 @@ void BossVa_BodyPhase4(BossVa* this, PlayState* play) { this->timer = 35; } Math_SmoothStepToF(&this->actor.shape.yOffset, -480.0f, 1.0f, 30.0f, 0.0f); - this->colliderBody.elem.acDmgInfo.dmgFlags = DMG_SWORD | DMG_BOOMERANG | DMG_DEKU_STICK; + this->colliderBody.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_SWORD | DMG_BOOMERANG | DMG_DEKU_STICK; this->timer--; } else { if ((player->stateFlags1 & PLAYER_STATE1_26) && (this->timer < -60)) { 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 26630ef776c..1f703251824 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -423,10 +423,10 @@ void DoorKiller_Wait(DoorKiller* this, PlayState* play) { if (DoorKiller_IsHit(&this->actor, play)) { // AC cylinder: wobble if hit by most weapons, die if hit by explosives or hammer - if (this->colliderCylinder.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_RANGED | DMG_SLASH | DMG_DEKU_STICK)) { + if (this->colliderCylinder.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_RANGED | DMG_SLASH | DMG_DEKU_STICK)) { this->timer = 16; this->actionFunc = DoorKiller_Wobble; - } else if (this->colliderCylinder.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_HAMMER_SWING | DMG_EXPLOSIVE)) { + } else if (this->colliderCylinder.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_HAMMER_SWING | DMG_EXPLOSIVE)) { DoorKiller_SpawnRubble(&this->actor, play); this->actionFunc = DoorKiller_Die; SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 20, NA_SE_EN_KDOOR_BREAK); 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 bed0a0be6ff..548e07947a1 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -794,27 +794,27 @@ void EnAm_UpdateDamage(EnAm* this, PlayState* play) { } else if ((this->hurtCollider.base.acFlags & AC_HIT) && (this->behavior >= AM_BEHAVIOR_5)) { this->hurtCollider.base.acFlags &= ~AC_HIT; - if (this->dyna.actor.colChkInfo.damageEffect != AM_DMGEFF_MAGIC_FIRE_LIGHT) { + if (this->dyna.actor.colChkInfo.damageEffect_CollisionCheckInfo != AM_DMGEFF_MAGIC_FIRE_LIGHT) { this->unk_264 = 0; - this->damageEffect = this->dyna.actor.colChkInfo.damageEffect; + this->damageEffect = this->dyna.actor.colChkInfo.damageEffect_CollisionCheckInfo; Actor_SetDropFlag(&this->dyna.actor, &this->hurtCollider.elem, false); - if ((this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_NUT) || - (this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_STUN) || - (this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_ICE)) { + if ((this->dyna.actor.colChkInfo.damageEffect_CollisionCheckInfo == AM_DMGEFF_NUT) || + (this->dyna.actor.colChkInfo.damageEffect_CollisionCheckInfo == AM_DMGEFF_STUN) || + (this->dyna.actor.colChkInfo.damageEffect_CollisionCheckInfo == AM_DMGEFF_ICE)) { if (this->behavior != AM_BEHAVIOR_STUNNED) { EnAm_SetupStunned(this, play); - if (this->dyna.actor.colChkInfo.damage != 0) { + if (this->dyna.actor.colChkInfo.damage_CollisionCheckInfo != 0) { this->dyna.actor.colChkInfo.health = 0; } - } else if (this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_STUN) { + } else if (this->dyna.actor.colChkInfo.damageEffect_CollisionCheckInfo == AM_DMGEFF_STUN) { Vec3f sparkPos = this->dyna.actor.world.pos; sparkPos.y += 50.0f; CollisionCheck_SpawnShieldParticlesMetal(play, &sparkPos); } - } else if ((this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_KILL) || + } else if ((this->dyna.actor.colChkInfo.damageEffect_CollisionCheckInfo == AM_DMGEFF_KILL) || (this->behavior == AM_BEHAVIOR_STUNNED)) { this->dyna.actor.colChkInfo.health = 0; @@ -841,7 +841,7 @@ void EnAm_Update(Actor* thisx, PlayState* play) { EnAm_UpdateDamage(this, play); } - if (this->dyna.actor.colChkInfo.damageEffect != AM_DMGEFF_MAGIC_FIRE_LIGHT) { + if (this->dyna.actor.colChkInfo.damageEffect_CollisionCheckInfo != AM_DMGEFF_MAGIC_FIRE_LIGHT) { if (this->attackTimer != 0) { this->attackTimer--; } 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 a370e6b36a9..07ee71d2027 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -384,7 +384,7 @@ void EnAnubice_Update(Actor* thisx, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect == ANUBICE_DMGEFF_FIRE) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == ANUBICE_DMGEFF_FIRE) { Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_PROP); this->actor.flags &= ~ACTOR_FLAG_0; Enemy_StartFinishingBlow(play, &this->actor); 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 19851e173b0..d0e94dd4060 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 @@ -113,7 +113,7 @@ void func_809B27D8(EnAnubiceFire* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_IT_SHIELD_REFLECT_SW); this->cylinder.base.atFlags &= ~(AT_HIT | AT_BOUNCED | AT_TYPE_ENEMY); this->cylinder.base.atFlags |= AT_TYPE_PLAYER; - this->cylinder.elem.atDmgInfo.dmgFlags = DMG_DEKU_STICK; + this->cylinder.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_DEKU_STICK; this->unk_15A = 30; this->actor.params = 1; this->actor.velocity.x *= -1.0f; 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 75aa432f7ff..a5e1945432c 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -128,8 +128,8 @@ void EnArrow_Init(Actor* thisx, PlayState* play) { if (this->actor.params < 0) { this->collider.base.atFlags = (AT_ON | AT_TYPE_ENEMY); } else if (this->actor.params <= ARROW_SEED) { - this->collider.elem.atDmgInfo.dmgFlags = dmgFlags[this->actor.params]; - LOG_HEX("this->at_info.cl_elem.at_btl_info.at_type", this->collider.elem.atDmgInfo.dmgFlags, + this->collider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = dmgFlags[this->actor.params]; + LOG_HEX("this->at_info.cl_elem.at_btl_info.at_type", this->collider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT, "../z_en_arrow.c", 707); } } @@ -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->elemType_ColliderElement != ELEMTYPE_UNK4)) { hitActor = this->collider.base.at; if ((hitActor->update != NULL) && !(this->collider.base.atFlags & AT_BOUNCED) && 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 63875b009c5..b7c6e13586c 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -332,8 +332,8 @@ void EnBb_Init(Actor* thisx, PlayState* play) { this->flameScaleY = 80.0f; this->flameScaleX = 100.0f; this->collider.elements[0].base.atElemFlags = ATELEM_ON | ATELEM_SFX_HARD; - this->collider.elements[0].base.atDmgInfo.dmgFlags = DMG_DEFAULT; - this->collider.elements[0].base.atDmgInfo.damage = 8; + this->collider.elements[0].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_DEFAULT; + this->collider.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 8; this->bobSize = this->actionState * 20.0f; this->flamePrimAlpha = 255; this->moveMode = BBMOVE_NORMAL; @@ -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.effect_ColliderElementDamageInfoAT = 1; EnBb_SetupRed(play, this); break; case ENBB_WHITE: @@ -1151,11 +1151,11 @@ void EnBb_CollisionCheck(EnBb* this, PlayState* play) { } if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - this->dmgEffect = this->actor.colChkInfo.damageEffect; + this->dmgEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; Actor_SetDropFlag(&this->actor, &this->collider.elements[0].base, false); switch (this->dmgEffect) { case 7: - this->actor.freezeTimer = this->collider.elements[0].base.acHitElem->atDmgInfo.damage; + this->actor.freezeTimer = this->collider.elements[0].base.acHitElem->atDmgInfo.damage_ColliderElementDamageInfoAT; FALLTHROUGH; case 5: this->fireIceTimer = 0x30; @@ -1165,7 +1165,7 @@ void EnBb_CollisionCheck(EnBb* this, PlayState* play) { //! Din's Fire on a white bubble will do just that. The mechanism is complex and described below. goto block_15; case 6: - this->actor.freezeTimer = this->collider.elements[0].base.acHitElem->atDmgInfo.damage; + this->actor.freezeTimer = this->collider.elements[0].base.acHitElem->atDmgInfo.damage_ColliderElementDamageInfoAT; break; case 8: case 9: @@ -1234,7 +1234,7 @@ void EnBb_Update(Actor* thisx, PlayState* play2) { if (this->actor.params <= ENBB_BLUE) { EnBb_CollisionCheck(this, play); } - if (this->actor.colChkInfo.damageEffect != 0xD) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0xD) { this->actionFunc(this, play); if ((this->actor.params <= ENBB_BLUE) && (this->actor.speed >= -6.0f) && ((this->actor.flags & ACTOR_FLAG_15) == 0)) { 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 23c7bb6db59..116e8635556 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -333,7 +333,7 @@ void func_809BD524(EnBigokuta* this) { this->unk_19A = 0; this->cylinder[0].base.atFlags |= AT_ON; Actor_PlaySfx(&this->actor, NA_SE_EN_DAIOCTA_MAHI); - if (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & DMG_DEKU_NUT) { + if (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_DEKU_NUT) { this->unk_195 = true; this->unk_196 = 20; } else { @@ -747,12 +747,12 @@ void func_809BE798(EnBigokuta* this, PlayState* play) { void EnBigokuta_UpdateDamage(EnBigokuta* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) { - if (this->actor.colChkInfo.damageEffect == 1) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0 || this->actor.colChkInfo.damage_CollisionCheckInfo != 0) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) { if (this->actionFunc != func_809BE058) { func_809BD524(this); } - } else if (this->actor.colChkInfo.damageEffect == 0xF) { + } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0xF) { func_809BD47C(this); } else if (!Actor_IsFacingPlayer(&this->actor, 0x4000)) { if (Actor_ApplyDamage(&this->actor) == 0) { // Dead 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 b7b4d5d760b..bf5da57d918 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -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.effect_ColliderElementDamageInfoAC = 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.effect_ColliderElementDamageInfoAC = 0; this->actor.gravity = -1.0f; this->actor.speed = 0.0f; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 150, COLORFILTER_BUFFLAG_XLU, 80); @@ -551,14 +551,14 @@ void EnBili_UpdateDamage(EnBili* 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->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { if (Actor_ApplyDamage(&this->actor) == 0) { Actor_PlaySfx(&this->actor, NA_SE_EN_BIRI_DEAD); Enemy_StartFinishingBlow(play, &this->actor); this->actor.flags &= ~ACTOR_FLAG_0; } - damageEffect = this->actor.colChkInfo.damageEffect; + damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; if (damageEffect == BIRI_DMGEFF_DEKUNUT) { if (this->actionFunc != EnBili_Stunned) { @@ -586,7 +586,7 @@ void EnBili_UpdateDamage(EnBili* this, PlayState* play) { EnBili_SetupBurnt(this); } - if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_ARROW) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW) { this->actor.flags |= ACTOR_FLAG_4; } } 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 7022780554a..4bf07fa926c 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -101,7 +101,7 @@ void EnBom_Init(Actor* thisx, PlayState* play) { Collider_InitJntSph(play, &this->explosionCollider); Collider_SetCylinder(play, &this->bombCollider, thisx, &sCylinderInit); Collider_SetJntSph(play, &this->explosionCollider, thisx, &sJntSphInit, &this->explosionColliderItems[0]); - this->explosionColliderItems[0].base.atDmgInfo.damage += (thisx->shape.rot.z & 0xFF00) >> 8; + this->explosionColliderItems[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT += (thisx->shape.rot.z & 0xFF00) >> 8; thisx->shape.rot.z &= 0xFF; if (thisx->shape.rot.z & 0x80) { 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 99e9775ea4f..830d8fa28e7 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.c +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.c @@ -263,8 +263,8 @@ void EnBrob_Update(Actor* thisx, PlayState* play2) { acHits[0] = (this->colliders[0].base.acFlags & AC_HIT) != 0; acHits[1] = (this->colliders[1].base.acFlags & AC_HIT) != 0; - if ((acHits[0] && (this->colliders[0].elem.acHitElem->atDmgInfo.dmgFlags & DMG_BOOMERANG)) || - (acHits[1] && (this->colliders[1].elem.acHitElem->atDmgInfo.dmgFlags & DMG_BOOMERANG))) { + if ((acHits[0] && (this->colliders[0].elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_BOOMERANG)) || + (acHits[1] && (this->colliders[1].elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_BOOMERANG))) { for (i = 0; i < 2; i++) { this->colliders[i].base.atFlags &= ~(AT_HIT | AT_BOUNCED); @@ -273,8 +273,8 @@ void EnBrob_Update(Actor* thisx, PlayState* play2) { EnBrob_SetupStunned(this); } else if ((this->colliders[0].base.atFlags & AT_HIT) || (this->colliders[1].base.atFlags & AT_HIT) || - (acHits[0] && (this->colliders[0].elem.acHitElem->atDmgInfo.dmgFlags & DMG_SLASH_KOKIRI)) || - (acHits[1] && (this->colliders[1].elem.acHitElem->atDmgInfo.dmgFlags & DMG_SLASH_KOKIRI))) { + (acHits[0] && (this->colliders[0].elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SLASH_KOKIRI)) || + (acHits[1] && (this->colliders[1].elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SLASH_KOKIRI))) { if (this->actionFunc == EnBrob_MoveUp && !(this->colliders[0].base.atFlags & AT_BOUNCED) && !(this->colliders[1].base.atFlags & AT_BOUNCED)) { 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 902520173b5..8ba20e44905 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -97,9 +97,9 @@ void EnBubble_SetDimensions(EnBubble* this, f32 dim) { u32 func_809CBCBC(EnBubble* this) { ColliderElement* elem = &this->colliderSphere.elements[0].base; - elem->atDmgInfo.dmgFlags = DMG_EXPLOSIVE; - elem->atDmgInfo.effect = 0; - elem->atDmgInfo.damage = 4; + elem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_EXPLOSIVE; + elem->atDmgInfo.effect_ColliderElementDamageInfoAT = 0; + elem->atDmgInfo.damage_ColliderElementDamageInfoAT = 4; elem->atElemFlags = ATELEM_ON; this->actor.velocity.y = 0.0f; return 6; @@ -112,7 +112,7 @@ u32 func_809CBCEC(EnBubble* this) { } void EnBubble_DamagePlayer(EnBubble* this, PlayState* play) { - s32 damage = -this->colliderSphere.elements[0].base.atDmgInfo.damage; + s32 damage = -this->colliderSphere.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT; play->damagePlayer(play, damage); func_8002F7A0(play, &this->actor, 6.0f, this->actor.yawTowardsPlayer, 6.0f); 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 5380555405a..cedca8c0be2 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -686,10 +686,10 @@ void func_809D0584(EnBw* this, PlayState* play) { } else { if (this->collider2.base.acFlags & AC_HIT) { this->collider2.base.acFlags &= ~AC_HIT; - if ((this->actor.colChkInfo.damageEffect == 0) || (this->unk_220 == 6)) { + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0) || (this->unk_220 == 6)) { return; } - this->damageEffect = this->actor.colChkInfo.damageEffect; + this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; Actor_SetDropFlag(&this->actor, &this->collider2.elem, false); if ((this->damageEffect == 1) || (this->damageEffect == 0xE)) { if (this->unk_23C == 0) { @@ -751,7 +751,7 @@ void EnBw_Update(Actor* thisx, PlayState* play2) { Color_RGBA8 sp44 = { 0, 0, 0, 220 }; func_809D0584(this, play); - if (thisx->colChkInfo.damageEffect != 6) { + if (thisx->colChkInfo.damageEffect_CollisionCheckInfo != 6) { this->actionFunc(this, play); if (this->unk_23C == 0) { this->unk_23A = (this->unk_23A + 4) & 0x7F; @@ -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.effect_ColliderElementDamageInfoAT = 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.effect_ColliderElementDamageInfoAT = 1; } this->unk_234 = Actor_TestFloorInDirection(thisx, play, 50.0f, thisx->world.rot.y); 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 af8ec2dabeb..076dafbfa63 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -156,7 +156,7 @@ void EnCrow_SetupDamaged(EnCrow* this, PlayState* play) { this->actor.targetArrowOffset = 0.0f; Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_DEAD); - if (this->actor.colChkInfo.damageEffect == 3) { // Ice arrows + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 3) { // Ice arrows Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 40); for (i = 0; i < 8; i++) { iceParticlePos.x = ((i & 1 ? 7.0f : -7.0f) * scale) + this->actor.world.pos.x; @@ -165,7 +165,7 @@ void EnCrow_SetupDamaged(EnCrow* this, PlayState* play) { EffectSsEnIce_SpawnFlyingVec3f(play, &this->actor, &iceParticlePos, 150, 150, 150, 250, 235, 245, 255, ((Rand_ZeroOne() * 0.15f) + 0.85f) * scale); } - } else if (this->actor.colChkInfo.damageEffect == 2) { // Fire arrows and Din's Fire + } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 2) { // Fire arrows and Din's Fire Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 40); for (i = 0; i < 4; i++) { @@ -413,8 +413,8 @@ void EnCrow_UpdateDamage(EnCrow* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elements[0].base, true); - if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { - if (this->actor.colChkInfo.damageEffect == 1) { // Deku Nuts + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) { // Deku Nuts EnCrow_SetupTurnAway(this); } else { Actor_ApplyDamage(&this->actor); 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 265e58cc00f..407e3428298 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -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.colType_Collider = COLTYPE_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.colType_Collider = COLTYPE_HIT6; this->collider.base.acFlags &= ~AC_HARD; Actor_PlaySfx(&this->actor, NA_SE_EN_DUMMY482); this->actionFunc = EnDekubaba_Grow; @@ -1034,15 +1034,15 @@ 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) && - ((this->actor.colChkInfo.damageEffect != DEKUBABA_DMGEFF_NONE) || (this->actor.colChkInfo.damage != 0))) { + if ((this->collider.base.colType_Collider != COLTYPE_HARD) && + ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != DEKUBABA_DMGEFF_NONE) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0))) { - phi_s0 = this->actor.colChkInfo.health - this->actor.colChkInfo.damage; + phi_s0 = this->actor.colChkInfo.health - this->actor.colChkInfo.damage_CollisionCheckInfo; if (this->actionFunc != EnDekubaba_StunnedVertical) { - if ((this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_BOOMERANG) || - (this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_DEKUNUT)) { - if (this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_BOOMERANG) { + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DEKUBABA_DMGEFF_BOOMERANG) || + (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DEKUBABA_DMGEFF_DEKUNUT)) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DEKUBABA_DMGEFF_BOOMERANG) { phi_s0 = this->actor.colChkInfo.health; } @@ -1056,14 +1056,14 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) { } else { EnDekubaba_SetupHit(this, 0); } - } else if ((this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_BOOMERANG) || - (this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_SWORD)) { + } else if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DEKUBABA_DMGEFF_BOOMERANG) || + (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DEKUBABA_DMGEFF_SWORD)) { if (phi_s0 > 0) { EnDekubaba_SetupSway(this); } else { EnDekubaba_SetupPrunedSomersault(this); } - } else if (this->actor.colChkInfo.damageEffect != DEKUBABA_DMGEFF_DEKUNUT) { + } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != DEKUBABA_DMGEFF_DEKUNUT) { EnDekubaba_SetupHit(this, 0); } else { return; @@ -1071,7 +1071,7 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) { this->actor.colChkInfo.health = CLAMP_MIN(phi_s0, 0); - if (this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_FIRE) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DEKUBABA_DMGEFF_FIRE) { firePos = &this->actor.world.pos; fireScale = (this->size * 70.0f); @@ -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.colType_Collider != COLTYPE_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 6e14eba6ce1..82ccef0e6fc 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -204,7 +204,7 @@ void EnDekunuts_SetupGasp(EnDekunuts* this) { void EnDekunuts_SetupBeDamaged(EnDekunuts* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gDekuNutsDamageAnim, -3.0f); - if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_ARROW | DMG_SLINGSHOT)) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_ARROW | DMG_SLINGSHOT)) { this->actor.world.rot.y = this->collider.base.ac->world.rot.y; } else { this->actor.world.rot.y = Actor_WorldYawTowardActor(&this->actor, this->collider.base.ac) + 0x8000; @@ -447,9 +447,9 @@ void EnDekunuts_ColliderCheck(EnDekunuts* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem, true); if (this->actor.colChkInfo.mass == 0x32) { - if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { - if (this->actor.colChkInfo.damageEffect != 1) { - if (this->actor.colChkInfo.damageEffect == 2) { + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 1) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 2) { EffectSsFCircle_Spawn(play, &this->actor, &this->actor.world.pos, 40, 50); } EnDekunuts_SetupBeDamaged(this); 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 ccf7f4af2c0..cbf132efba9 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -303,7 +303,7 @@ void EnDh_Attack(EnDh* this, PlayState* play) { -4.0f); this->actionState = 4; this->collider2.base.atFlags = this->collider2.elements[0].base.atElemFlags = AT_NONE; // also ATELEM_NONE - this->collider2.elements[0].base.atDmgInfo.dmgFlags = this->collider2.elements[0].base.atDmgInfo.damage = 0; + this->collider2.elements[0].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = this->collider2.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 0; } switch (this->actionState) { case 1: @@ -318,15 +318,15 @@ void EnDh_Attack(EnDh* this, PlayState* play) { if (this->skelAnime.curFrame >= 4.0f) { this->collider2.base.atFlags = this->collider2.elements[0].base.atElemFlags = AT_ON | AT_TYPE_ENEMY; // also ATELEM_ON | ATELEM_SFX_WOOD - this->collider2.elements[0].base.atDmgInfo.dmgFlags = DMG_DEFAULT; - this->collider2.elements[0].base.atDmgInfo.damage = 8; + this->collider2.elements[0].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_DEFAULT; + this->collider2.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 8; } if (this->collider2.base.atFlags & AT_BOUNCED) { this->collider2.base.atFlags &= ~(AT_HIT | AT_BOUNCED); this->collider2.base.atFlags = this->collider2.elements[0].base.atElemFlags = AT_NONE; // also ATELEM_NONE - this->collider2.elements[0].base.atDmgInfo.dmgFlags = - this->collider2.elements[0].base.atDmgInfo.damage = 0; + this->collider2.elements[0].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = + this->collider2.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 0; this->actionState++; } else if (this->collider2.base.atFlags & AT_HIT) { this->collider2.base.atFlags &= ~AT_HIT; @@ -346,8 +346,8 @@ void EnDh_Attack(EnDh* this, PlayState* play) { this->actionState++; this->collider2.base.atFlags = this->collider2.elements[0].base.atElemFlags = AT_NONE; // also ATELEM_NONE - this->collider2.elements[0].base.atDmgInfo.dmgFlags = - this->collider2.elements[0].base.atDmgInfo.damage = 0; + this->collider2.elements[0].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = + this->collider2.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 0; } break; case 5: @@ -378,8 +378,8 @@ void EnDh_Burrow(EnDh* this, PlayState* play) { this->drawDirtWave++; this->collider1.base.atFlags = this->collider1.elem.atElemFlags = AT_ON | AT_TYPE_ENEMY; // also ATELEM_ON | ATELEM_SFX_WOOD - this->collider1.elem.atDmgInfo.dmgFlags = DMG_DEFAULT; - this->collider1.elem.atDmgInfo.damage = 4; + this->collider1.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_DEFAULT; + this->collider1.elem.atDmgInfo.damage_ColliderElementDamageInfoAT = 4; FALLTHROUGH; case 1: this->dirtWavePhase += 0x47E; @@ -396,7 +396,7 @@ void EnDh_Burrow(EnDh* this, PlayState* play) { this->drawDirtWave = false; this->collider1.dim.radius = 35; this->collider1.base.atFlags = this->collider1.elem.atElemFlags = AT_NONE; // Also ATELEM_NONE - this->collider1.elem.atDmgInfo.dmgFlags = this->collider1.elem.atDmgInfo.damage = 0; + this->collider1.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = this->collider1.elem.atDmgInfo.damage_ColliderElementDamageInfoAT = 0; EnDh_SetupWait(this); break; } @@ -478,9 +478,9 @@ void EnDh_CollisionCheck(EnDh* this, PlayState* play) { if ((this->collider2.base.acFlags & AC_HIT) && !this->retreat) { this->collider2.base.acFlags &= ~AC_HIT; - if ((this->actor.colChkInfo.damageEffect != 0) && (this->actor.colChkInfo.damageEffect != 6)) { + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) && (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 6)) { this->collider2.base.atFlags = this->collider2.elements[0].base.atElemFlags = AT_NONE; // also ATELEM_NONE - this->collider2.elements[0].base.atDmgInfo.dmgFlags = this->collider2.elements[0].base.atDmgInfo.damage = 0; + this->collider2.elements[0].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = this->collider2.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 0; if (player->unk_844 != 0) { this->unk_258 = player->unk_845; } 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 17ec0b85ef5..e85f97b8ca4 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -380,7 +380,7 @@ void EnDha_UpdateHealth(EnDha* this, PlayState* play) { if (!((this->unk_1C0 >= 8) || !(this->collider.base.acFlags & AC_HIT))) { this->collider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect == 0 || this->actor.colChkInfo.damageEffect == 6) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0 || this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 6) { return; } else { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 8); 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 f5f5940881c..7bbd2dd7130 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -348,14 +348,14 @@ s32 EnDodojr_CheckDamaged(EnDodojr* this, PlayState* play) { this->actor.shape.shadowDraw = ActorShadow_DrawCircle; } - if ((this->actor.colChkInfo.damageEffect == 0) && (this->actor.colChkInfo.damage != 0)) { + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0) && (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { Enemy_StartFinishingBlow(play, &this->actor); this->freezeFrameTimer = 2; this->actionFunc = EnDodojr_WaitFreezeFrames; return true; } - if ((this->actor.colChkInfo.damageEffect == 1) && (this->actionFunc != EnDodojr_Stunned) && + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) && (this->actionFunc != EnDodojr_Stunned) && (this->actionFunc != EnDodojr_StunnedBounce)) { Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); this->stunTimer = 120; 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 6ae9701d53d..06676ca6d43 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -608,10 +608,10 @@ void EnDodongo_SweepTail(EnDodongo* this, PlayState* play) { this->sphElements[2].base.atElemFlags = ATELEM_NONE; this->sphElements[1].base.atElemFlags = ATELEM_NONE; this->colliderBody.base.atFlags = AT_NONE; - this->sphElements[2].base.atDmgInfo.dmgFlags = 0; - this->sphElements[1].base.atDmgInfo.dmgFlags = 0; - this->sphElements[2].base.atDmgInfo.damage = 0; - this->sphElements[1].base.atDmgInfo.damage = 0; + this->sphElements[2].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = 0; + this->sphElements[1].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = 0; + this->sphElements[2].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 0; + this->sphElements[1].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 0; EnDodongo_SetupBreatheFire(this); this->timer = Rand_S16Offset(5, 10); } else { @@ -630,8 +630,8 @@ void EnDodongo_SweepTail(EnDodongo* this, PlayState* play) { this->timer = 18; this->colliderBody.base.atFlags = this->sphElements[1].base.atElemFlags = this->sphElements[2].base.atElemFlags = AT_ON | AT_TYPE_ENEMY; // also ATELEM_ON | ATELEM_SFX_WOOD - this->sphElements[1].base.atDmgInfo.dmgFlags = this->sphElements[2].base.atDmgInfo.dmgFlags = DMG_DEFAULT; - this->sphElements[1].base.atDmgInfo.damage = this->sphElements[2].base.atDmgInfo.damage = 8; + this->sphElements[1].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = this->sphElements[2].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_DEFAULT; + this->sphElements[1].base.atDmgInfo.damage_ColliderElementDamageInfoAT = this->sphElements[2].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 8; } } else if (this->timer > 1) { Vec3f tailPos; @@ -715,9 +715,9 @@ void EnDodongo_CollisionCheck(EnDodongo* this, PlayState* play) { } else if ((this->colliderBody.base.acFlags & AC_HIT) && (this->actionState > DODONGO_DEATH)) { this->colliderBody.base.acFlags &= ~AC_HIT; Actor_SetDropFlagJntSph(&this->actor, &this->colliderBody, false); - if (this->actor.colChkInfo.damageEffect != 0xE) { - this->damageEffect = this->actor.colChkInfo.damageEffect; - if ((this->actor.colChkInfo.damageEffect == 1) || (this->actor.colChkInfo.damageEffect == 0xF)) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0xE) { + this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) || (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0xF)) { if (this->actionState != DODONGO_STUNNED) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); Actor_ApplyDamage(&this->actor); @@ -765,7 +765,7 @@ void EnDodongo_Update(Actor* thisx, PlayState* play) { EnDodongo* this = (EnDodongo*)thisx; EnDodongo_CollisionCheck(this, play); - if (this->actor.colChkInfo.damageEffect != 0xE) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0xE) { this->actionFunc(this, play); Actor_MoveXZGravity(&this->actor); Actor_UpdateBgCheckInfo(play, &this->actor, 75.0f, 60.0f, 70.0f, 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 ebfa1c6e114..1e0d8b4da90 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -178,7 +178,7 @@ void EnEiyer_RotateAroundHome(EnEiyer* this) { } void EnEiyer_SetupAppearFromGround(EnEiyer* this) { - this->collider.elem.acDmgInfo.dmgFlags = DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT; + this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT; Animation_PlayLoop(&this->skelanime, &gStingerIdleAnim); this->actor.world.pos.x = this->actor.home.pos.x; @@ -228,7 +228,7 @@ void EnEiyer_SetupInactive(EnEiyer* this) { void EnEiyer_SetupAmbush(EnEiyer* this, PlayState* play) { this->actor.speed = 0.0f; Animation_PlayOnce(&this->skelanime, &gStingerBackflipAnim); - this->collider.elem.acDmgInfo.dmgFlags = DMG_DEFAULT; + this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_DEFAULT; this->basePos = this->actor.world.pos; this->actor.world.rot.y = this->actor.shape.rot.y; this->actor.flags |= ACTOR_FLAG_IGNORE_QUAKE; @@ -290,14 +290,14 @@ void EnEiyer_SetupDie(EnEiyer* this) { this->timer = 20; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 200, COLORFILTER_BUFFLAG_OPA, 40); - if (this->collider.elem.acDmgInfo.dmgFlags != (DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT)) { + if (this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC != (DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT)) { this->actor.speed = 6.0f; Animation_MorphToLoop(&this->skelanime, &gStingerHitAnim, -3.0f); } else { this->actor.speed -= 6.0f; } - this->collider.elem.acDmgInfo.dmgFlags = DMG_DEFAULT; + this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_DEFAULT; this->collider.base.atFlags &= ~AT_ON; this->collider.base.acFlags &= ~AC_ON; this->actionFunc = EnEiyer_Die; @@ -604,7 +604,7 @@ void EnEiyer_UpdateDamage(EnEiyer* 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->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0 || this->actor.colChkInfo.damage_CollisionCheckInfo != 0) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); Actor_PlaySfx(&this->actor, NA_SE_EN_EIER_DEAD); @@ -612,13 +612,13 @@ void EnEiyer_UpdateDamage(EnEiyer* this, PlayState* play) { } // If underground, one hit kill - if (this->collider.elem.acDmgInfo.dmgFlags == (DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT)) { - if (this->actor.colChkInfo.damage == 0) { + if (this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC == (DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT)) { + if (this->actor.colChkInfo.damage_CollisionCheckInfo == 0) { EnEiyer_SetupAmbush(this, play); } else { EnEiyer_SetupDie(this); } - } else if (this->actor.colChkInfo.damageEffect == 1) { + } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) { if (this->actionFunc != EnEiyer_Stunned) { EnEiyer_SetupStunned(this); } @@ -687,7 +687,7 @@ s32 EnEiyer_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos->z += 2500.0f; } - if (this->collider.elem.acDmgInfo.dmgFlags == (DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT) && limbIndex != 9 && + if (this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC == (DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT) && limbIndex != 9 && limbIndex != 10) { *dList = NULL; } 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 fe2eadd2872..20b2d704ce6 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -283,7 +283,7 @@ s32 EnFd_ColliderCheck(EnFd* this, PlayState* play) { return false; } elem = &this->collider.elements[0].base; - if (elem->acHitElem != NULL && (elem->acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT)) { + if (elem->acHitElem != NULL && (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT)) { return false; } 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 8d0a8f2a637..13338e337a6 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 @@ -491,7 +491,7 @@ void EnFhgFire_EnergyBall(EnFhgFire* this, PlayState* play) { (s16)(Rand_ZeroOne() * 25.0f) + 50, FHGFLASH_LIGHTBALL_GREEN); } canBottleReflect2 = canBottleReflect1; - if (!canBottleReflect2 && (acHitElem->atDmgInfo.dmgFlags & DMG_SHIELD)) { + if (!canBottleReflect2 && (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SHIELD)) { killMode = BALL_IMPACT; Audio_PlaySfxGeneral(NA_SE_IT_SHIELD_REFLECT_MG, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, 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 760140aed51..02dc7b5ccd4 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -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.effect_ColliderElementDamageInfoAT = 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.effect_ColliderElementDamageInfoAT = 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.effect_ColliderElementDamageInfoAT = 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.effect_ColliderElementDamageInfoAT = 0; // Nothing this->actor.naviEnemyId = NAVI_ENEMY_KEESE; } @@ -622,13 +622,13 @@ void EnFirefly_UpdateDamage(EnFirefly* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elements[0].base, true); - if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); this->actor.flags &= ~ACTOR_FLAG_0; } - damageEffect = this->actor.colChkInfo.damageEffect; + damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; if (damageEffect == 2) { // Din's Fire if (this->actor.params == KEESE_ICE_FLY) { 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 41dd2cfdc5f..4186c1a4460 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -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.colType_Collider = COLTYPE_HARD; this->collider.base.acFlags |= AC_HARD; this->actionTarget = 0x28; } void EnFloormas_MakeVulnerable(EnFloormas* this) { - this->collider.base.colType = COLTYPE_HIT0; + this->collider.base.colType_Collider = COLTYPE_HIT0; this->actionTarget = 0; this->collider.base.acFlags &= ~AC_HARD; } @@ -389,7 +389,7 @@ void EnFloormas_SetupSmallWait(EnFloormas* this) { void EnFloormas_SetupTakeDamage(EnFloormas* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gWallmasterDamageAnim, -3.0f); - if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_ARROW | DMG_SLINGSHOT)) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_ARROW | DMG_SLINGSHOT)) { this->actor.world.rot.y = this->collider.base.ac->world.rot.y; } else { this->actor.world.rot.y = Actor_WorldYawTowardActor(&this->actor, this->collider.base.ac) + 0x8000; @@ -410,7 +410,7 @@ void EnFloormas_SetupRecover(EnFloormas* this) { void EnFloormas_SetupFreeze(EnFloormas* this) { Animation_Change(&this->skelAnime, &gWallmasterJumpAnim, 1.5f, 0, 20.0f, ANIMMODE_ONCE, -3.0f); this->actor.speed = 0.0f; - if (this->actor.colChkInfo.damageEffect == 4) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 4) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 255, COLORFILTER_BUFFLAG_OPA, 80); } else { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 80); @@ -979,15 +979,15 @@ void EnFloormas_ColliderCheck(EnFloormas* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { 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->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { + if (this->collider.base.colType_Collider != COLTYPE_HARD) { isSmall = false; if (this->actor.scale.x < 0.01f) { isSmall = true; } - if (isSmall && this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT) { - this->actor.colChkInfo.damage = 2; - this->actor.colChkInfo.damageEffect = 0; + if (isSmall && this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT) { + this->actor.colChkInfo.damage_CollisionCheckInfo = 2; + this->actor.colChkInfo.damageEffect_CollisionCheckInfo = 0; } if (Actor_ApplyDamage(&this->actor) == 0) { if (isSmall) { @@ -997,16 +997,16 @@ void EnFloormas_ColliderCheck(EnFloormas* this, PlayState* play) { } Enemy_StartFinishingBlow(play, &this->actor); this->actor.flags &= ~ACTOR_FLAG_0; - } else if (this->actor.colChkInfo.damage != 0) { + } else if (this->actor.colChkInfo.damage_CollisionCheckInfo != 0) { Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_DAMAGE); } - if ((this->actor.colChkInfo.damageEffect == 4) || (this->actor.colChkInfo.damageEffect == 1)) { + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 4) || (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1)) { if (this->actionFunc != EnFloormas_Freeze) { EnFloormas_SetupFreeze(this); } } else { - if (this->actor.colChkInfo.damageEffect == 2) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 2) { EffectSsFCircle_Spawn(play, &this->actor, &this->actor.world.pos, this->actor.scale.x * 4000.0f, this->actor.scale.x * 4000.0f); } @@ -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.colType_Collider == COLTYPE_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.colType_Collider == COLTYPE_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.colType_Collider == COLTYPE_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.colType_Collider == COLTYPE_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.colType_Collider == COLTYPE_HARD) { func_80026A6C(play); } 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 4170af674db..4598b0bc28a 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -139,7 +139,7 @@ s32 EnFw_CheckCollider(EnFw* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { elem = &this->collider.elements[0].base; - if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT) { + if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT) { this->lastDmgHook = true; } else { this->lastDmgHook = false; 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 3e4b6ec492a..c98dd232f77 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -341,7 +341,7 @@ void EnFz_ApplyDamage(EnFz* this, PlayState* play) { this->collider1.base.acFlags &= ~AC_HIT; } else if (this->collider1.base.acFlags & AC_HIT) { this->collider1.base.acFlags &= ~AC_HIT; - switch (this->actor.colChkInfo.damageEffect) { + switch (this->actor.colChkInfo.damageEffect_CollisionCheckInfo) { case 0xF: Actor_ApplyDamage(&this->actor); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_XLU, 8); 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 dd5ad3b4991..edb4a07b934 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 @@ -137,7 +137,7 @@ void EnGSwitch_Init(Actor* thisx, PlayState* play) { this->actor.scale.x = 0.25f; this->actor.scale.y = 0.45f; this->actor.scale.z = 0.25f; - this->collider.elem.acDmgInfo.dmgFlags = DMG_ARROW; + this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_ARROW; this->objectId = OBJECT_TSUBO; this->requiredObjectSlot = Object_GetSlot(&play->objectCtx, this->objectId); if (this->requiredObjectSlot < 0) { 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 40b2b9df589..e129bf03320 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -556,7 +556,7 @@ void EnGe2_Update(Actor* thisx, PlayState* play) { this->actionFunc(this, play); } else if (this->collider.base.acFlags & AC_HIT) { if ((this->collider.elem.acHitElem != NULL) && - (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT)) { + (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT)) { //! @bug duration parameter is larger than 255 which messes with the internal bitpacking of the colorfilter. //! Because of the duration being tracked as an unsigned byte it ends up being truncated to 144 Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 400); @@ -609,7 +609,7 @@ void EnGe2_UpdateStunned(Actor* thisx, PlayState* play2) { if ((this->collider.base.acFlags & AC_HIT) && ((this->collider.elem.acHitElem == NULL) || - !(this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT))) { + !(this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT))) { this->actor.colorFilterTimer = 0; EnGe2_ChangeAction(this, GE2_ACTION_KNOCKEDOUT); this->timer = 100; 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 8ef486c42c5..5eb9dc84cb8 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -1372,12 +1372,12 @@ void EnGeldB_CollisionCheck(EnGeldB* this, PlayState* play) { } else if ((this->bodyCollider.base.acFlags & AC_HIT) && (this->action >= GELDB_READY) && (this->spinAttackState < 2)) { this->bodyCollider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect != GELDB_DMG_UNK_6) { - this->damageEffect = this->actor.colChkInfo.damageEffect; + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != GELDB_DMG_UNK_6) { + this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, true); Audio_StopSfxByPosAndId(&this->actor.projectedPos, NA_SE_EN_GERUDOFT_BREATH); - if ((this->actor.colChkInfo.damageEffect == GELDB_DMG_STUN) || - (this->actor.colChkInfo.damageEffect == GELDB_DMG_FREEZE)) { + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == GELDB_DMG_STUN) || + (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == GELDB_DMG_FREEZE)) { if (this->action != GELDB_STUNNED) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); Actor_ApplyDamage(&this->actor); @@ -1411,7 +1411,7 @@ void EnGeldB_Update(Actor* thisx, PlayState* play) { EnGeldB* this = (EnGeldB*)thisx; EnGeldB_CollisionCheck(this, play); - if (this->actor.colChkInfo.damageEffect != GELDB_DMG_UNK_6) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != GELDB_DMG_UNK_6) { Actor_MoveXZGravity(&this->actor); Actor_UpdateBgCheckInfo(play, &this->actor, 15.0f, 30.0f, 60.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 | 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 1734511c51c..b834292f2b7 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -623,7 +623,7 @@ void EnGoma_UpdateHit(EnGoma* this, PlayState* play) { this->colCyl2.base.acFlags &= ~AC_HIT; if (this->gomaType == ENGOMA_NORMAL) { - u32 dmgFlags = acHitElem->atDmgInfo.dmgFlags; + u32 dmgFlags = acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT; if (dmgFlags & DMG_SHIELD) { if (this->actionFunc == EnGoma_Jump) { 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 d367633af6b..ede6a58c382 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -530,7 +530,7 @@ void EnGs_Update(Actor* thisx, PlayState* play2) { this->unk_19F = 0; this->collider.base.acFlags &= ~AC_HIT; - switch (this->actor.colChkInfo.damageEffect) { + switch (this->actor.colChkInfo.damageEffect_CollisionCheckInfo) { case 15: this->unk_19E |= 1; func_80A4F77C(this); 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 da82e07253d..d38b77219bd 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -732,7 +732,7 @@ void EnIk_UpdateDamage(EnIk* this, PlayState* play) { Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, true); - this->damageEffect = this->actor.colChkInfo.damageEffect; + this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; this->bodyCollider.base.acFlags &= ~AC_HIT; if ((this->damageEffect == EN_IK_DMGEFF_NONE) || (this->damageEffect == EN_IK_DMGEFF_SPARKS_NO_DMG) || 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 2fbcf5fe684..05e14f56214 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -356,7 +356,7 @@ void EnIshi_Wait(EnIshi* this, PlayState* play) { EnIshi_SpawnBugs(this, play); } } else if ((this->collider.base.acFlags & AC_HIT) && (type == ROCK_SMALL) && - this->collider.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_HAMMER | DMG_EXPLOSIVE)) { + this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_HAMMER | DMG_EXPLOSIVE)) { EnIshi_DropCollectible(this, play); SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, sBreakSfxDurations[type], sBreakSfxIds[type]); sFragmentSpawnFuncs[type](this, play); 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 dd9aecd4e4d..2c41c879aad 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -303,7 +303,7 @@ void EnKanban_Update(Actor* thisx, PlayState* play2) { s16 yawDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; u8 i; - if (acHitElem->atDmgInfo.dmgFlags & DMG_SLASH) { + if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SLASH) { this->cutType = sCutTypes[player->meleeWeaponAnimation]; } else { this->cutType = CUT_POST; 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 53fb55984d5..c091ea9e882 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -123,9 +123,9 @@ 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.colType_Collider = COLTYPE_HARD; this->bodyCollider.base.acFlags |= AC_HARD; - this->bodyCollider.elem.acDmgInfo.dmgFlags = DMG_DEFAULT; + this->bodyCollider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_DEFAULT; this->headCollider.dim.height = 25; } @@ -153,9 +153,9 @@ 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.colType_Collider = COLTYPE_HIT6; this->bodyCollider.base.acFlags &= ~AC_HARD; - this->bodyCollider.elem.acDmgInfo.dmgFlags = + this->bodyCollider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = !LINK_IS_ADULT ? ((DMG_SWORD | DMG_BOOMERANG) & ~DMG_JUMP_MASTER) : (DMG_SWORD | DMG_BOOMERANG); this->bodyCollider.dim.radius = 15; this->bodyCollider.dim.height = 80; 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 2bc4831539e..bd4d54b55a5 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 @@ -90,7 +90,7 @@ void EnMThunder_Init(Actor* thisx, PlayState* play2) { player->stateFlags2 &= ~PLAYER_STATE2_17; this->unk_1CA = 1; - this->collider.elem.atDmgInfo.dmgFlags = D_80AA044C[this->unk_1C7]; + this->collider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = D_80AA044C[this->unk_1C7]; this->unk_1C6 = 1; this->unk_1C9 = ((this->unk_1C7 == 1) ? 2 : 4); func_80A9EFE0(this, func_80A9F9B4); @@ -189,11 +189,11 @@ void func_80A9F408(EnMThunder* this, PlayState* play) { gSaveContext.magicState = MAGIC_STATE_CONSUME_SETUP; } if (player->unk_858 < 0.85f) { - this->collider.elem.atDmgInfo.dmgFlags = D_80AA044C[this->unk_1C7]; + this->collider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = D_80AA044C[this->unk_1C7]; this->unk_1C6 = 1; this->unk_1C9 = ((this->unk_1C7 == 1) ? 2 : 4); } else { - this->collider.elem.atDmgInfo.dmgFlags = D_80AA0458[this->unk_1C7]; + this->collider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = D_80AA0458[this->unk_1C7]; this->unk_1C6 = 0; this->unk_1C9 = ((this->unk_1C7 == 1) ? 4 : 8); } 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 92f3aac8540..63e16f71b13 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -296,7 +296,7 @@ void EnMb_Init(Actor* thisx, PlayState* play) { this->actor.uncullZoneScale = 800.0f; this->actor.uncullZoneDownward = 1800.0f; this->playerDetectionRange = 710.0f; - this->attackCollider.elem.atDmgInfo.dmgFlags = DMG_UNBLOCKABLE; + this->attackCollider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_UNBLOCKABLE; relYawFromPlayer = this->actor.world.rot.y - Math_Vec3f_Yaw(&this->actor.world.pos, &player->actor.world.pos); @@ -1376,19 +1376,19 @@ void EnMb_CheckColliding(EnMb* this, PlayState* play) { this->bodyCollider.base.acFlags &= ~AC_HIT; } else if ((this->bodyCollider.base.acFlags & AC_HIT) && this->state >= ENMB_STATE_STUNNED) { this->bodyCollider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect != ENMB_DMGEFF_IGNORE && - this->actor.colChkInfo.damageEffect != ENMB_DMGEFF_FREEZE) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != ENMB_DMGEFF_IGNORE && + this->actor.colChkInfo.damageEffect_CollisionCheckInfo != ENMB_DMGEFF_FREEZE) { if ((player->stateFlags2 & PLAYER_STATE2_7) && player->actor.parent == &this->actor) { player->stateFlags2 &= ~PLAYER_STATE2_7; player->actor.parent = NULL; player->av2.actionVar2 = 200; func_8002F71C(play, &this->actor, 6.0f, this->actor.world.rot.y, 6.0f); } - this->damageEffect = this->actor.colChkInfo.damageEffect; + this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; this->attack = ENMB_ATTACK_NONE; Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, false); - if (this->actor.colChkInfo.damageEffect == ENMB_DMGEFF_STUN || - this->actor.colChkInfo.damageEffect == ENMB_DMGEFF_STUN_ICE) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == ENMB_DMGEFF_STUN || + this->actor.colChkInfo.damageEffect_CollisionCheckInfo == ENMB_DMGEFF_STUN_ICE) { if (this->state != ENMB_STATE_STUNNED) { Actor_ApplyDamage(&this->actor); EnMb_SetupStunned(this); @@ -1419,7 +1419,7 @@ void EnMb_Update(Actor* thisx, PlayState* play) { s32 pad; EnMb_CheckColliding(this, play); - if (thisx->colChkInfo.damageEffect != ENMB_DMGEFF_FREEZE) { + if (thisx->colChkInfo.damageEffect_CollisionCheckInfo != ENMB_DMGEFF_FREEZE) { this->actionFunc(this, play); Actor_MoveXZGravity(thisx); Actor_UpdateBgCheckInfo(play, thisx, 40.0f, 40.0f, 70.0f, 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 1d05b78c354..78d33e9e804 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -120,7 +120,7 @@ void func_80ABBBA8(EnNutsball* this, PlayState* play) { this->collider.base.atFlags &= ~AT_TYPE_ENEMY & ~AT_BOUNCED & ~AT_HIT; this->collider.base.atFlags |= AT_TYPE_PLAYER; - this->collider.elem.atDmgInfo.dmgFlags = DMG_DEKU_STICK; + this->collider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_DEKU_STICK; Matrix_MtxFToYXZRotS(&player->shieldMf, &sp4C, 0); this->actor.world.rot.y = sp4C.y + 0x8000; this->timer = 30; 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 fd1332245e5..129b1cbb85e 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -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.colType_Collider = COLTYPE_METAL; } } @@ -309,7 +309,7 @@ s32 EnNy_CollisionCheck(EnNy* this, PlayState* play) { effectPos.y = this->collider.elements[0].base.acDmgInfo.hitPos.y; effectPos.z = this->collider.elements[0].base.acDmgInfo.hitPos.z; if ((this->unk_1E0 == 0.25f) && (this->unk_1D4 == 0xFF)) { - switch (this->actor.colChkInfo.damageEffect) { + switch (this->actor.colChkInfo.damageEffect_CollisionCheckInfo) { case 0xE: sp3F = 1; FALLTHROUGH; 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 3b4bbb26fc6..4e8b360eb42 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -490,7 +490,7 @@ void EnOkuta_ProjectileFly(EnOkuta* this, PlayState* play) { this->collider.base.atFlags & AT_BOUNCED) { this->collider.base.atFlags &= ~(AT_HIT | AT_BOUNCED | AT_TYPE_ENEMY); this->collider.base.atFlags |= AT_TYPE_PLAYER; - this->collider.elem.atDmgInfo.dmgFlags = DMG_DEKU_STICK; + this->collider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_DEKU_STICK; Matrix_MtxFToYXZRotS(&player->shieldMf, &shieldRot, 0); this->actor.world.rot.y = shieldRot.y + 0x8000; this->timer = 30; @@ -556,11 +556,11 @@ void EnOkuta_ColliderCheck(EnOkuta* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { 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->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { Enemy_StartFinishingBlow(play, &this->actor); this->actor.colChkInfo.health = 0; this->actor.flags &= ~ACTOR_FLAG_0; - if (this->actor.colChkInfo.damageEffect == 3) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 3) { EnOkuta_SetupFreeze(this); } else { EnOkuta_SetupWaitToDie(this); 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 8fa9e1a4903..092d618e1d8 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -231,7 +231,7 @@ void EnPeehat_Init(Actor* thisx, PlayState* play) { this->colCylinder.dim.radius = 25; this->colCylinder.dim.height = 15; this->colCylinder.dim.yShift = -5; - this->colCylinder.elem.acDmgInfo.dmgFlags = DMG_ARROW | DMG_SLINGSHOT; + this->colCylinder.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_ARROW | DMG_SLINGSHOT; this->colQuad.base.atFlags = AT_ON | AT_TYPE_ENEMY; this->colQuad.base.acFlags = AC_ON | AC_TYPE_PLAYER; this->actor.naviEnemyId = NAVI_ENEMY_PEAHAT_LARVA; @@ -884,13 +884,13 @@ void EnPeehat_Adult_CollisionCheck(EnPeehat* this, PlayState* play) { } else if (this->colJntSph.base.acFlags & AC_HIT) { this->colJntSph.base.acFlags &= ~AC_HIT; Actor_SetDropFlagJntSph(&this->actor, &this->colJntSph, true); - if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_NUT || - this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_LIGHT_ICE_ARROW) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == PEAHAT_DMG_EFF_NUT || + this->actor.colChkInfo.damageEffect_CollisionCheckInfo == PEAHAT_DMG_EFF_LIGHT_ICE_ARROW) { return; } - if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_HOOKSHOT) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == PEAHAT_DMG_EFF_HOOKSHOT) { this->actor.colChkInfo.health = 0; - } else if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_BOOMERANG) { + } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == PEAHAT_DMG_EFF_BOOMERANG) { if (this->state != PEAHAT_STATE_STUNNED) { EnPeehat_SetStateBoomerangStunned(this); } @@ -901,7 +901,7 @@ void EnPeehat_Adult_CollisionCheck(EnPeehat* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_EN_PIHAT_DAMAGE); } - if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_FIRE) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == PEAHAT_DMG_EFF_FIRE) { Vec3f pos; s32 i; for (i = 4; i >= 0; i--) { @@ -931,7 +931,7 @@ void EnPeehat_Update(Actor* thisx, PlayState* play) { if (thisx->params <= 0) { EnPeehat_Adult_CollisionCheck(this, play); } - if (thisx->colChkInfo.damageEffect != PEAHAT_DMG_EFF_LIGHT_ICE_ARROW) { + if (thisx->colChkInfo.damageEffect_CollisionCheckInfo != PEAHAT_DMG_EFF_LIGHT_ICE_ARROW) { if (thisx->speed != 0.0f || thisx->velocity.y != 0.0f) { Actor_MoveXZGravity(thisx); Actor_UpdateBgCheckInfo(play, thisx, 25.0f, 30.0f, 30.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2); 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 f67ce8d4efd..991f60dce8e 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 @@ -263,7 +263,7 @@ void EnPoField_SetupFlee(EnPoField* this) { void EnPoField_SetupDamage(EnPoField* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gPoeFieldDamagedAnim, -6.0f); - if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_ARROW | DMG_SLINGSHOT)) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_ARROW | DMG_SLINGSHOT)) { this->actor.world.rot.y = this->collider.base.ac->world.rot.y; } else { this->actor.world.rot.y = Actor_WorldYawTowardActor(&this->actor, this->collider.base.ac) + 0x8000; @@ -724,7 +724,7 @@ void EnPoField_SoulInteract(EnPoField* this, PlayState* play) { void EnPoField_TestForDamage(EnPoField* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0 || this->actor.colChkInfo.damage_CollisionCheckInfo != 0) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DEAD); 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 1315e00b988..3189afe333c 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 @@ -209,8 +209,8 @@ 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.acDmgInfo.dmgFlags |= DMG_DEKU_NUT; + this->collider.elem.elemType_ColliderElement = ELEMTYPE_UNK4; + this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC |= DMG_DEKU_NUT; this->collider.base.ocFlags1 = OC1_NONE; func_80AD9C24(this, NULL); } @@ -265,7 +265,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.colType_Collider = COLTYPE_METAL; this->collider.base.acFlags |= AC_HARD; } Animation_MorphToLoop(&this->skelAnime, &gPoeSistersAttackAnim, -5.0f); @@ -278,7 +278,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.colType_Collider = COLTYPE_METAL; this->collider.base.acFlags |= AC_HARD; Animation_MorphToLoop(&this->skelAnime, &gPoeSistersAttackAnim, -5.0f); } @@ -292,7 +292,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.colType_Collider = COLTYPE_HIT3; this->collider.base.acFlags &= ~AC_HARD; } this->actionFunc = func_80ADA9E8; @@ -301,7 +301,7 @@ void func_80AD9568(EnPoSisters* this) { void func_80AD95D8(EnPoSisters* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gPoeSistersDamagedAnim, -3.0f); if (this->collider.base.ac != NULL) { - this->actor.world.rot.y = (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_ARROW | DMG_SLINGSHOT)) + this->actor.world.rot.y = (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_ARROW | DMG_SLINGSHOT)) ? this->collider.base.ac->world.rot.y : Actor_WorldYawTowardActor(&this->actor, this->collider.base.ac) + 0x8000; } @@ -429,7 +429,7 @@ void func_80AD9C24(EnPoSisters* this, PlayState* play) { this->actor.flags &= ~ACTOR_FLAG_0; this->unk_19C = 100; this->unk_199 = 32; - this->collider.base.colType = COLTYPE_HIT3; + this->collider.base.colType_Collider = COLTYPE_HIT3; this->collider.base.acFlags &= ~AC_HARD; if (play != NULL) { vec.x = this->actor.world.pos.x; @@ -671,7 +671,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.colType_Collider = COLTYPE_HIT3; this->collider.base.acFlags &= ~AC_HARD; func_80AD93C4(this); } else { @@ -744,7 +744,7 @@ void func_80ADAD54(EnPoSisters* this, PlayState* play) { if (SkelAnime_Update(&this->skelAnime)) { this->unk_22E.a = 0; - this->collider.elem.acDmgInfo.dmgFlags = DMG_MAGIC_ICE | DMG_MAGIC_FIRE | DMG_DEKU_NUT; + this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_MAGIC_ICE | DMG_MAGIC_FIRE | DMG_DEKU_NUT; func_80AD93C4(this); } else { endFrame = this->skelAnime.endFrame; @@ -757,7 +757,7 @@ void func_80ADAE6C(EnPoSisters* this, PlayState* play) { this->unk_22E.a = 255; if (this->unk_194 != 0) { this->unk_199 |= 1; - this->collider.elem.acDmgInfo.dmgFlags = (DMG_SWORD | DMG_ARROW | DMG_HAMMER | DMG_MAGIC_ICE | + this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = (DMG_SWORD | DMG_ARROW | DMG_HAMMER | DMG_MAGIC_ICE | DMG_MAGIC_FIRE | DMG_HOOKSHOT | DMG_EXPLOSIVE | DMG_DEKU_STICK); if (this->unk_19A != 0) { this->unk_19A--; @@ -1145,16 +1145,16 @@ 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 || - (this->actor.colChkInfo.damageEffect == 0 && this->actor.colChkInfo.damage == 0)) { + } else if (this->collider.base.colType_Collider == 9 || + (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0 && this->actor.colChkInfo.damage_CollisionCheckInfo == 0)) { if (this->unk_194 == 0) { this->actor.freezeTimer = 0; } - } else if (this->actor.colChkInfo.damageEffect == 0xF) { + } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0xF) { this->actor.world.rot.y = this->actor.shape.rot.y; this->unk_199 |= 2; func_80AD98F4(this, play); - } else if (this->unk_194 == 0 && this->actor.colChkInfo.damageEffect == 0xE && + } else if (this->unk_194 == 0 && this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0xE && this->actionFunc == func_80ADB770) { if (this->unk_19C == 0) { this->unk_19C = -45; 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 10af7609949..9f5312fb248 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -293,7 +293,7 @@ void func_80ADE28C(EnPoh* this) { } else { Animation_PlayOnce(&this->skelAnime, &gPoeComposerDamagedAnim); } - if (this->colliderCyl.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_ARROW | DMG_SLINGSHOT)) { + if (this->colliderCyl.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_ARROW | DMG_SLINGSHOT)) { this->actor.world.rot.y = this->colliderCyl.base.ac->world.rot.y; } else { this->actor.world.rot.y = Actor_WorldYawTowardActor(&this->actor, this->colliderCyl.base.ac) + 0x8000; @@ -864,7 +864,7 @@ void EnPoh_TalkComposer(EnPoh* this, PlayState* play) { void func_80AE032C(EnPoh* this, PlayState* play) { if (this->colliderCyl.base.acFlags & AC_HIT) { this->colliderCyl.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0 || this->actor.colChkInfo.damage_CollisionCheckInfo != 0) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DEAD); 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 cae3ead4eed..e9b7d339e83 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -800,7 +800,7 @@ void EnRd_UpdateDamage(EnRd* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - this->damageEffect = this->actor.colChkInfo.damageEffect; + this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; if (this->action != REDEAD_ACTION_RISE_FROM_COFFIN) { Actor_SetDropFlag(&this->actor, &this->collider.elem, true); 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 d2be0307097..c32dbb23fa3 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -132,8 +132,8 @@ 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.damage = 16; + this->collider.elem.atDmgInfo.effect_ColliderElementDamageInfoAT = 4; + this->collider.elem.atDmgInfo.damage_ColliderElementDamageInfoAT = 16; Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_ENEMY); } @@ -537,7 +537,7 @@ void EnReeba_CheckDamage(EnReeba* this, PlayState* play) { this->actor.shape.rot.x = this->actor.shape.rot.z = 0; this->stunType = LEEVER_STUN_NONE; - switch (this->actor.colChkInfo.damageEffect) { + switch (this->actor.colChkInfo.damageEffect_CollisionCheckInfo) { case LEEVER_DMGEFF_UNUSED: case LEEVER_DMGEFF_BOOMERANG: if ((this->actor.colChkInfo.health > 1) && (this->stunType != LEEVER_STUN_OTHER)) { 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 146f926a96e..a95b7598c11 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -428,13 +428,13 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) { u8 dropType = RR_DROP_RANDOM_RUPEE; this->collider1.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect != 0) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) { hitPos.x = this->collider1.elem.acDmgInfo.hitPos.x; hitPos.y = this->collider1.elem.acDmgInfo.hitPos.y; hitPos.z = this->collider1.elem.acDmgInfo.hitPos.z; CollisionCheck_BlueBlood(play, NULL, &hitPos); } - switch (this->actor.colChkInfo.damageEffect) { + switch (this->actor.colChkInfo.damageEffect_CollisionCheckInfo) { case RR_DMG_LIGHT_ARROW: dropType++; // purple rupee FALLTHROUGH; @@ -450,8 +450,8 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) { case RR_DMG_NORMAL: // "ouch" PRINTF(VT_FGCOL(RED) "いてっ( %d : LIFE %d : DAMAGE %d : %x )！！" VT_RST "\n", this->frameCount, - this->actor.colChkInfo.health, this->actor.colChkInfo.damage, - this->actor.colChkInfo.damageEffect); + this->actor.colChkInfo.health, this->actor.colChkInfo.damage_CollisionCheckInfo, + this->actor.colChkInfo.damageEffect_CollisionCheckInfo); this->stopScroll = false; Actor_ApplyDamage(&this->actor); this->invincibilityTimer = 40; 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 5c3499be295..4e3e1b158af 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -382,7 +382,7 @@ s32 EnSb_UpdateDamage(EnSb* this, PlayState* play) { tookDamage = false; this->collider.base.acFlags &= ~AC_HIT; - switch (this->actor.colChkInfo.damageEffect) { + switch (this->actor.colChkInfo.damageEffect_CollisionCheckInfo) { case 14: // wind arrow hitByWindArrow = true; FALLTHROUGH; 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 d6cfb0bbc00..b4ac616f4ef 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -457,11 +457,11 @@ void EnSkb_CheckDamage(EnSkb* this, PlayState* play) { } else if (this->actionState >= SKB_BEHAVIOR_ATTACKING) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect != 6) { - this->lastDamageEffect = this->actor.colChkInfo.damageEffect; + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 6) { + this->lastDamageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; Actor_SetDropFlag(&this->actor, &this->collider.elements[1].base, true); this->setColliderAT = false; - if (this->actor.colChkInfo.damageEffect == 1) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) { if (this->actionState != SKB_BEHAVIOR_STUNNED) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); @@ -470,7 +470,7 @@ void EnSkb_CheckDamage(EnSkb* this, PlayState* play) { } } else { colorFilterDuration = 8; - if (this->actor.colChkInfo.damageEffect == 7) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 7) { scale = this->actor.scale.y * 7500.0f; for (i = 4; i >= 0; i--) { flamePos = this->actor.world.pos; @@ -489,8 +489,8 @@ void EnSkb_CheckDamage(EnSkb* this, PlayState* play) { } player = GET_PLAYER(play); if (this->breakFlags == 0) { - if ((this->actor.colChkInfo.damageEffect == 0xD) || - ((this->actor.colChkInfo.damageEffect == 0xE) && + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0xD) || + ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0xE) && ((player->meleeWeaponAnimation >= PLAYER_MWA_RIGHT_SLASH_1H && player->meleeWeaponAnimation <= PLAYER_MWA_LEFT_COMBO_2H) || (player->meleeWeaponAnimation == PLAYER_MWA_BACKSLASH_RIGHT || 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 1fb08a6cdf7..3d0e5439afd 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -583,7 +583,7 @@ s32 EnSkj_CollisionCheck(EnSkj* this, PlayState* play) { if (!((this->unk_2D3 == 0) || (D_80B01EA0 != 0) || !(this->collider.base.acFlags & AC_HIT))) { this->collider.base.acFlags &= ~AC_HIT; - switch (this->actor.colChkInfo.damageEffect) { + switch (this->actor.colChkInfo.damageEffect_CollisionCheckInfo) { case 0xF: effectPos.x = this->collider.elem.acDmgInfo.hitPos.x; effectPos.y = this->collider.elem.acDmgInfo.hitPos.y; 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 e7b9d3ee0f3..6fe753b467f 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -200,15 +200,15 @@ void EnSsh_InitColliders(EnSsh* this, PlayState* play) { Collider_SetCylinder(play, &this->colCylinder[i], &this->actor, cylinders[i]); } - this->colCylinder[0].elem.acDmgInfo.dmgFlags = + this->colCylinder[0].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_ARROW | DMG_MAGIC_FIRE | DMG_HOOKSHOT | DMG_HAMMER_SWING | DMG_EXPLOSIVE | DMG_DEKU_NUT; - this->colCylinder[1].elem.acDmgInfo.dmgFlags = + this->colCylinder[1].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = 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.colType_Collider = COLTYPE_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.acDmgInfo.dmgFlags = + this->colCylinder[2].elem.elemType_ColliderElement = ELEMTYPE_UNK2; + this->colCylinder[2].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_DEFAULT & ~(DMG_ARROW | DMG_MAGIC_FIRE | DMG_HOOKSHOT | DMG_HAMMER_SWING | DMG_EXPLOSIVE | DMG_DEKU_NUT); CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(2), &sColChkInfoInit); @@ -438,13 +438,13 @@ void EnSsh_CheckBodyStickHit(EnSsh* this, PlayState* play) { Player* player = GET_PLAYER(play); if (player->unk_860 != 0) { - elem->acDmgInfo.dmgFlags |= DMG_DEKU_STICK; - this->colCylinder[1].elem.acDmgInfo.dmgFlags &= ~DMG_DEKU_STICK; - this->colCylinder[2].elem.acDmgInfo.dmgFlags &= ~DMG_DEKU_STICK; + elem->acDmgInfo.dmgFlags_ColliderElementDamageInfoAC |= DMG_DEKU_STICK; + this->colCylinder[1].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC &= ~DMG_DEKU_STICK; + this->colCylinder[2].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC &= ~DMG_DEKU_STICK; } else { - elem->acDmgInfo.dmgFlags &= ~DMG_DEKU_STICK; - this->colCylinder[1].elem.acDmgInfo.dmgFlags |= DMG_DEKU_STICK; - this->colCylinder[2].elem.acDmgInfo.dmgFlags |= DMG_DEKU_STICK; + elem->acDmgInfo.dmgFlags_ColliderElementDamageInfoAC &= ~DMG_DEKU_STICK; + this->colCylinder[1].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC |= DMG_DEKU_STICK; + this->colCylinder[2].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC |= DMG_DEKU_STICK; } } 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 b7983ad59b8..2e8e1543fb4 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -285,16 +285,16 @@ void EnSt_InitColliders(EnSt* this, PlayState* play) { Collider_SetCylinder(play, &this->colCylinder[i], &this->actor, cylinders[i]); } - this->colCylinder[0].elem.acDmgInfo.dmgFlags = + this->colCylinder[0].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_MAGIC_FIRE | DMG_ARROW | DMG_HOOKSHOT | DMG_HAMMER_SWING | DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT; - this->colCylinder[1].elem.acDmgInfo.dmgFlags = + this->colCylinder[1].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = 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.colType_Collider = COLTYPE_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.acDmgInfo.dmgFlags = + this->colCylinder[2].elem.elemType_ColliderElement = ELEMTYPE_UNK2; + this->colCylinder[2].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_DEFAULT & ~(DMG_MAGIC_FIRE | DMG_ARROW | DMG_HOOKSHOT | DMG_HAMMER_SWING | DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT); @@ -309,13 +309,13 @@ void EnSt_CheckBodyStickHit(EnSt* this, PlayState* play) { Player* player = GET_PLAYER(play); if (player->unk_860 != 0) { - bodyElem->acDmgInfo.dmgFlags |= DMG_DEKU_STICK; - this->colCylinder[1].elem.acDmgInfo.dmgFlags &= ~DMG_DEKU_STICK; - this->colCylinder[2].elem.acDmgInfo.dmgFlags &= ~DMG_DEKU_STICK; + bodyElem->acDmgInfo.dmgFlags_ColliderElementDamageInfoAC |= DMG_DEKU_STICK; + this->colCylinder[1].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC &= ~DMG_DEKU_STICK; + this->colCylinder[2].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC &= ~DMG_DEKU_STICK; } else { - bodyElem->acDmgInfo.dmgFlags &= ~DMG_DEKU_STICK; - this->colCylinder[1].elem.acDmgInfo.dmgFlags |= DMG_DEKU_STICK; - this->colCylinder[2].elem.acDmgInfo.dmgFlags |= DMG_DEKU_STICK; + bodyElem->acDmgInfo.dmgFlags_ColliderElementDamageInfoAC &= ~DMG_DEKU_STICK; + this->colCylinder[1].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC |= DMG_DEKU_STICK; + this->colCylinder[2].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC |= DMG_DEKU_STICK; } } @@ -431,14 +431,14 @@ s32 EnSt_CheckHitBackside(EnSt* this, PlayState* play) { if (cyl->base.acFlags & AC_HIT) { cyl->base.acFlags &= ~AC_HIT; hit = true; - flags |= cyl->elem.acHitElem->atDmgInfo.dmgFlags; + flags |= cyl->elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT; } cyl = &this->colCylinder[1]; if (cyl->base.acFlags & AC_HIT) { cyl->base.acFlags &= ~AC_HIT; hit = true; - flags |= cyl->elem.acHitElem->atDmgInfo.dmgFlags; + flags |= cyl->elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT; } if (!hit) { @@ -446,7 +446,7 @@ s32 EnSt_CheckHitBackside(EnSt* this, PlayState* play) { } this->invulnerableTimer = 8; - if (this->actor.colChkInfo.damageEffect == 1) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) { if (this->stunTimer == 0) { Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); this->stunTimer = 120; 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 6ffffd208c9..b651eb80688 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -283,7 +283,7 @@ void EnSw_Init(Actor* thisx, PlayState* play) { this->actor.scale.x = 0.0f; FALLTHROUGH; case 1: - this->collider.elements[0].base.atDmgInfo.damage *= 2; + this->collider.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT *= 2; this->actor.naviEnemyId = NAVI_ENEMY_GOLD_SKULLTULA; this->actor.colChkInfo.health *= 2; this->actor.flags &= ~ACTOR_FLAG_0; @@ -322,7 +322,7 @@ s32 func_80B0C9F0(EnSw* this, PlayState* play) { if (this->actor.xyzDistToPlayerSq < SQ(400.0f) && ((this->actor.params & 0xE000) >> 0xD) == 0 && play->actorCtx.unk_02 != 0) { - this->actor.colChkInfo.damage = this->actor.colChkInfo.health; + this->actor.colChkInfo.damage_CollisionCheckInfo = this->actor.colChkInfo.health; phi_v1 = true; } 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 1371a2adba2..1ee23c17c10 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -899,7 +899,7 @@ void EnTest_SetupSlashDown(EnTest* this) { this->unk_7C8 = 0x10; this->actor.speed = 0.0f; EnTest_SetupAction(this, EnTest_SlashDown); - this->swordCollider.elem.atDmgInfo.damage = 16; + this->swordCollider.elem.atDmgInfo.damage_ColliderElementDamageInfoAT = 16; if (this->unk_7DE != 0) { this->unk_7DE = 3; @@ -996,7 +996,7 @@ void EnTest_SetupSlashUp(EnTest* this) { Animation_PlayOnce(&this->skelAnime, &gStalfosUpSlashAnim); this->swordCollider.base.atFlags &= ~AT_BOUNCED; this->unk_7C8 = 0x11; - this->swordCollider.elem.atDmgInfo.damage = 16; + this->swordCollider.elem.atDmgInfo.damage_ColliderElementDamageInfoAT = 16; this->actor.speed = 0.0f; EnTest_SetupAction(this, EnTest_SlashUp); @@ -1085,7 +1085,7 @@ void EnTest_SetupJumpslash(EnTest* this) { this->actor.world.rot.y = this->actor.shape.rot.y; this->swordCollider.base.atFlags &= ~AT_BOUNCED; EnTest_SetupAction(this, EnTest_Jumpslash); - this->swordCollider.elem.atDmgInfo.damage = 32; + this->swordCollider.elem.atDmgInfo.damage_ColliderElementDamageInfoAT = 32; if (this->unk_7DE != 0) { this->unk_7DE = 3; @@ -1663,9 +1663,9 @@ void EnTest_UpdateDamage(EnTest* this, PlayState* play) { } else if (this->bodyCollider.base.acFlags & AC_HIT) { this->bodyCollider.base.acFlags &= ~AC_HIT; - if ((this->actor.colChkInfo.damageEffect != STALFOS_DMGEFF_SLING) && - (this->actor.colChkInfo.damageEffect != STALFOS_DMGEFF_FIREMAGIC)) { - this->lastDamageEffect = this->actor.colChkInfo.damageEffect; + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != STALFOS_DMGEFF_SLING) && + (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != STALFOS_DMGEFF_FIREMAGIC)) { + this->lastDamageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; if (this->swordState >= 1) { this->swordState = 0; } @@ -1674,9 +1674,9 @@ void EnTest_UpdateDamage(EnTest* this, PlayState* play) { Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, false); Audio_StopSfxByPosAndId(&this->actor.projectedPos, NA_SE_EN_STAL_WARAU); - if ((this->actor.colChkInfo.damageEffect == STALFOS_DMGEFF_STUN) || - (this->actor.colChkInfo.damageEffect == STALFOS_DMGEFF_FREEZE) || - (this->actor.colChkInfo.damageEffect == STALFOS_DMGEFF_LIGHT)) { + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == STALFOS_DMGEFF_STUN) || + (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == STALFOS_DMGEFF_FREEZE) || + (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == STALFOS_DMGEFF_LIGHT)) { if (this->unk_7C8 != 0xB) { Actor_ApplyDamage(&this->actor); EnTest_SetupStunned(this); @@ -1708,7 +1708,7 @@ void EnTest_Update(Actor* thisx, PlayState* play) { EnTest_UpdateDamage(this, play); - if (this->actor.colChkInfo.damageEffect != STALFOS_DMGEFF_FIREMAGIC) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != STALFOS_DMGEFF_FIREMAGIC) { Actor_MoveXZGravity(&this->actor); Actor_UpdateBgCheckInfo(play, &this->actor, 75.0f, 30.0f, 30.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 | 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 adf19950a77..5c5f0748f52 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -850,11 +850,11 @@ void EnTite_CheckDamage(Actor* thisx, PlayState* play) { if ((this->collider.base.acFlags & AC_HIT) && (this->action >= TEKTITE_IDLE)) { this->collider.base.acFlags &= ~AC_HIT; - if (thisx->colChkInfo.damageEffect != 0xE) { // Immune to fire magic - this->damageEffect = thisx->colChkInfo.damageEffect; + if (thisx->colChkInfo.damageEffect_CollisionCheckInfo != 0xE) { // Immune to fire magic + this->damageEffect = thisx->colChkInfo.damageEffect_CollisionCheckInfo; Actor_SetDropFlag(thisx, &this->collider.elements[0].base, false); // Stun if Tektite hit by nut, boomerang, hookshot, ice arrow or ice magic - if ((thisx->colChkInfo.damageEffect == 1) || (thisx->colChkInfo.damageEffect == 0xF)) { + if ((thisx->colChkInfo.damageEffect_CollisionCheckInfo == 1) || (thisx->colChkInfo.damageEffect_CollisionCheckInfo == 0xF)) { if (this->action != TEKTITE_STUNNED) { Actor_SetColorFilter(thisx, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); Actor_ApplyDamage(thisx); @@ -900,7 +900,7 @@ void EnTite_Update(Actor* thisx, PlayState* play) { EnTite_CheckDamage(thisx, play); // Stay still if hit by immunity damage type this frame - if (thisx->colChkInfo.damageEffect != 0xE) { + if (thisx->colChkInfo.damageEffect_CollisionCheckInfo != 0xE) { this->actionFunc(this, play); Actor_MoveXZGravity(thisx); Actor_UpdateBgCheckInfo(play, thisx, 25.0f, 40.0f, 20.0f, this->unk_2DC); 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 8c3c1c90a89..cecf51e05a2 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -103,8 +103,8 @@ 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].elem.atDmgInfo.damage = this->meleeWeaponQuads[1].elem.atDmgInfo.damage = 8; + this->meleeWeaponQuads[0].base.colType_Collider = this->meleeWeaponQuads[1].base.colType_Collider = COLTYPE_METAL; + this->meleeWeaponQuads[0].elem.atDmgInfo.damage_ColliderElementDamageInfoAT = this->meleeWeaponQuads[1].elem.atDmgInfo.damage_ColliderElementDamageInfoAT = 8; this->meleeWeaponQuads[0].elem.acElemFlags = this->meleeWeaponQuads[1].elem.acElemFlags = ACELEM_ON; this->shieldQuad.base.atFlags = AT_ON | AT_TYPE_ENEMY; this->shieldQuad.base.acFlags = AC_ON | AC_HARD | AC_TYPE_PLAYER; @@ -576,7 +576,7 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { this->unk_8A1 = 2; this->unk_8A4 = 6.0f; this->unk_8A8 = 6.0f; - this->unk_8A0 = this->actor.colChkInfo.damage; + this->unk_8A0 = this->actor.colChkInfo.damage_CollisionCheckInfo; this->unk_8A2 = this->actor.yawTowardsPlayer + 0x8000; sDeathFlag++; sActionState = ENTORCH2_DEATH; @@ -585,7 +585,7 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { this->stateFlags3 &= ~PLAYER_STATE3_2; } else { func_800F5ACC(NA_BGM_MINI_BOSS); - if (this->actor.colChkInfo.damageEffect == 1) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) { if (sAlpha == 255) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 80); } else { @@ -593,7 +593,7 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { } } else { this->actor.flags &= ~ACTOR_FLAG_0; - this->unk_8A0 = this->actor.colChkInfo.damage; + this->unk_8A0 = this->actor.colChkInfo.damage_CollisionCheckInfo; this->unk_8A1 = 1; this->unk_8A8 = 6.0f; this->unk_8A4 = 8.0f; @@ -609,7 +609,7 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { } } } - this->actor.colChkInfo.damage = 0; + this->actor.colChkInfo.damage_CollisionCheckInfo = 0; this->unk_8A0 = 0; } @@ -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.colType_Collider = COLTYPE_NONE; + this->cylinder.elem.elemType_ColliderElement = ELEMTYPE_UNK5; } else { - this->cylinder.base.colType = COLTYPE_HIT5; - this->cylinder.elem.elemType = ELEMTYPE_UNK1; + this->cylinder.base.colType_Collider = COLTYPE_HIT5; + this->cylinder.elem.elemType_ColliderElement = ELEMTYPE_UNK1; } /* * Handles the jump movement onto Link's sword. Dark Link doesn't move during the 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 73282570e3f..6fe008cfe0f 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -581,10 +581,10 @@ void EnTp_UpdateDamage(EnTp* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlagJntSph(&this->actor, &this->collider, true); - this->damageEffect = this->actor.colChkInfo.damageEffect; + this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; - if (this->actor.colChkInfo.damageEffect != TAILPASARAN_DMGEFF_NONE) { - if (this->actor.colChkInfo.damageEffect == TAILPASARAN_DMGEFF_DEKUNUT) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != TAILPASARAN_DMGEFF_NONE) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == TAILPASARAN_DMGEFF_DEKUNUT) { phi_s4 = 1; } @@ -599,7 +599,7 @@ void EnTp_UpdateDamage(EnTp* this, PlayState* play) { if (head->actor.params <= TAILPASARAN_HEAD) { EnTp_SetupDie(head); - head->damageEffect = this->actor.colChkInfo.damageEffect; + head->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; head->actor.params = TAILPASARAN_HEAD_DYING; } } else { 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 b48c0e3e203..c9e0ab9242a 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -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.effect_ColliderElementDamageInfoAC = 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.effect_ColliderElementDamageInfoAC = 1; // Shock? EnVali_SetupFloatIdle(this); } } @@ -498,21 +498,21 @@ void EnVali_UpdateDamage(EnVali* this, PlayState* play) { this->bodyCollider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, true); - if ((this->actor.colChkInfo.damageEffect != BARI_DMGEFF_NONE) || (this->actor.colChkInfo.damage != 0)) { + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != BARI_DMGEFF_NONE) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { if (Actor_ApplyDamage(&this->actor) == 0) { Actor_PlaySfx(&this->actor, NA_SE_EN_BARI_DEAD); Enemy_StartFinishingBlow(play, &this->actor); this->actor.flags &= ~ACTOR_FLAG_0; - } else if ((this->actor.colChkInfo.damageEffect != BARI_DMGEFF_STUN) && - (this->actor.colChkInfo.damageEffect != BARI_DMGEFF_SLINGSHOT)) { + } else if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != BARI_DMGEFF_STUN) && + (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != BARI_DMGEFF_SLINGSHOT)) { Actor_PlaySfx(&this->actor, NA_SE_EN_BARI_DAMAGE); } - if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_STUN) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == BARI_DMGEFF_STUN) { if (this->actionFunc != EnVali_Stunned) { EnVali_SetupStunned(this); } - } else if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_SWORD) { + } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == BARI_DMGEFF_SWORD) { if (this->actionFunc != EnVali_Stunned) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 150, COLORFILTER_BUFFLAG_XLU, 30); this->actor.params = BARI_TYPE_SWORD_DAMAGE; @@ -520,11 +520,11 @@ void EnVali_UpdateDamage(EnVali* this, PlayState* play) { } else { EnVali_SetupRetaliate(this); } - } else if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_FIRE) { + } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == BARI_DMGEFF_FIRE) { EnVali_SetupBurnt(this); - } else if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_ICE) { + } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == BARI_DMGEFF_ICE) { EnVali_SetupFrozen(this); - } else if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_SLINGSHOT) { + } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == BARI_DMGEFF_SLINGSHOT) { if (this->slingshotReactionTimer == 0) { this->slingshotReactionTimer = 20; } 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 645b077de73..9e29e216a88 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -219,7 +219,7 @@ void EnWallmas_SetupReturnToCeiling(EnWallmas* this) { void EnWallmas_SetupTakeDamage(EnWallmas* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gWallmasterDamageAnim, -3.0f); - if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_ARROW | DMG_SLINGSHOT)) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_ARROW | DMG_SLINGSHOT)) { this->actor.world.rot.y = this->collider.base.ac->world.rot.y; } else { this->actor.world.rot.y = Actor_WorldYawTowardActor(&this->actor, this->collider.base.ac) + 0x8000; @@ -278,7 +278,7 @@ void EnWallmas_SetupStun(EnWallmas* this) { Animation_Change(&this->skelAnime, &gWallmasterJumpAnim, 1.5f, 0, 20.0f, ANIMMODE_ONCE, -3.0f); this->actor.speed = 0.0f; - if (this->actor.colChkInfo.damageEffect == 4) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 4) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 255, COLORFILTER_BUFFLAG_OPA, 80); } else { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 80); @@ -508,24 +508,24 @@ void EnWallmas_ColUpdate(EnWallmas* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { 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->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_DEAD); this->actor.flags &= ~ACTOR_FLAG_0; } else { - if (this->actor.colChkInfo.damage != 0) { + if (this->actor.colChkInfo.damage_CollisionCheckInfo != 0) { Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_DAMAGE); } } - if ((this->actor.colChkInfo.damageEffect == DAMAGE_EFFECT_STUN_WHITE) || - (this->actor.colChkInfo.damageEffect == DAMAGE_EFFECT_STUN_BLUE)) { + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DAMAGE_EFFECT_STUN_WHITE) || + (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DAMAGE_EFFECT_STUN_BLUE)) { if (this->actionFunc != EnWallmas_Stun) { EnWallmas_SetupStun(this); } } else { - if (this->actor.colChkInfo.damageEffect == DAMAGE_EFFECT_BURN) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DAMAGE_EFFECT_BURN) { EffectSsFCircle_Spawn(play, &this->actor, &this->actor.world.pos, 40, 40); } 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 693e2796cc2..aa984172f5e 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -563,8 +563,8 @@ void func_80B3368C(EnWeiyer* 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->actor.colChkInfo.damageEffect == 1) { + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) { if (this->actionFunc != func_80B333B8) { func_80B32660(this); } 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 a0088fc6994..350a4babcb2 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -241,8 +241,8 @@ void EnWf_Init(Actor* thisx, PlayState* play) { SkelAnime_InitFlex(play, &this->skelAnime, &gWolfosWhiteSkel, &gWolfosWaitingAnim, this->jointTable, this->morphTable, WOLFOS_LIMB_MAX); Actor_SetScale(thisx, 0.01f); - this->colliderSpheres.elements[0].base.atDmgInfo.damage = - this->colliderSpheres.elements[1].base.atDmgInfo.damage = 8; + this->colliderSpheres.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT = + this->colliderSpheres.elements[1].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 8; thisx->naviEnemyId = NAVI_ENEMY_WHITE_WOLFOS; } @@ -1258,19 +1258,19 @@ void EnWf_UpdateDamage(EnWf* this, PlayState* play) { if ((!(this->colliderCylinderBody.base.acFlags & AC_HIT) && (this->colliderCylinderTail.base.acFlags & AC_HIT)) || (ABS(yawDiff) > 19000)) { - this->actor.colChkInfo.damage *= 4; + this->actor.colChkInfo.damage_CollisionCheckInfo *= 4; } this->colliderCylinderBody.base.acFlags &= ~AC_HIT; this->colliderCylinderTail.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect != ENWF_DMGEFF_ICE_MAGIC) { - this->damageEffect = this->actor.colChkInfo.damageEffect; + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != ENWF_DMGEFF_ICE_MAGIC) { + this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; Actor_SetDropFlag(&this->actor, &this->colliderCylinderBody.elem, true); this->slashStatus = 0; - if ((this->actor.colChkInfo.damageEffect == ENWF_DMGEFF_STUN) || - (this->actor.colChkInfo.damageEffect == ENWF_DMGEFF_UNDEF)) { + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == ENWF_DMGEFF_STUN) || + (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == ENWF_DMGEFF_UNDEF)) { if (this->action != WOLFOS_ACTION_STUNNED) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); @@ -1302,7 +1302,7 @@ void EnWf_Update(Actor* thisx, PlayState* play) { EnWf_UpdateDamage(this, play); - if (this->actor.colChkInfo.damageEffect != ENWF_DMGEFF_ICE_MAGIC) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != ENWF_DMGEFF_ICE_MAGIC) { Actor_MoveXZGravity(&this->actor); Actor_UpdateBgCheckInfo(play, &this->actor, 32.0f, 30.0f, 60.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 | 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 2ead5193357..ec0811065b5 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 @@ -159,7 +159,7 @@ void EnWonderItem_Init(Actor* thisx, PlayState* play) { colTypeIndex = this->actor.world.rot.z & 0xFF; Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); - this->collider.elem.acDmgInfo.dmgFlags = damageFlags[colTypeIndex]; + this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = damageFlags[colTypeIndex]; this->collider.dim.radius = 20; this->collider.dim.height = 30; this->updateFunc = EnWonderItem_InteractSwitch; @@ -188,7 +188,7 @@ void EnWonderItem_Init(Actor* thisx, PlayState* play) { case WONDERITEM_BOMB_SOLDIER: Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); - this->collider.elem.acDmgInfo.dmgFlags = DMG_SLINGSHOT; + this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_SLINGSHOT; this->unkPos = this->actor.world.pos; this->collider.dim.radius = 35; this->collider.dim.height = 75; 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 05ef602b332..bec53008a17 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -2009,12 +2009,12 @@ void EnZf_UpdateDamage(EnZf* this, PlayState* play) { if (((this->actor.params < ENZF_TYPE_LIZALFOS_MINIBOSS_A) /* not miniboss */ || (D_80B4A1B4 != this->actor.params)) && - (this->actor.colChkInfo.damageEffect != ENZF_DMGEFF_IMMUNE)) { - this->damageEffect = this->actor.colChkInfo.damageEffect; + (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != ENZF_DMGEFF_IMMUNE)) { + this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, false); - if ((this->actor.colChkInfo.damageEffect == ENZF_DMGEFF_STUN) || - (this->actor.colChkInfo.damageEffect == ENZF_DMGEFF_ICE)) { + if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == ENZF_DMGEFF_STUN) || + (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == ENZF_DMGEFF_ICE)) { if (this->action != ENZF_ACTION_STUNNED) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); Actor_ApplyDamage(&this->actor); @@ -2035,7 +2035,7 @@ void EnZf_UpdateDamage(EnZf* this, PlayState* play) { Item_DropCollectibleRandom(play, &this->actor, &this->actor.world.pos, dropParams); Enemy_StartFinishingBlow(play, &this->actor); } else { - if ((D_80B4A1B4 != -1) && ((this->actor.colChkInfo.health + this->actor.colChkInfo.damage) >= 4) && + if ((D_80B4A1B4 != -1) && ((this->actor.colChkInfo.health + this->actor.colChkInfo.damage_CollisionCheckInfo) >= 4) && (this->actor.colChkInfo.health < 4)) { this->damageEffect = ENZF_DMGEFF_PROJECTILE; } @@ -2053,7 +2053,7 @@ void EnZf_Update(Actor* thisx, PlayState* play) { s32 pad2; EnZf_UpdateDamage(this, play); - if (this->actor.colChkInfo.damageEffect != ENZF_DMGEFF_IMMUNE) { + if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != ENZF_DMGEFF_IMMUNE) { this->unk_3F8 = false; if ((this->hopAnimIndex != 1) && (this->action != ENZF_ACTION_HOP_AWAY)) { if (this->actor.speed != 0.0f) { 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 e861cc84e0b..40ef675b229 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -133,9 +133,9 @@ void MagicFire_Update(Actor* thisx, PlayState* play) { } if (this->action == DF_ACTION_EXPAND_SLOWLY) { - this->collider.elem.atDmgInfo.damage = this->actionTimer + 25; + this->collider.elem.atDmgInfo.damage_ColliderElementDamageInfoAT = this->actionTimer + 25; } else if (this->action == DF_ACTION_STOP_EXPANDING) { - this->collider.elem.atDmgInfo.damage = this->actionTimer; + this->collider.elem.atDmgInfo.damage_ColliderElementDamageInfoAT = this->actionTimer; } Collider_UpdateCylinder(&this->actor, &this->collider); this->collider.dim.radius = (this->actor.scale.x * 325.0f); 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 dc7cd70d92f..1ef87b1d3ad 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -125,7 +125,7 @@ void ObjBombiwa_Update(Actor* thisx, PlayState* play) { s32 pad; if ((func_80033684(play, &this->actor) != NULL) || - ((this->collider.base.acFlags & AC_HIT) && (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_HAMMER))) { + ((this->collider.base.acFlags & AC_HIT) && (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HAMMER))) { ObjBombiwa_Break(this, play); Flags_SetSwitch(play, this->actor.params & 0x3F); SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 80, NA_SE_EV_WALL_BROKEN); 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 1c071363cfc..4b32991dc4e 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -176,7 +176,7 @@ void ObjComb_Wait(ObjComb* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - dmgFlags = this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags; + dmgFlags = this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT; if (dmgFlags & (DMG_HAMMER | DMG_ARROW | DMG_SLINGSHOT | DMG_DEKU_STICK)) { this->unk_1B0 = 1500; } else { 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 3eb9e3347df..ab48f3da445 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -170,7 +170,7 @@ void ObjHamishi_Update(Actor* thisx, PlayState* play) { ObjHamishi_Shake(this); - if ((this->collider.base.acFlags & AC_HIT) && (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_HAMMER)) { + if ((this->collider.base.acFlags & AC_HIT) && (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HAMMER)) { this->collider.base.acFlags &= ~AC_HIT; this->hitCount++; if (this->hitCount < 2) { 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 736ba66f77c..93c939e0307 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 @@ -117,7 +117,7 @@ void ObjIcePoly_Idle(ObjIcePoly* this, PlayState* play) { Vec3f pos; if (this->colliderIce.base.acFlags & AC_HIT) { - this->meltTimer = -this->colliderIce.elem.acHitElem->atDmgInfo.damage; + this->meltTimer = -this->colliderIce.elem.acHitElem->atDmgInfo.damage_ColliderElementDamageInfoAT; this->actor.focus.rot.y = this->actor.yawTowardsPlayer; OnePointCutscene_Init(play, 5120, 40, &this->actor, CAM_ID_MAIN); this->actionFunc = ObjIcePoly_Melt; 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 7ea6b73d305..823c6eba877 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -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[this->actor.params >> 0xC]; + this->colliderStand.base.colType_Collider = sColTypesStand[this->actor.params >> 0xC]; Collider_InitCylinder(play, &this->colliderFlame); Collider_SetCylinder(play, &this->colliderFlame, &this->actor, &sCylInitFlame); @@ -171,7 +171,7 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) { } } if (this->colliderFlame.base.acFlags & AC_HIT) { - dmgFlags = this->colliderFlame.elem.acHitElem->atDmgInfo.dmgFlags; + dmgFlags = this->colliderFlame.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT; if (dmgFlags & (DMG_FIRE | DMG_ARROW_NORMAL)) { interactionType = 1; } @@ -197,7 +197,7 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) { arrow = (EnArrow*)this->colliderFlame.base.ac; if ((arrow->actor.update != NULL) && (arrow->actor.id == ACTOR_EN_ARROW)) { arrow->actor.params = 0; - arrow->collider.elem.atDmgInfo.dmgFlags = DMG_ARROW_FIRE; + arrow->collider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_ARROW_FIRE; } } if ((0 <= this->litTimer) && (this->litTimer < (50 * litTimeScale + 100)) && (torchType != 0)) { 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 e089a11481d..2a3cc521240 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -246,7 +246,7 @@ void ObjTsubo_Idle(ObjTsubo* this, PlayState* play) { ObjTsubo_SpawnCollectible(this, play); Actor_Kill(&this->actor); } else if ((this->collider.base.acFlags & AC_HIT) && - (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & + (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_SWORD | DMG_RANGED | DMG_HAMMER | DMG_BOOMERANG | DMG_EXPLOSIVE))) { ObjTsubo_AirBreak(this, play); ObjTsubo_SpawnCollectible(this, play); diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index ece01de6305..b79ab4d7ea0 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -4007,7 +4007,7 @@ s32 func_80837818(Player* this) { } void func_80837918(Player* this, s32 quadIndex, u32 dmgFlags) { - this->meleeWeaponQuads[quadIndex].elem.atDmgInfo.dmgFlags = dmgFlags; + this->meleeWeaponQuads[quadIndex].elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = dmgFlags; if (dmgFlags == DMG_DEKU_STICK) { this->meleeWeaponQuads[quadIndex].elem.atElemFlags = ATELEM_ON | ATELEM_NEAREST | ATELEM_SFX_WOOD; @@ -4120,7 +4120,7 @@ void func_80837C0C(PlayState* play, Player* this, s32 arg2, f32 arg3, f32 arg4, Player_PlaySfx(this, NA_SE_PL_DAMAGE); - if (!func_80837B18(play, this, 0 - this->actor.colChkInfo.damage)) { + if (!func_80837B18(play, this, 0 - this->actor.colChkInfo.damage_CollisionCheckInfo)) { this->stateFlags2 &= ~PLAYER_STATE2_7; if (!(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) && !(this->stateFlags1 & PLAYER_STATE1_27)) { func_80837B9C(this, play); @@ -4212,7 +4212,7 @@ void func_80837C0C(PlayState* play, Player* this, s32 arg2, f32 arg3, f32 arg4, Player_SetupAction(play, this, Player_Action_8084370C, 0); func_80833C3C(this); - if (this->actor.colChkInfo.damage < 5) { + if (this->actor.colChkInfo.damage_CollisionCheckInfo < 5) { Player_RequestRumble(this, 120, 20, 10, 0); } else { Player_RequestRumble(this, 180, 20, 100, 0); @@ -4284,7 +4284,7 @@ void func_8083821C(Player* this) { } void func_80838280(Player* this) { - if (this->actor.colChkInfo.acHitEffect == 1) { + if (this->actor.colChkInfo.acHitEffect_CollisionCheckInfo == 1) { func_8083821C(this); } func_80832698(this, NA_SE_VO_LI_FALL_L); @@ -4351,7 +4351,7 @@ s32 func_808382DC(Player* this, PlayState* play) { this->bodyShockTimer = 40; } - this->actor.colChkInfo.damage += this->unk_8A0; + this->actor.colChkInfo.damage_CollisionCheckInfo += this->unk_8A0; func_80837C0C(play, this, sp5C[this->unk_8A1 - 1], this->unk_8A4, this->unk_8A8, this->unk_8A2, 20); } else { sp64 = (this->shieldQuad.base.acFlags & AC_BOUNCED) != 0; @@ -4394,7 +4394,7 @@ s32 func_808382DC(Player* this, PlayState* play) { } } - if (sp64 && (this->shieldQuad.elem.acHitElem->atDmgInfo.effect == 1)) { + if (sp64 && (this->shieldQuad.elem.acHitElem->atDmgInfo.effect_ColliderElementDamageInfoAT == 1)) { func_8083819C(this, play); } @@ -4417,11 +4417,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.acHitEffect_CollisionCheckInfo == 2) { sp4C = 3; - } else if (this->actor.colChkInfo.acHitEffect == 3) { + } else if (this->actor.colChkInfo.acHitEffect_CollisionCheckInfo == 3) { sp4C = 4; - } else if (this->actor.colChkInfo.acHitEffect == 4) { + } else if (this->actor.colChkInfo.acHitEffect_CollisionCheckInfo == 4) { sp4C = 1; } else { func_80838280(this); @@ -4442,7 +4442,7 @@ s32 func_808382DC(Player* this, PlayState* play) { ((sp48 >= 0) && ((this->currentTunic != PLAYER_TUNIC_GORON) || (this->floorTypeTimer >= D_808544F4[sp48])))) { this->floorTypeTimer = 0; - this->actor.colChkInfo.damage = 4; + this->actor.colChkInfo.damage_CollisionCheckInfo = 4; func_80837C0C(play, this, 0, 4.0f, 5.0f, this->actor.shape.rot.y, 20); } else { return 0; @@ -8466,8 +8466,8 @@ 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) { - this->actor.colChkInfo.damage = 8; + if (this->actor.colChkInfo.atHitEffect_CollisionCheckInfo == 1) { + this->actor.colChkInfo.damage_CollisionCheckInfo = 8; func_80837C0C(play, this, 4, 0.0f, 0.0f, this->actor.shape.rot.y, 20); return 1; } @@ -9072,7 +9072,7 @@ void Player_Action_80844A44(Player* this, PlayState* play) { Math_StepToF(&this->speedXZ, 0.0f, 0.05f); if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { - this->actor.colChkInfo.damage = 0x10; + this->actor.colChkInfo.damage_CollisionCheckInfo = 0x10; func_80837C0C(play, this, 1, 4.0f, 5.0f, this->actor.shape.rot.y, 20); } } @@ -13100,7 +13100,7 @@ void Player_Action_8084E6D4(Player* this, PlayState* play) { this->actor.world.pos.y + 100.0f, this->actor.world.pos.z, 0, 0, 0, 0); func_8083C0E8(this, play); } else { - this->actor.colChkInfo.damage = 0; + this->actor.colChkInfo.damage_CollisionCheckInfo = 0; func_80837C0C(play, this, 3, 0.0f, 0.0f, 0, 20); } return; diff --git a/tools/namefixer.py b/tools/namefixer.py index 150d094c44e..e8bcf41cf24 100755 --- a/tools/namefixer.py +++ b/tools/namefixer.py @@ -216,7 +216,7 @@ "bumper.flags":"bumper.dmgFlags", "maskA ":"ocFlags1 ", "maskB ":"ocFlags2 ", - ".base.type":".base.colType", + ".base.type":".base.colType_Collider", "COLTYPE_UNK11":"COLTYPE_HARD", "COLTYPE_UNK12":"COLTYPE_WOOD", "COLTYPE_UNK13":"COLTYPE_TREE", From 8e80319f0125707a0e77a96a3f677ef276e5a278 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 16 Mar 2024 00:50:51 +0100 Subject: [PATCH 02/12] rename player-only at/acDmgInfo.effect to playerAT/ACHitReaction --- docs/tutorial/introduction.md | 2 +- include/z64actor.h | 20 ++++++++++++++++--- include/z64collision_check.h | 6 +++--- src/code/z_collision_check.c | 12 +++++------ src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 2 +- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 2 +- src/overlays/actors/ovl_En_Bili/z_en_bili.c | 4 ++-- .../actors/ovl_En_Bubble/z_en_bubble.c | 2 +- src/overlays/actors/ovl_En_Bw/z_en_bw.c | 4 ++-- src/overlays/actors/ovl_En_Daiku/z_en_daiku.c | 4 ++-- .../actors/ovl_En_Firefly/z_en_firefly.c | 8 ++++---- src/overlays/actors/ovl_En_Reeba/z_en_reeba.c | 2 +- src/overlays/actors/ovl_En_Vali/z_en_vali.c | 12 +++++------ .../actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c | 4 ++-- .../actors/ovl_player_actor/z_player.c | 12 +++++------ 15 files changed, 55 insertions(+), 41 deletions(-) diff --git a/docs/tutorial/introduction.md b/docs/tutorial/introduction.md index f2f3b789108..bef1cd74398 100644 --- a/docs/tutorial/introduction.md +++ b/docs/tutorial/introduction.md @@ -33,7 +33,7 @@ void func_80A13098(EnFirefly* this) { } else { this->actor.params -= 2; } - this->collider.list->body.atDmgInfo.effect_ColliderElementDamageInfoAT = 1; + this->collider.list->body.atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT = PLAYER_AC_HIT_REACTION_1; this->auraType = 1; this->onFire = 1; this->actor.naviEnemyId = 0x11; diff --git a/include/z64actor.h b/include/z64actor.h index 699ea874d08..04b889ec92e 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -118,6 +118,20 @@ typedef struct { /* 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 { /* 0x00 */ DamageTable* damageTable; /* 0x04 */ Vec3f displacement; // Amount to correct actor velocity by when colliding into a body @@ -127,9 +141,9 @@ typedef struct { /* 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_CollisionCheckInfo; // Amount to decrement health by - /* 0x19 */ u8 damageEffect_CollisionCheckInfo; // Stores what effect should occur when hit by a weapon - /* 0x1A */ u8 atHitEffect_CollisionCheckInfo; // Stores what effect should occur when AT connects with an AC - /* 0x1B */ u8 acHitEffect_CollisionCheckInfo; // Stores what effect should occur when AC is touched by an AT + /* 0x19 */ u8 damageEffect_CollisionCheckInfo; // If a damageTable is set, the effect corresponding to the damage type, as specified in the damage table + /* 0x1A */ u8 playerATHitReaction_CollisionCheckInfo; // (for Player) Reaction from an AT collider hit + /* 0x1B */ u8 playerACHitReaction_CollisionCheckInfo; // (for Player) Reaction from an AC collider hit } CollisionCheckInfo; // size = 0x1C typedef struct { diff --git a/include/z64collision_check.h b/include/z64collision_check.h index 63710b3fed0..2ad25d5b787 100644 --- a/include/z64collision_check.h +++ b/include/z64collision_check.h @@ -77,20 +77,20 @@ typedef struct { typedef struct { /* 0x00 */ u32 dmgFlags_ColliderElementDamageInfoAT; // Damage types dealt by this collider element as AT. - /* 0x04 */ u8 effect_ColliderElementDamageInfoAT; // Damage Effect (Knockback, Fire, etc.) + /* 0x04 */ u8 playerACHitReaction_ColliderElementDamageInfoAT; // Player reaction to a Player AC collider hitting this AT collider /* 0x05 */ u8 damage_ColliderElementDamageInfoAT; // Damage } ColliderElementDamageInfoAT; // size = 0x08 typedef struct { /* 0x00 */ u32 dmgFlags_ColliderElementDamageInfoAC; // Damage types that may affect this collider element as AC. - /* 0x04 */ u8 effect_ColliderElementDamageInfoAC; // Damage Effect (Knockback, Fire, etc.) + /* 0x04 */ u8 playerATHitReaction_ColliderElementDamageInfoAC; // Player reaction to a Player AT collider hitting this AC collider /* 0x05 */ u8 defense_ColliderElementDamageInfoAC; // Damage Resistance /* 0x06 */ Vec3s hitPos; // Point of contact } ColliderElementDamageInfoAC; // size = 0x0C typedef struct { /* 0x00 */ u32 dmgFlags_ColliderElementDamageInfoACInit; // Damage types that may affect this collider element as AC. - /* 0x04 */ u8 effect_ColliderElementDamageInfoACInit; // Damage Effect (Knockback, Fire, etc.) + /* 0x04 */ u8 playerATHitReaction_ColliderElementDamageInfoACInit; // Player reaction to a Player AT collider hitting this AC collider /* 0x05 */ u8 defense_ColliderElementDamageInfoACInit; // Damage Resistance } ColliderElementDamageInfoACInit; // size = 0x08 diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 7fc9966aa7a..d4298dbf00e 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -153,7 +153,7 @@ s32 Collider_DestroyElementDamageInfoAT(PlayState* play, ColliderElementDamageIn s32 Collider_SetElementDamageInfoAT(PlayState* play, ColliderElementDamageInfoAT* dest, ColliderElementDamageInfoAT* src) { dest->dmgFlags_ColliderElementDamageInfoAT = src->dmgFlags_ColliderElementDamageInfoAT; - dest->effect_ColliderElementDamageInfoAT = src->effect_ColliderElementDamageInfoAT; + dest->playerACHitReaction_ColliderElementDamageInfoAT = src->playerACHitReaction_ColliderElementDamageInfoAT; dest->damage_ColliderElementDamageInfoAT = src->damage_ColliderElementDamageInfoAT; return true; } @@ -175,7 +175,7 @@ s32 Collider_DestroyElementDamageInfoAC(PlayState* play, ColliderElementDamageIn s32 Collider_SetElementDamageInfoAC(PlayState* play, ColliderElementDamageInfoAC* acDmgInfo, ColliderElementDamageInfoACInit* init) { acDmgInfo->dmgFlags_ColliderElementDamageInfoAC = init->dmgFlags_ColliderElementDamageInfoACInit; - acDmgInfo->effect_ColliderElementDamageInfoAC = init->effect_ColliderElementDamageInfoACInit; + acDmgInfo->playerATHitReaction_ColliderElementDamageInfoAC = init->playerATHitReaction_ColliderElementDamageInfoACInit; acDmgInfo->defense_ColliderElementDamageInfoAC = init->defense_ColliderElementDamageInfoACInit; return true; } @@ -1713,7 +1713,7 @@ s32 CollisionCheck_SetATvsAC(PlayState* play, Collider* atCol, ColliderElement* atElem->atHitElem = acElem; atElem->atElemFlags |= ATELEM_HIT; if (atCol->actor != NULL) { - atCol->actor->colChkInfo.atHitEffect_CollisionCheckInfo = acElem->acDmgInfo.effect_ColliderElementDamageInfoAC; + atCol->actor->colChkInfo.playerATHitReaction_CollisionCheckInfo = acElem->acDmgInfo.playerATHitReaction_ColliderElementDamageInfoAC; } } acCol->acFlags |= AC_HIT; @@ -1722,7 +1722,7 @@ s32 CollisionCheck_SetATvsAC(PlayState* play, Collider* atCol, ColliderElement* acElem->acHitElem = atElem; acElem->acElemFlags |= ACELEM_HIT; if (acCol->actor != NULL) { - acCol->actor->colChkInfo.acHitEffect_CollisionCheckInfo = atElem->atDmgInfo.effect_ColliderElementDamageInfoAT; + acCol->actor->colChkInfo.playerACHitReaction_CollisionCheckInfo = atElem->atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT; } acElem->acDmgInfo.hitPos.x = hitPos->x; acElem->acDmgInfo.hitPos.y = hitPos->y; @@ -2991,8 +2991,8 @@ void CollisionCheck_InitInfo(CollisionCheckInfo* info) { void CollisionCheck_ResetDamage(CollisionCheckInfo* info) { info->damage_CollisionCheckInfo = 0; info->damageEffect_CollisionCheckInfo = 0; - info->atHitEffect_CollisionCheckInfo = 0; - info->acHitEffect_CollisionCheckInfo = 0; + info->playerATHitReaction_CollisionCheckInfo = PLAYER_AT_HIT_REACTION_0; + info->playerACHitReaction_CollisionCheckInfo = PLAYER_AC_HIT_REACTION_0; info->displacement.x = info->displacement.y = info->displacement.z = 0.0f; } 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 1ac40266c03..1640cb0c1c1 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -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_ColliderElementDamageInfoAT = 1; + this->collider.elem.atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT = 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) { 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 b7c6e13586c..89bbc44e9e4 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -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_ColliderElementDamageInfoAT = 1; + this->collider.elements[0].base.atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT = PLAYER_AC_HIT_REACTION_1; EnBb_SetupRed(play, this); break; case ENBB_WHITE: 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 bf5da57d918..165ee8c5197 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -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_ColliderElementDamageInfoAC = 1; // Shock? + this->collider.elem.acDmgInfo.playerATHitReaction_ColliderElementDamageInfoAC = 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_ColliderElementDamageInfoAC = 0; + this->collider.elem.acDmgInfo.playerATHitReaction_ColliderElementDamageInfoAC = 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_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index 8ba20e44905..7b349e1767e 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -98,7 +98,7 @@ u32 func_809CBCBC(EnBubble* this) { ColliderElement* elem = &this->colliderSphere.elements[0].base; elem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_EXPLOSIVE; - elem->atDmgInfo.effect_ColliderElementDamageInfoAT = 0; + elem->atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT = PLAYER_AC_HIT_REACTION_0; elem->atDmgInfo.damage_ColliderElementDamageInfoAT = 4; elem->atElemFlags = ATELEM_ON; this->actor.velocity.y = 0.0f; 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 cedca8c0be2..167ae922532 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -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_ColliderElementDamageInfoAT = 0; + this->collider1.elem.atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT = 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_ColliderElementDamageInfoAT = 1; + this->collider1.elem.atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT = 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_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index c99af399563..3a350e381d1 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -64,8 +64,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEMTYPE_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, + { 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_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index 02dc7b5ccd4..4ffc2a63452 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -118,7 +118,7 @@ static InitChainEntry sInitChain[] = { void EnFirefly_Extinguish(EnFirefly* this) { this->actor.params += 2; - this->collider.elements[0].base.atDmgInfo.effect_ColliderElementDamageInfoAT = 0; // None + this->collider.elements[0].base.atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT = 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_ColliderElementDamageInfoAT = 1; // Fire + this->collider.elements[0].base.atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT = 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_ColliderElementDamageInfoAT = 2; // Ice + this->collider.elements[0].base.atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT = PLAYER_AC_HIT_REACTION_2; // Ice this->actor.naviEnemyId = NAVI_ENEMY_ICE_KEESE; } else { - this->collider.elements[0].base.atDmgInfo.effect_ColliderElementDamageInfoAT = 0; // Nothing + this->collider.elements[0].base.atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT = PLAYER_AC_HIT_REACTION_0; // Nothing this->actor.naviEnemyId = NAVI_ENEMY_KEESE; } 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 c32dbb23fa3..e317b356f9b 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -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_ColliderElementDamageInfoAT = 4; + this->collider.elem.atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT = PLAYER_AC_HIT_REACTION_4; this->collider.elem.atDmgInfo.damage_ColliderElementDamageInfoAT = 16; Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_ENEMY); } 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 c9e0ab9242a..76922dc34c1 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -52,8 +52,8 @@ static ColliderQuadInit sQuadInit = { }, { ELEMTYPE_UNK0, - { 0xFFCFFFFF, 0x07, 0x08 }, - { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, PLAYER_AC_HIT_REACTION_7, 0x08 }, + { 0x00000000, PLAYER_AT_HIT_REACTION_0, 0x00 }, ATELEM_ON | ATELEM_SFX_NONE, ACELEM_NONE, OCELEM_NONE, @@ -72,8 +72,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEMTYPE_UNK0, - { 0xFFCFFFFF, 0x07, 0x08 }, - { 0xFFCFFFFF, 0x01, 0x00 }, + { 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_ColliderElementDamageInfoAC = 0; + this->bodyCollider.elem.acDmgInfo.playerATHitReaction_ColliderElementDamageInfoAC = 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_ColliderElementDamageInfoAC = 1; // Shock? + this->bodyCollider.elem.acDmgInfo.playerATHitReaction_ColliderElementDamageInfoAC = PLAYER_AT_HIT_REACTION_1; // Shock? EnVali_SetupFloatIdle(this); } } 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 1ef87b1d3ad..b3f6b6fce33 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -41,8 +41,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEMTYPE_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x4FC1FFFE, 0x00, 0x00 }, + { 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_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index b79ab4d7ea0..906354de5e1 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -4284,7 +4284,7 @@ void func_8083821C(Player* this) { } void func_80838280(Player* this) { - if (this->actor.colChkInfo.acHitEffect_CollisionCheckInfo == 1) { + if (this->actor.colChkInfo.playerACHitReaction_CollisionCheckInfo == PLAYER_AC_HIT_REACTION_1) { func_8083821C(this); } func_80832698(this, NA_SE_VO_LI_FALL_L); @@ -4394,7 +4394,7 @@ s32 func_808382DC(Player* this, PlayState* play) { } } - if (sp64 && (this->shieldQuad.elem.acHitElem->atDmgInfo.effect_ColliderElementDamageInfoAT == 1)) { + if (sp64 && (this->shieldQuad.elem.acHitElem->atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT == 1)) { func_8083819C(this, play); } @@ -4417,11 +4417,11 @@ s32 func_808382DC(Player* this, PlayState* play) { if (this->stateFlags1 & PLAYER_STATE1_27) { sp4C = 0; - } else if (this->actor.colChkInfo.acHitEffect_CollisionCheckInfo == 2) { + } else if (this->actor.colChkInfo.playerACHitReaction_CollisionCheckInfo == PLAYER_AC_HIT_REACTION_2) { sp4C = 3; - } else if (this->actor.colChkInfo.acHitEffect_CollisionCheckInfo == 3) { + } else if (this->actor.colChkInfo.playerACHitReaction_CollisionCheckInfo == PLAYER_AC_HIT_REACTION_3) { sp4C = 4; - } else if (this->actor.colChkInfo.acHitEffect_CollisionCheckInfo == 4) { + } else if (this->actor.colChkInfo.playerACHitReaction_CollisionCheckInfo == PLAYER_AC_HIT_REACTION_4) { sp4C = 1; } else { func_80838280(this); @@ -8466,7 +8466,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_CollisionCheckInfo == 1) { + if (this->actor.colChkInfo.playerATHitReaction_CollisionCheckInfo == PLAYER_AT_HIT_REACTION_1) { this->actor.colChkInfo.damage_CollisionCheckInfo = 8; func_80837C0C(play, this, 4, 0.0f, 0.0f, this->actor.shape.rot.y, 20); return 1; From 22e93dfd30a969044fecde9f58c23f5af03a2b3b Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 16 Mar 2024 01:10:33 +0100 Subject: [PATCH 03/12] missing COLTYPE_ enum uses --- src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c | 4 ++-- src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c | 2 +- src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 971f8c0e15a..1353cc4eb7a 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -2370,7 +2370,7 @@ void BossGanon_SetupBlock(BossGanon* this, PlayState* play) { } void BossGanon_Block(BossGanon* this, PlayState* play) { - this->collider.base.colType_Collider = 9; + this->collider.base.colType_Collider = COLTYPE_METAL; SkelAnime_Update(&this->skelAnime); sCape->backPush = -9.0f; sCape->backSwayMagnitude = 0.25f; @@ -2821,7 +2821,7 @@ void BossGanon_Update(Actor* thisx, PlayState* play2) { } } - this->collider.base.colType_Collider = 3; + this->collider.base.colType_Collider = COLTYPE_HIT3; sCape->gravity = -3.0f; this->shockGlow = false; this->actor.flags &= ~ACTOR_FLAG_0; 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 3189afe333c..0e315d3ba67 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 @@ -1145,7 +1145,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_Collider == 9 || + } else if (this->collider.base.colType_Collider == COLTYPE_METAL || (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0 && this->actor.colChkInfo.damage_CollisionCheckInfo == 0)) { if (this->unk_194 == 0) { this->actor.freezeTimer = 0; 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 823c6eba877..11ceeec44b9 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -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[] = { COLTYPE_METAL, COLTYPE_WOOD, COLTYPE_WOOD }; s32 pad; ObjSyokudai* this = (ObjSyokudai*)thisx; s32 torchType = this->actor.params & 0xF000; From 278ab55954550a73fb3d170a528848647991cf7d Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 16 Mar 2024 01:49:39 +0100 Subject: [PATCH 04/12] change col,elem "type" to material --- docs/tutorial/beginning_decomp.md | 8 +- docs/tutorial/data.md | 12 +-- include/z64collision_check.h | 68 ++++++++--------- src/code/z_collision_check.c | 74 +++++++++---------- src/code/z_en_a_keep.c | 4 +- src/code/z_en_item00.c | 4 +- src/code/z_player_lib.c | 10 +-- .../actors/ovl_Arms_Hook/z_arms_hook.c | 6 +- .../ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c | 4 +- .../ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c | 4 +- .../actors/ovl_Bg_Bombwall/z_bg_bombwall.c | 8 +- .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c | 4 +- .../actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c | 4 +- .../actors/ovl_Bg_Dodoago/z_bg_dodoago.c | 8 +- .../ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c | 4 +- .../ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c | 14 ++-- .../actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c | 10 +-- .../actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c | 8 +- .../actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c | 4 +- .../ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c | 4 +- .../ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c | 10 +-- .../z_bg_hidan_firewall.c | 4 +- .../ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c | 4 +- .../ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c | 6 +- .../ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c | 6 +- .../z_bg_hidan_kowarerukabe.c | 4 +- .../ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c | 4 +- .../z_bg_hidan_rsekizou.c | 14 ++-- .../ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c | 14 ++-- .../ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c | 6 +- .../ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c | 8 +- .../ovl_Bg_Ice_Turara/z_bg_ice_turara.c | 4 +- .../ovl_Bg_Jya_1flift/z_bg_jya_1flift.c | 4 +- .../z_bg_jya_bombchuiwa.c | 4 +- .../ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c | 4 +- .../ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c | 4 +- .../ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c | 4 +- .../ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c | 4 +- .../ovl_Bg_Jya_Megami/z_bg_jya_megami.c | 4 +- .../ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c | 4 +- .../ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c | 18 ++--- .../ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c | 4 +- .../actors/ovl_Bg_Po_Event/z_bg_po_event.c | 6 +- .../ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c | 4 +- .../z_bg_spot06_objects.c | 4 +- .../z_bg_spot08_bakudankabe.c | 8 +- .../z_bg_spot11_bakudankabe.c | 4 +- .../z_bg_spot16_bombstone.c | 8 +- .../ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c | 6 +- .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c | 4 +- .../ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c | 6 +- .../actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c | 6 +- .../z_boss_dodongo_data.inc.c | 40 +++++----- .../actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c | 40 +++++----- src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c | 8 +- .../ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c | 20 ++--- .../actors/ovl_Boss_Ganon/z_boss_ganon.c | 12 +-- .../ovl_Boss_Ganon2/z_boss_ganon2_data.inc.c | 40 +++++----- .../ovl_Boss_Ganondrof/z_boss_ganondrof.c | 14 ++-- .../actors/ovl_Boss_Goma/z_boss_goma.c | 28 +++---- .../actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c | 44 +++++------ src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 6 +- .../ovl_Boss_Sst/z_boss_sst_colchk.inc.c | 56 +++++++------- src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 20 ++--- src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 16 ++-- src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 12 +-- src/overlays/actors/ovl_Demo_Im/z_demo_im.c | 2 +- .../actors/ovl_Demo_Kekkai/z_demo_kekkai.c | 4 +- src/overlays/actors/ovl_Door_Ana/z_door_ana.c | 4 +- .../actors/ovl_Door_Killer/z_door_killer.c | 8 +- src/overlays/actors/ovl_En_Am/z_en_am.c | 12 +-- src/overlays/actors/ovl_En_Ani/z_en_ani.c | 4 +- .../actors/ovl_En_Anubice/z_en_anubice.c | 4 +- .../ovl_En_Anubice_Fire/z_en_anubice_fire.c | 4 +- src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 6 +- src/overlays/actors/ovl_En_Ba/z_en_ba.c | 6 +- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 4 +- .../actors/ovl_En_Bigokuta/z_en_bigokuta.c | 12 +-- src/overlays/actors/ovl_En_Bili/z_en_bili.c | 4 +- src/overlays/actors/ovl_En_Bom/z_en_bom.c | 8 +- .../actors/ovl_En_Bom_Chu/z_en_bom_chu.c | 4 +- src/overlays/actors/ovl_En_Bombf/z_en_bombf.c | 8 +- src/overlays/actors/ovl_En_Boom/z_en_boom.c | 4 +- src/overlays/actors/ovl_En_Brob/z_en_brob.c | 4 +- .../actors/ovl_En_Bubble/z_en_bubble.c | 6 +- src/overlays/actors/ovl_En_Butte/z_en_butte.c | 4 +- src/overlays/actors/ovl_En_Bw/z_en_bw.c | 8 +- src/overlays/actors/ovl_En_Bx/z_en_bx.c | 8 +- .../actors/ovl_En_Clear_Tag/z_en_clear_tag.c | 8 +- src/overlays/actors/ovl_En_Cow/z_en_cow.c | 4 +- src/overlays/actors/ovl_En_Crow/z_en_crow.c | 4 +- src/overlays/actors/ovl_En_Cs/z_en_cs.c | 4 +- src/overlays/actors/ovl_En_Daiku/z_en_daiku.c | 4 +- .../z_en_daiku_kakariko.c | 4 +- .../actors/ovl_En_Dekubaba/z_en_dekubaba.c | 24 +++--- .../actors/ovl_En_Dekunuts/z_en_dekunuts.c | 4 +- src/overlays/actors/ovl_En_Dh/z_en_dh.c | 8 +- src/overlays/actors/ovl_En_Dha/z_en_dha.c | 12 +-- .../ovl_En_Diving_Game/z_en_diving_game.c | 4 +- src/overlays/actors/ovl_En_Dns/z_en_dns.c | 4 +- .../actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c | 4 +- .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c | 8 +- .../actors/ovl_En_Dodojr/z_en_dodojr.c | 4 +- .../actors/ovl_En_Dodongo/z_en_dodongo.c | 26 +++---- src/overlays/actors/ovl_En_Dog/z_en_dog.c | 4 +- src/overlays/actors/ovl_En_Du/z_en_du.c | 4 +- src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c | 4 +- src/overlays/actors/ovl_En_Fd/z_en_fd.c | 26 +++---- .../actors/ovl_En_Fd_Fire/z_en_fd_fire.c | 4 +- .../actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c | 4 +- .../actors/ovl_En_Fire_Rock/z_en_fire_rock.c | 8 +- .../actors/ovl_En_Firefly/z_en_firefly.c | 4 +- src/overlays/actors/ovl_En_Fish/z_en_fish.c | 4 +- .../actors/ovl_En_Floormas/z_en_floormas.c | 20 ++--- src/overlays/actors/ovl_En_Fu/z_en_fu.c | 4 +- src/overlays/actors/ovl_En_Fw/z_en_fw.c | 4 +- src/overlays/actors/ovl_En_Fz/z_en_fz.c | 12 +-- .../actors/ovl_En_G_Switch/z_en_g_switch.c | 4 +- src/overlays/actors/ovl_En_Gb/z_en_gb.c | 16 ++-- src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 4 +- src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 4 +- src/overlays/actors/ovl_En_Ge3/z_en_ge3.c | 4 +- src/overlays/actors/ovl_En_GeldB/z_en_geldb.c | 14 ++-- src/overlays/actors/ovl_En_Gm/z_en_gm.c | 4 +- src/overlays/actors/ovl_En_Go/z_en_go.c | 4 +- src/overlays/actors/ovl_En_Go2/z_en_go2.c | 4 +- src/overlays/actors/ovl_En_Goma/z_en_goma.c | 8 +- .../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 4 +- src/overlays/actors/ovl_En_Gs/z_en_gs.c | 4 +- src/overlays/actors/ovl_En_Guest/z_en_guest.c | 2 +- src/overlays/actors/ovl_En_Hata/z_en_hata.c | 4 +- .../actors/ovl_En_Heishi2/z_en_heishi2.c | 4 +- .../actors/ovl_En_Heishi3/z_en_heishi3.c | 4 +- .../actors/ovl_En_Heishi4/z_en_heishi4.c | 4 +- .../actors/ovl_En_Hintnuts/z_en_hintnuts.c | 4 +- .../actors/ovl_En_Honotrap/z_en_honotrap.c | 10 +-- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 12 +-- .../ovl_En_Horse_Ganon/z_en_horse_ganon.c | 8 +- .../z_en_horse_link_child.c | 8 +- .../ovl_En_Horse_Normal/z_en_horse_normal.c | 12 +-- .../ovl_En_Horse_Zelda/z_en_horse_zelda.c | 8 +- src/overlays/actors/ovl_En_Hs/z_en_hs.c | 4 +- src/overlays/actors/ovl_En_Hs2/z_en_hs2.c | 4 +- src/overlays/actors/ovl_En_Hy/z_en_hy.c | 4 +- .../actors/ovl_En_Ice_Hono/z_en_ice_hono.c | 8 +- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 14 ++-- src/overlays/actors/ovl_En_In/z_en_in.c | 4 +- .../actors/ovl_En_Insect/z_en_insect.c | 4 +- src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 8 +- src/overlays/actors/ovl_En_It/z_en_it.c | 4 +- src/overlays/actors/ovl_En_Jj/z_en_jj.c | 4 +- src/overlays/actors/ovl_En_Js/z_en_js.c | 4 +- .../actors/ovl_En_Kakasi/z_en_kakasi.c | 4 +- .../actors/ovl_En_Kakasi2/z_en_kakasi2.c | 4 +- .../actors/ovl_En_Kakasi3/z_en_kakasi3.c | 4 +- .../actors/ovl_En_Kanban/z_en_kanban.c | 4 +- .../actors/ovl_En_Karebaba/z_en_karebaba.c | 12 +-- src/overlays/actors/ovl_En_Ko/z_en_ko.c | 4 +- src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 4 +- src/overlays/actors/ovl_En_Kz/z_en_kz.c | 4 +- .../actors/ovl_En_M_Fire1/z_en_m_fire1.c | 4 +- .../actors/ovl_En_M_Thunder/z_en_m_thunder.c | 4 +- src/overlays/actors/ovl_En_Ma1/z_en_ma1.c | 4 +- src/overlays/actors/ovl_En_Ma2/z_en_ma2.c | 4 +- src/overlays/actors/ovl_En_Ma3/z_en_ma3.c | 4 +- src/overlays/actors/ovl_En_Mb/z_en_mb.c | 14 ++-- src/overlays/actors/ovl_En_Md/z_en_md.c | 4 +- src/overlays/actors/ovl_En_Mk/z_en_mk.c | 4 +- src/overlays/actors/ovl_En_Mm/z_en_mm.c | 4 +- src/overlays/actors/ovl_En_Mm2/z_en_mm2.c | 4 +- src/overlays/actors/ovl_En_Ms/z_en_ms.c | 2 +- src/overlays/actors/ovl_En_Mu/z_en_mu.c | 4 +- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 4 +- src/overlays/actors/ovl_En_Niw/z_en_niw.c | 8 +- .../actors/ovl_En_Niw_Girl/z_en_niw_girl.c | 4 +- .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c | 4 +- .../actors/ovl_En_Nutsball/z_en_nutsball.c | 4 +- src/overlays/actors/ovl_En_Nwc/z_en_nwc.c | 4 +- src/overlays/actors/ovl_En_Ny/z_en_ny.c | 6 +- src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 8 +- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 4 +- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 4 +- .../actors/ovl_En_Peehat/z_en_peehat.c | 12 +-- .../actors/ovl_En_Po_Desert/z_en_po_desert.c | 4 +- .../actors/ovl_En_Po_Field/z_en_po_field.c | 8 +- .../actors/ovl_En_Po_Relay/z_en_po_relay.c | 4 +- .../ovl_En_Po_Sisters/z_en_po_sisters.c | 18 ++--- src/overlays/actors/ovl_En_Poh/z_en_poh.c | 8 +- src/overlays/actors/ovl_En_Rd/z_en_rd.c | 4 +- src/overlays/actors/ovl_En_Reeba/z_en_reeba.c | 4 +- src/overlays/actors/ovl_En_Rr/z_en_rr.c | 8 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 4 +- src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 2 +- src/overlays/actors/ovl_En_Sa/z_en_sa.c | 4 +- src/overlays/actors/ovl_En_Sb/z_en_sb.c | 2 +- .../actors/ovl_En_Shopnuts/z_en_shopnuts.c | 4 +- src/overlays/actors/ovl_En_Si/z_en_si.c | 4 +- src/overlays/actors/ovl_En_Skb/z_en_skb.c | 6 +- src/overlays/actors/ovl_En_Skj/z_en_skj.c | 4 +- .../actors/ovl_En_Skjneedle/z_en_skjneedle.c | 4 +- src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 16 ++-- src/overlays/actors/ovl_En_St/z_en_st.c | 16 ++-- src/overlays/actors/ovl_En_Sth/z_en_sth.c | 4 +- src/overlays/actors/ovl_En_Sw/z_en_sw.c | 4 +- .../ovl_En_Syateki_Niw/z_en_syateki_niw.c | 4 +- src/overlays/actors/ovl_En_Ta/z_en_ta.c | 4 +- src/overlays/actors/ovl_En_Test/z_en_test.c | 12 +-- src/overlays/actors/ovl_En_Tg/z_en_tg.c | 4 +- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 4 +- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 4 +- .../actors/ovl_En_Torch2/z_en_torch2.c | 10 +-- src/overlays/actors/ovl_En_Toryo/z_en_toryo.c | 4 +- src/overlays/actors/ovl_En_Tp/z_en_tp.c | 4 +- src/overlays/actors/ovl_En_Trap/z_en_trap.c | 4 +- .../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 4 +- src/overlays/actors/ovl_En_Vali/z_en_vali.c | 8 +- .../actors/ovl_En_Vb_Ball/z_en_vb_ball.c | 4 +- src/overlays/actors/ovl_En_Vm/z_en_vm.c | 12 +-- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 4 +- .../actors/ovl_En_Weiyer/z_en_weiyer.c | 4 +- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 18 ++--- .../ovl_En_Wonder_Item/z_en_wonder_item.c | 4 +- .../actors/ovl_En_Wood02/z_en_wood02.c | 4 +- src/overlays/actors/ovl_En_Xc/z_en_xc.c | 4 +- .../ovl_En_Yabusame_Mark/z_en_yabusame_mark.c | 4 +- .../actors/ovl_En_Yukabyun/z_en_yukabyun.c | 4 +- src/overlays/actors/ovl_En_Zf/z_en_zf.c | 8 +- src/overlays/actors/ovl_En_Zl1/z_en_zl1.c | 4 +- src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 4 +- src/overlays/actors/ovl_En_Zl4/z_en_zl4.c | 4 +- src/overlays/actors/ovl_En_Zo/z_en_zo.c | 4 +- src/overlays/actors/ovl_Fishing/z_fishing.c | 26 +++---- .../actors/ovl_Item_Shield/z_item_shield.c | 4 +- .../actors/ovl_Magic_Fire/z_magic_fire.c | 4 +- src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c | 8 +- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 4 +- .../actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c | 4 +- src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c | 4 +- .../actors/ovl_Obj_Hamishi/z_obj_hamishi.c | 4 +- src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c | 4 +- .../actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c | 8 +- .../actors/ovl_Obj_Kibako/z_obj_kibako.c | 4 +- .../actors/ovl_Obj_Kibako2/z_obj_kibako2.c | 4 +- .../ovl_Obj_Lightswitch/z_obj_lightswitch.c | 4 +- .../actors/ovl_Obj_Switch/z_obj_switch.c | 16 ++-- .../actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 12 +-- .../actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 4 +- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 4 +- .../actors/ovl_player_actor/z_player.c | 12 +-- tools/namefixer.py | 14 ++-- tools/overlayhelpers/colliderinit.py | 50 ++++++------- 251 files changed, 1007 insertions(+), 1013 deletions(-) diff --git a/docs/tutorial/beginning_decomp.md b/docs/tutorial/beginning_decomp.md index 149753d43bf..8bf4905d8db 100644 --- a/docs/tutorial/beginning_decomp.md +++ b/docs/tutorial/beginning_decomp.md @@ -364,7 +364,7 @@ ovl_En_Jj: Rom 00E3E3D0:00E3F9E0 VRam 80A87800:80A88E10 Offset 0014B4 static ColliderCylinderInit sCylinderInit = { - { COLTYPE_UNK10, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, + { COL_MATERIAL_UNK10, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000004, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, { 170, 150, 0, { 0, 0, 0 } }, }; @@ -375,7 +375,7 @@ As with the InitChain, replace the commented-out data we copied into the C file extern ColliderCylinderInit D_80A88CB4; // static ColliderCylinderInit sCylinderInit = // { -// { COLTYPE_UNK10, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, +// { COL_MATERIAL_UNK10, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, // { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000004, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, // { 170, 150, 0, { 0, 0, 0 } }, // }; @@ -655,7 +655,7 @@ ActorInit En_Jj_InitVars = { extern ColliderCylinderInit D_80A88CB4; // static ColliderCylinderInit sCylinderInit = { // { -// COLTYPE_NONE, +// COL_MATERIAL_NONE, // AT_NONE, // AC_ON | AC_TYPE_PLAYER, // OC1_ON | OC1_TYPE_ALL, @@ -663,7 +663,7 @@ extern ColliderCylinderInit D_80A88CB4; // COLSHAPE_CYLINDER, // }, // { -// ELEMTYPE_UNK0, +// ELEM_MATERIAL_UNK0, // { 0x00000000, 0x00, 0x00 }, // { 0x00000004, 0x00, 0x00 }, // ATELEM_NONE, diff --git a/docs/tutorial/data.md b/docs/tutorial/data.md index a96d26d84fe..08d66f4aed5 100644 --- a/docs/tutorial/data.md +++ b/docs/tutorial/data.md @@ -157,7 +157,7 @@ ovl_En_Tg: Rom 00ECE1F0:00ECE910 VRam 80B18360:80B18A80 Offset 0005B0 static ColliderCylinderInit sCylinderInit = { - { COLTYPE_UNK10, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER }, + { COL_MATERIAL_UNK10, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER }, { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 }, { 20, 64, 0, { 0, 0, 0 } }, }; @@ -168,7 +168,7 @@ Copy this in below `D_80B18910`, delete the original words of data, change the n // sCylinderInit static ColliderCylinderInit D_80B18910 = { - { COLTYPE_UNK10, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER }, + { COL_MATERIAL_UNK10, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER }, { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 }, { 20, 64, 0, { 0, 0, 0 } }, }; @@ -235,7 +235,7 @@ extern UNK_TYPE D_80A88164; extern ColliderCylinderInit D_80A88CB4; // static ColliderCylinderInit sCylinderInit = // { -// { COLTYPE_UNK10, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, +// { COL_MATERIAL_UNK10, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, // { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000004, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, // { 170, 150, 0, { 0, 0, 0 } }, // }; @@ -283,7 +283,7 @@ extern UNK_TYPE D_80A88164; static ColliderCylinderInit sCylinderInit = { - { COLTYPE_UNK10, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, + { COL_MATERIAL_UNK10, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000004, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, { 170, 150, 0, { 0, 0, 0 } }, }; @@ -505,7 +505,7 @@ ActorInit En_Jj_InitVars = { static ColliderCylinderInit sCylinderInit = { - { COLTYPE_UNK10, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, + { COL_MATERIAL_UNK10, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000004, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, { 170, 150, 0, { 0, 0, 0 } }, }; @@ -615,7 +615,7 @@ s32 usused2[] = { 0, 0 }; static ColliderCylinderInit sCylinderInit = { - { COLTYPE_UNK10, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, + { COL_MATERIAL_UNK10, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000004, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, { 170, 150, 0, { 0, 0, 0 } }, }; diff --git a/include/z64collision_check.h b/include/z64collision_check.h index 2ad25d5b787..c4bf9698564 100644 --- a/include/z64collision_check.h +++ b/include/z64collision_check.h @@ -12,23 +12,6 @@ struct Actor; * Bases for all shapes of colliders */ -typedef enum { - /* 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 { /* 0 */ COLSHAPE_JNTSPH, /* 1 */ COLSHAPE_CYLINDER, @@ -37,6 +20,23 @@ typedef enum { /* 4 */ COLSHAPE_MAX } ColliderShape; +typedef enum { + /* 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 { /* 0x00 */ struct Actor* actor; // Attached actor /* 0x04 */ struct Actor* at; // Actor attached to what it collided with as an AT collider. @@ -46,12 +46,12 @@ typedef struct { /* 0x11 */ u8 acFlags; /* 0x12 */ u8 ocFlags1; /* 0x13 */ u8 ocFlags2; // Flags related to which colliders it can OC collide with. - /* 0x14 */ u8 colType_Collider; // Determines hitmarks and sound effects during AC collisions. See `ColliderType` enum + /* 0x14 */ u8 colMaterial_Collider; // Determines hitmarks and sound effects during AC collisions. See `ColliderType` enum /* 0x15 */ u8 shape; // See `ColliderShape` enum } Collider; // size = 0x18 typedef struct { - /* 0x00 */ u8 colType_ColliderInit; + /* 0x00 */ u8 colMaterial_ColliderInit; /* 0x01 */ u8 atFlags; /* 0x02 */ u8 acFlags; /* 0x03 */ u8 ocFlags1; @@ -60,7 +60,7 @@ typedef struct { } ColliderInit; // size = 0x06 typedef struct { - /* 0x00 */ u8 colType_ColliderInitType1; + /* 0x00 */ u8 colMaterial_ColliderInitType1; /* 0x01 */ u8 atFlags; /* 0x02 */ u8 acFlags; /* 0x03 */ u8 ocFlags1; @@ -94,27 +94,21 @@ typedef struct { /* 0x05 */ u8 defense_ColliderElementDamageInfoACInit; // 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 { - /* 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; + /* 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_ColliderElement; // Affects sfx reaction when attacked by Link and hookability. Full purpose unknown. + /* 0x14 */ u8 elemMaterial_ColliderElement; // 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 @@ -125,7 +119,7 @@ typedef struct ColliderElement { } ColliderElement; // size = 0x28 typedef struct { - /* 0x00 */ u8 elemType_ColliderElementInit; // Affects sfx reaction when attacked by Link and hookability. Full purpose unknown. + /* 0x00 */ u8 elemMaterial_ColliderElementInit; // 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 diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index d4298dbf00e..b8f24ddd26c 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -74,7 +74,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; @@ -86,7 +86,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; @@ -103,7 +103,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_Collider = src->colType_ColliderInitType1; + col->colMaterial_Collider = src->colMaterial_ColliderInitType1; col->atFlags = src->atFlags; col->acFlags = src->acFlags; col->ocFlags1 = src->ocFlags1; @@ -114,7 +114,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_Collider = src->colType_ColliderInit; + col->colMaterial_Collider = src->colMaterial_ColliderInit; col->atFlags = src->atFlags; col->acFlags = src->acFlags; col->ocFlags1 = src->ocFlags1; @@ -183,7 +183,7 @@ s32 Collider_SetElementDamageInfoAC(PlayState* play, ColliderElementDamageInfoAC s32 Collider_InitElement(PlayState* play, ColliderElement* elem) { static ColliderElement init = { { 0, 0, 0 }, { 0xFFCFFFFF, 0, 0, { 0, 0, 0 } }, - ELEMTYPE_UNK0, ATELEM_NONE, + ELEM_MATERIAL_UNK0, ATELEM_NONE, ACELEM_NONE, OCELEM_NONE, NULL, NULL, NULL, NULL, @@ -202,7 +202,7 @@ s32 Collider_DestroyElement(PlayState* play, ColliderElement* elem) { } s32 Collider_SetElement(PlayState* play, ColliderElement* elem, ColliderElementInit* elemInit) { - elem->elemType_ColliderElement = elemInit->elemType_ColliderElementInit; + elem->elemMaterial_ColliderElement = elemInit->elemMaterial_ColliderElementInit; Collider_SetElementDamageInfoAT(play, &elem->atDmgInfo, &elemInit->atDmgInfo); Collider_SetElementDamageInfoAC(play, &elem->acDmgInfo, &elemInit->acDmgInfo); elem->atElemFlags = elemInit->atElemFlags; @@ -332,7 +332,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; @@ -517,7 +517,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); @@ -1537,7 +1537,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_Collider != COLTYPE_METAL) { + if (flags == ATELEM_SFX_NORMAL && collider->colMaterial_Collider != COL_MATERIAL_METAL) { EffectSsHitMark_SpawnFixedScale(play, EFFECT_HITMARK_WHITE, hitPos); if (collider->actor == NULL) { Audio_PlaySfxGeneral(NA_SE_IT_SHIELD_BOUND, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, @@ -1546,7 +1546,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_Collider == COLTYPE_METAL + } else if (flags == ATELEM_SFX_NORMAL) { // collider->colMaterial_Collider == COL_MATERIAL_METAL EffectSsHitMark_SpawnFixedScale(play, EFFECT_HITMARK_METAL, hitPos); if (collider->actor == NULL) { CollisionCheck_SpawnShieldParticlesMetal(play, hitPos); @@ -1575,20 +1575,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_ColliderElement. + * Plays a hit sound effect for AT colliders attached to Player based on the AC element's elemMaterial_ColliderElement. */ s32 CollisionCheck_SwordHitAudio(Collider* atCol, ColliderElement* acElem) { if (atCol->actor != NULL && atCol->actor->category == ACTORCAT_PLAYER) { - if (acElem->elemType_ColliderElement == ELEMTYPE_UNK0) { + if (acElem->elemMaterial_ColliderElement == ELEM_MATERIAL_UNK0) { Audio_PlaySfxGeneral(NA_SE_IT_SWORD_STRIKE, &atCol->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - } else if (acElem->elemType_ColliderElement == ELEMTYPE_UNK1) { + } else if (acElem->elemMaterial_ColliderElement == ELEM_MATERIAL_UNK1) { Audio_PlaySfxGeneral(NA_SE_IT_SWORD_STRIKE_HARD, &atCol->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - } else if (acElem->elemType_ColliderElement == ELEMTYPE_UNK2) { + } else if (acElem->elemMaterial_ColliderElement == ELEM_MATERIAL_UNK2) { Audio_PlaySfxGeneral(NA_SE_NONE, &atCol->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - } else if (acElem->elemType_ColliderElement == ELEMTYPE_UNK3) { + } else if (acElem->elemMaterial_ColliderElement == ELEM_MATERIAL_UNK3) { Audio_PlaySfxGeneral(NA_SE_NONE, &atCol->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } @@ -1631,24 +1631,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_Collider + * Handles hitmarks, blood, and sound effects for each AC collision, determined by the AC collider's colMaterial_Collider */ void CollisionCheck_HitEffects(PlayState* play, Collider* atCol, ColliderElement* atElem, Collider* acCol, ColliderElement* acElem, Vec3f* hitPos) { @@ -1659,12 +1659,12 @@ void CollisionCheck_HitEffects(PlayState* play, Collider* atCol, ColliderElement return; } if (acCol->actor != NULL) { - sBloodFuncs[sHitInfo[acCol->colType_Collider].blood](play, acCol, hitPos); + sBloodFuncs[sHitInfo[acCol->colMaterial_Collider].blood](play, acCol, hitPos); } if (acCol->actor != NULL) { - if (sHitInfo[acCol->colType_Collider].effect == HIT_SOLID) { + if (sHitInfo[acCol->colMaterial_Collider].effect == HIT_SOLID) { CollisionCheck_HitSolid(play, atElem, acCol, hitPos); - } else if (sHitInfo[acCol->colType_Collider].effect == HIT_WOOD) { + } else if (sHitInfo[acCol->colMaterial_Collider].effect == HIT_WOOD) { if (atCol->actor == NULL) { CollisionCheck_SpawnShieldParticles(play, hitPos); Audio_PlaySfxGeneral(NA_SE_IT_REFLECTION_WOOD, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, @@ -1672,8 +1672,8 @@ void CollisionCheck_HitEffects(PlayState* play, Collider* atCol, ColliderElement } else { CollisionCheck_SpawnShieldParticlesWood(play, hitPos, &atCol->actor->projectedPos); } - } else if (sHitInfo[acCol->colType_Collider].effect != HIT_NONE) { - EffectSsHitMark_SpawnFixedScale(play, sHitInfo[acCol->colType_Collider].effect, hitPos); + } else if (sHitInfo[acCol->colMaterial_Collider].effect != HIT_NONE) { + EffectSsHitMark_SpawnFixedScale(play, sHitInfo[acCol->colMaterial_Collider].effect, hitPos); if (!(acElem->acElemFlags & ACELEM_NO_SWORD_SFX)) { CollisionCheck_SwordHitAudio(atCol, acElem); } @@ -1727,8 +1727,8 @@ s32 CollisionCheck_SetATvsAC(PlayState* play, Collider* atCol, ColliderElement* acElem->acDmgInfo.hitPos.x = hitPos->x; acElem->acDmgInfo.hitPos.y = hitPos->y; acElem->acDmgInfo.hitPos.z = hitPos->z; - if (!(atElem->atElemFlags & ATELEM_AT_HITMARK) && acCol->colType_Collider != COLTYPE_METAL && - acCol->colType_Collider != COLTYPE_WOOD && acCol->colType_Collider != COLTYPE_HARD) { + if (!(atElem->atElemFlags & ATELEM_AT_HITMARK) && acCol->colMaterial_Collider != COL_MATERIAL_METAL && + acCol->colMaterial_Collider != COL_MATERIAL_WOOD && acCol->colMaterial_Collider != COL_MATERIAL_HARD) { acElem->acElemFlags |= ACELEM_DRAW_HITMARK; } else { CollisionCheck_HitEffects(play, atCol, atElem, acCol, acElem, hitPos); diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 21c5ebd757a..18d79ecb403 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -34,7 +34,7 @@ ActorInit En_A_Obj_InitVars = { 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 9e2e762498c..98bd341d953 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -34,7 +34,7 @@ ActorInit En_Item00_InitVars = { 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_player_lib.c b/src/code/z_player_lib.c index bfaddd7596d..4e84d2ed08e 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -1247,16 +1247,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_Collider = shieldColTypes[this->currentShield]; + this->shieldQuad.base.colMaterial_Collider = 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 8d28fdcf645..96c6fb3fb16 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 @@ ActorInit Arms_Hook_InitVars = { 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_ColliderElement != ELEMTYPE_UNK4)) { + (this->collider.elem.atHitElem->elemMaterial_ColliderElement != 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 bd1270ab2fd..3b3f591ed05 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 @@ ActorInit Bg_Bdan_Objects_InitVars = { 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 cba055ea84e..87fe8974d4b 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 @@ ActorInit Bg_Bdan_Switch_InitVars = { 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 ff7ebd99c25..65cb5238629 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 ef92c82eecc..983da96e715 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 @@ ActorInit Bg_Breakwall_InitVars = { 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 2cb736ff9fb..4c978a7454e 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 @@ ActorInit Bg_Ddan_Kd_InitVars = { 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 d1ccf08fc04..0e6fdbafc40 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 @@ ActorInit Bg_Dodoago_InitVars = { 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 05cf7cde562..2f78f2e68dc 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 @@ ActorInit Bg_Gnd_Soulmeiro_InitVars = { 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 c96055ac4ad..d85aeeb5b46 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 @@ ActorInit Bg_Haka_Sgami_InitVars = { 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 c65a1a2f0a6..0852557dc0c 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 @@ ActorInit Bg_Haka_Trap_InitVars = { 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 c499e31915c..4fc48a39654 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 @@ ActorInit Bg_Haka_Tubo_InitVars = { 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 781dd579b4e..59c960d0722 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 394a828b619..79a3563cc56 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 { 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 16e1d804237..3e87d4031ca 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 @@ ActorInit Bg_Hidan_Dalm_InitVars = { 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 130b38c124c..8ffaba1c9bd 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 @@ ActorInit Bg_Hidan_Firewall_InitVars = { 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 170f0677ba4..d01ebf9369f 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 @@ ActorInit Bg_Hidan_Fwbig_InitVars = { 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 27c1c9e617d..eb649a7d686 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 d2f5a4f8c6f..8ca818d3d05 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 @@ ActorInit Bg_Hidan_Hrock_InitVars = { 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 d9ce7e6ab2a..bf386aa8f98 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 ef6bb43867c..a1923e686be 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 @@ ActorInit Bg_Hidan_Rock_InitVars = { 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 5f8ec0ce03e..509e1e60f65 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 @@ ActorInit Bg_Hidan_Rsekizou_InitVars = { 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 d07db7eca0d..b316c1110c3 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 @@ ActorInit Bg_Hidan_Sekizou_InitVars = { 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 8273e2696b3..729ce296567 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 @@ ActorInit Bg_Hidan_Sima_InitVars = { 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 459e1189922..60c45d6c152 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 30a2c281c89..5e18f9645eb 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 0b5e2c538ca..b35643992bd 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 @@ ActorInit Bg_Jya_1flift_InitVars = { 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 b4c2d6158bd..c92847bc401 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 @@ ActorInit Bg_Jya_Bombchuiwa_InitVars = { 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 4450298fa31..e264742ca1d 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 @@ ActorInit Bg_Jya_Bombiwa_InitVars = { 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 7ab065bd3e7..427aace0f1b 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 @@ ActorInit Bg_Jya_Goroiwa_InitVars = { 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 93e972e2e67..f07984a5980 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 @@ ActorInit Bg_Jya_Haheniron_InitVars = { 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 9188456de5d..808be3544fe 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 f4bd5ebcff0..d1baebbaf79 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 @@ ActorInit Bg_Jya_Megami_InitVars = { 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 a39b2e8aed7..7991cbe026d 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 2eaf22b9ec5..c24b539c05f 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 @@ ActorInit Bg_Mizu_Bwall_InitVars = { 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 a4b870c10b9..ae8724e5682 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 @@ ActorInit Bg_Mori_Hashigo_InitVars = { 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 f5fb613babb..3fac8c5009c 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 @@ ActorInit Bg_Po_Event_InitVars = { 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 5c379a538c5..7f613191e95 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 5b183b9724a..23be25b1e01 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 @@ ActorInit Bg_Spot06_Objects_InitVars = { 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 3015e901512..7e5e29a1087 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 @@ ActorInit Bg_Spot08_Bakudankabe_InitVars = { 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 68f723fcec2..91f12c348a1 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 @@ ActorInit Bg_Spot11_Bakudankabe_InitVars = { 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 5a9726a82e1..1633f2abe1d 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 92d1f9671a5..af05e5d6b06 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 @@ ActorInit Bg_Spot18_Basket_InitVars = { 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 3f8968a84c2..d5c542a3fff 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 @@ ActorInit Bg_Toki_Swd_InitVars = { 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 9d141c29753..e573c91b856 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 @@ ActorInit Bg_Ydan_Maruta_InitVars = { 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 1a5d2e36648..bcce46e7303 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 @@ ActorInit Bg_Ydan_Sp_InitVars = { 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 71e840f6326..da58fa1ccb4 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_ColliderElement = ELEMTYPE_UNK2; - this->collider.base.colType_Collider = COLTYPE_METAL; + this->collider.elements[0].base.elemMaterial_ColliderElement = ELEM_MATERIAL_UNK2; + this->collider.base.colMaterial_Collider = COL_MATERIAL_METAL; } else { - this->collider.elements[0].base.elemType_ColliderElement = ELEMTYPE_UNK3; - this->collider.base.colType_Collider = COLTYPE_HIT3; + this->collider.elements[0].base.elemMaterial_ColliderElement = ELEM_MATERIAL_UNK3; + this->collider.base.colMaterial_Collider = 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 1353cc4eb7a..4f051f16923 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 @@ ActorInit Boss_Ganon_InitVars = { 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, @@ -2370,7 +2370,7 @@ void BossGanon_SetupBlock(BossGanon* this, PlayState* play) { } void BossGanon_Block(BossGanon* this, PlayState* play) { - this->collider.base.colType_Collider = COLTYPE_METAL; + this->collider.base.colMaterial_Collider = COL_MATERIAL_METAL; SkelAnime_Update(&this->skelAnime); sCape->backPush = -9.0f; sCape->backSwayMagnitude = 0.25f; @@ -2821,7 +2821,7 @@ void BossGanon_Update(Actor* thisx, PlayState* play2) { } } - this->collider.base.colType_Collider = COLTYPE_HIT3; + this->collider.base.colMaterial_Collider = COL_MATERIAL_HIT3; sCape->gravity = -3.0f; this->shockGlow = false; this->actor.flags &= ~ACTOR_FLAG_0; 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 f31a974108c..ad82cc449bd 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 f2edacb80ad..915254fc2e4 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 @@ ActorInit Boss_Ganondrof_InitVars = { 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_Collider = COLTYPE_METAL; + this->colliderBody.base.colMaterial_Collider = 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_Collider = COLTYPE_METAL; + this->colliderBody.base.colMaterial_Collider = 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_Collider = COLTYPE_HIT3; + this->colliderBody.base.colMaterial_Collider = 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 a189add10a2..63fd54b4929 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 @@ ActorInit Boss_Goma_InitVars = { 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 560a04fc2b5..053aa166b33 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -2507,10 +2507,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_Collider = COLTYPE_HARD; + this->colliderJntSph.base.colMaterial_Collider = COL_MATERIAL_HARD; this->colliderJntSph.base.acFlags |= AC_HARD; } else { - this->colliderJntSph.base.colType_Collider = COLTYPE_HIT0; + this->colliderJntSph.base.colMaterial_Collider = COL_MATERIAL_HIT0; this->colliderJntSph.base.acFlags &= ~AC_HARD; } } @@ -2520,7 +2520,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_Collider != COLTYPE_HARD)) { + if ((this->colliderJntSph.base.acFlags & AC_HIT) && (this->colliderJntSph.base.colMaterial_Collider != 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 1640cb0c1c1..5f596734616 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, @@ -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_Collider = COLTYPE_METAL; + this->collider.base.colMaterial_Collider = 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_Collider = COLTYPE_HIT3; + this->collider.base.colMaterial_Collider = 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_Collider = COLTYPE_HIT3; + this->collider.base.colMaterial_Collider = 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); @@ -5435,7 +5435,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_Collider = COLTYPE_METAL; + this->collider.base.colMaterial_Collider = 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 6920b5c3deb..43ad90c8017 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -202,7 +202,7 @@ ActorInit Boss_Va_InitVars = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -210,7 +210,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFEF, 0x03, 0x08 }, { 0x00000010, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -223,7 +223,7 @@ static ColliderCylinderInit sCylinderInit = { static ColliderJntSphElementInit sJntSphElementsInitSupport[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000010, 0x00, 0x00 }, ATELEM_NONE, @@ -236,7 +236,7 @@ static ColliderJntSphElementInit sJntSphElementsInitSupport[1] = { static ColliderJntSphInit sJntSphInitSupport = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -250,7 +250,7 @@ static ColliderJntSphInit sJntSphInitSupport = { static ColliderJntSphElementInit sJntSphElementsInitBari[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x03, 0x04 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -263,7 +263,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, @@ -276,7 +276,7 @@ static ColliderJntSphInit sJntSphInitBari = { static ColliderQuadInit sQuadInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -284,7 +284,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 e508f6cc8b7..b0495eeb8ea 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 b274d4182bb..29c03718483 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -62,7 +62,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 9568574a4bb..cee95e14d49 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 @@ ActorInit Demo_Kekkai_InitVars = { 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 5487a20b4c3..c0bf311e8d4 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 @@ ActorInit Door_Ana_InitVars = { 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 1f703251824..c856061d25c 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 @@ ActorInit Door_Killer_InitVars = { 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 548e07947a1..4b4b856fc85 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 @@ ActorInit En_Am_InitVars = { 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 1e9dbb93330..5ae4651b52a 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 @@ ActorInit En_Ani_InitVars = { 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 07ee71d2027..fd6ae79898a 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 @@ ActorInit En_Anubice_InitVars = { 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 d0e94dd4060..6191d3d0307 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 @@ ActorInit En_Anubice_Fire_InitVars = { 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 a5e1945432c..7344f6e1ad1 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 @@ ActorInit En_Arrow_InitVars = { 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_ColliderElement != ELEMTYPE_UNK4)) { + if (atTouched && (this->collider.elem.atHitElem->elemMaterial_ColliderElement != 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 97fd430c4b4..8a53e0f2b59 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 89bbc44e9e4..6cff6eaf53e 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 @@ ActorInit En_Bb_InitVars = { 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, 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 116e8635556..4cd8e24cc10 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 @@ ActorInit En_Bigokuta_InitVars = { 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 165ee8c5197..58441b75c9c 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 @@ ActorInit En_Bili_InitVars = { 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, 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 4bf07fa926c..a37c57f3b50 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 @@ ActorInit En_Bom_InitVars = { 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 5af68e436da..e49db03a5c0 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 @@ ActorInit En_Bom_Chu_InitVars = { 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 f4864d5307e..cc6f0a88d54 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 @@ ActorInit En_Bombf_InitVars = { 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 e5697f91c68..d2201490ccd 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 @@ ActorInit En_Boom_InitVars = { 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 830d8fa28e7..973f82e3258 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 @@ ActorInit En_Brob_InitVars = { 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 7b349e1767e..3a78eff606b 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 @@ ActorInit En_Bubble_InitVars = { 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, 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 e91e59d47c5..3159bbefda5 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 167ae922532..f4ac90bb089 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 @@ ActorInit En_Bw_InitVars = { 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, 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 c0c9fb70388..b02cfbd398f 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 @@ ActorInit En_Bx_InitVars = { 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 a47186b62a0..aabf07d04fa 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 a9e667089ff..6ea0128304d 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 @@ ActorInit En_Cow_InitVars = { 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 076dafbfa63..ec0783755da 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 @@ ActorInit En_Crow_InitVars = { 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 d99e2912076..02df7ddd3ce 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 @@ ActorInit En_Cs_InitVars = { 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 3a350e381d1..e4111251ccc 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 @@ ActorInit En_Daiku_InitVars = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -63,7 +63,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, PLAYER_AC_HIT_REACTION_0, 0x00 }, { 0x00000000, PLAYER_AT_HIT_REACTION_0, 0x00 }, ATELEM_NONE, 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 f5e31493c38..3ccbd2f8c3a 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 @@ ActorInit En_Daiku_Kakariko_InitVars = { 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 407e3428298..d9de2dd00d4 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 @@ ActorInit En_Dekubaba_InitVars = { 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_Collider = COLTYPE_HARD; + this->collider.base.colMaterial_Collider = 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_Collider = COLTYPE_HIT6; + this->collider.base.colMaterial_Collider = 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_Collider != COLTYPE_HARD) && + if ((this->collider.base.colMaterial_Collider != COL_MATERIAL_HARD) && ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != DEKUBABA_DMGEFF_NONE) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0))) { phi_s0 = this->actor.colChkInfo.health - this->actor.colChkInfo.damage_CollisionCheckInfo; @@ -1082,7 +1082,7 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) { } else { return; } - } else if ((play->actorCtx.unk_02 != 0) && (this->collider.base.colType_Collider != COLTYPE_HARD) && + } else if ((play->actorCtx.unk_02 != 0) && (this->collider.base.colMaterial_Collider != 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 82ccef0e6fc..7d79450998e 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 @@ ActorInit En_Dekunuts_InitVars = { 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 cbf132efba9..ff7c47e3046 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 @@ ActorInit En_Dh_InitVars = { 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 e85f97b8ca4..d2405c11ad4 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 d0ba2520736..1f34fda9d6f 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 9d1c37c4725..a01509a6d34 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 @@ ActorInit En_Dns_InitVars = { 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 cfa1f2a32bf..f99ffffe56f 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 @@ ActorInit En_Dnt_Jiji_InitVars = { 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 ff9f9cc71af..58d0102bea5 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 @@ ActorInit En_Dnt_Nomal_InitVars = { 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 7bbd2dd7130..e374c1b833b 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 @@ ActorInit En_Dodojr_InitVars = { 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 06676ca6d43..235bf01a129 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 @@ ActorInit En_Dodongo_InitVars = { 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 be4c04dd9e3..682ab37f1b9 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 @@ ActorInit En_Dog_InitVars = { 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 65f4b90bf65..4eea21f8455 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 @@ ActorInit En_Du_InitVars = { 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 1e0d8b4da90..1895082799e 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 @@ ActorInit En_Eiyer_InitVars = { 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 20b2d704ce6..9ec655b55fd 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -45,7 +45,7 @@ ActorInit En_Fd_InitVars = { static ColliderJntSphElementInit sJntSphElementsInit[12] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040088, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -56,7 +56,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -67,7 +67,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -78,7 +78,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -89,7 +89,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -100,7 +100,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -111,7 +111,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -122,7 +122,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -133,7 +133,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -144,7 +144,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -155,7 +155,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -166,7 +166,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00040008, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -179,7 +179,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 d15f8c58aad..08090cf3e81 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 @@ ActorInit En_Fd_Fire_InitVars = { 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 13338e337a6..9fd21e27b4d 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 @@ ActorInit En_Fhg_Fire_InitVars = { 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 32d28a0074e..63bff4e0078 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 @@ ActorInit En_Fire_Rock_InitVars = { 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 4ffc2a63452..6b1b2f595c3 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 @@ ActorInit En_Firefly_InitVars = { 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, 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 e008be1d2d9..944ca2d8379 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 4186c1a4460..9afd284a184 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 @@ ActorInit En_Floormas_InitVars = { 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_Collider = COLTYPE_HARD; + this->collider.base.colMaterial_Collider = COL_MATERIAL_HARD; this->collider.base.acFlags |= AC_HARD; this->actionTarget = 0x28; } void EnFloormas_MakeVulnerable(EnFloormas* this) { - this->collider.base.colType_Collider = COLTYPE_HIT0; + this->collider.base.colMaterial_Collider = 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_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { - if (this->collider.base.colType_Collider != COLTYPE_HARD) { + if (this->collider.base.colMaterial_Collider != 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_Collider == COLTYPE_HARD) { + if (this->collider.base.colMaterial_Collider == 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_Collider == COLTYPE_HARD) { + if (this->collider.base.colMaterial_Collider == 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_Collider == COLTYPE_HARD) { + if (this->collider.base.colMaterial_Collider == 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_Collider == COLTYPE_HARD) { + if (this->collider.base.colMaterial_Collider == 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_Collider == COLTYPE_HARD) { + if (this->collider.base.colMaterial_Collider == 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 9f100848570..6740ee13f22 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 @@ ActorInit En_Fu_InitVars = { 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 4598b0bc28a..ecb5eb9e415 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 @@ ActorInit En_Fw_InitVars = { 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 c98dd232f77..4106d9fd303 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 @@ ActorInit En_Fz_InitVars = { 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 edb4a07b934..afe49d2636f 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 ad08fbdacef..fec64451620 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 405cfc0664c..33f6045237a 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 @@ ActorInit En_Ge1_InitVars = { 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 e129bf03320..6b8dd591e0e 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 @@ ActorInit En_Ge2_InitVars = { 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 df33dc59e34..0b84dc44327 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -32,7 +32,7 @@ ActorInit En_Ge3_InitVars = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -40,7 +40,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 5eb9dc84cb8..e98efc5d5cd 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 @@ ActorInit En_GeldB_InitVars = { 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 46f0a2ec000..6b4e90cfb38 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 @@ ActorInit En_Gm_InitVars = { 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 f648a2f9103..c6bd290ad12 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 @@ ActorInit En_Go_InitVars = { 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 b5b699676ec..bced9d73774 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -74,7 +74,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, @@ -82,7 +82,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 b834292f2b7..68511c67ee2 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 @@ ActorInit En_Goma_InitVars = { 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 23df3261698..d3f964a934b 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 @@ ActorInit En_Goroiwa_InitVars = { 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 ede6a58c382..d8d070349d4 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 @@ ActorInit En_Gs_InitVars = { 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 a122de078a3..11d6de446ac 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 @@ ActorInit En_Guest_InitVars = { 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 dcf9aca99b2..6a593340a76 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 @@ ActorInit En_Hata_InitVars = { // 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 762fa5d6c63..2e248f1cd66 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 @@ ActorInit En_Heishi2_InitVars = { 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 c38744ea2b8..e1190e96825 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 @@ ActorInit En_Heishi3_InitVars = { 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 373d28ca901..c03de2952b8 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 08468d132b5..64745e45493 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 @@ ActorInit En_Hintnuts_InitVars = { 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 8e3a20b2690..c09e82fabbc 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 @@ ActorInit En_Honotrap_InitVars = { 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 43937fd02a3..9205abac4d9 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 @@ ActorInit En_Horse_InitVars = { 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 0b324c30891..ae15ba10a39 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 698a026306b..b51916cb4d9 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 443dcf15c30..ac30496edf9 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 e3da728e851..9743a61b082 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 09b1da8dda8..b01a3ce0a2e 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 @@ ActorInit En_Hs_InitVars = { 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 d84e35c4ef5..8e1dc69387c 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 @@ ActorInit En_Hs2_InitVars = { 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 37e0666f3e5..0cf74374a13 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 @@ ActorInit En_Hy_InitVars = { 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 2a7e7006b0e..54f79e6cbb0 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 @@ ActorInit En_Ice_Hono_InitVars = { 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 d38b77219bd..d2ebfb5f9cf 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 f41fd6fe1d7..2b7b81acf0a 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 @@ ActorInit En_In_InitVars = { 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 8d2bd997fc8..d39f55c01dc 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 @@ ActorInit En_Insect_InitVars = { 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 05e14f56214..7b2521b00f9 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 39c0a913d47..5fa3e8411f0 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 9162737dc40..bedd35c999a 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 667ebf7404e..b4158715444 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 @@ ActorInit En_Js_InitVars = { 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 0d7cd9d831f..d3da9c6920f 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 31b3b3d006a..50e671829fb 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 669596dd816..2079d7a3d73 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 2c41c879aad..ea289f2610a 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -89,7 +89,7 @@ ActorInit En_Kanban_InitVars = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, 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, 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 c091ea9e882..09ff804ce99 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 @@ ActorInit En_Karebaba_InitVars = { 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_Collider = COLTYPE_HARD; + this->bodyCollider.base.colMaterial_Collider = COL_MATERIAL_HARD; this->bodyCollider.base.acFlags |= AC_HARD; this->bodyCollider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = 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_Collider = COLTYPE_HIT6; + this->bodyCollider.base.colMaterial_Collider = COL_MATERIAL_HIT6; this->bodyCollider.base.acFlags &= ~AC_HARD; this->bodyCollider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = !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 72c74e07415..0bd8a981dec 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 @@ ActorInit En_Ko_InitVars = { 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 3e6bbb6c785..8e54e7bf8ca 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 ce431636a1e..65afe33a7b4 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 @@ ActorInit En_Kz_InitVars = { 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 5de65577842..e32bdc07228 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 @@ ActorInit En_M_Fire1_InitVars = { 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 bd4d54b55a5..2bd0fc55f94 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 @@ ActorInit En_M_Thunder_InitVars = { 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 26795a516b7..0951e3b3460 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 @@ ActorInit En_Ma1_InitVars = { 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 d840a4b5387..1c1c1366bfd 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 @@ ActorInit En_Ma2_InitVars = { 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 2bbc1856366..4a284ec05e8 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 @@ ActorInit En_Ma3_InitVars = { 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 63e16f71b13..8eff4601126 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 879de69ecf7..2f15d3daf76 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 @@ ActorInit En_Md_InitVars = { 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 d65a6f03750..a0c1d5d7a8a 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 @@ ActorInit En_Mk_InitVars = { 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 2375b5e6cae..8b3c67272f6 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 @@ ActorInit En_Mm_InitVars = { 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 74636b9e24c..0ebd9bc6a6e 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 @@ ActorInit En_Mm2_InitVars = { 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 9feb9d43bc4..c919ff235ec 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 @@ ActorInit En_Ms_InitVars = { 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 d6a8f2af018..e59d381a9d5 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 5c0631fb69a..2a470b37d19 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 09963b6e825..13f601e753f 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 33c98d4f8f8..373ca6f7e29 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 @@ ActorInit En_Niw_Girl_InitVars = { 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 9da760fb152..cf200c36400 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 78d33e9e804..b4bfae3fc61 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 @@ ActorInit En_Nutsball_InitVars = { 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 a662e02403a..db35f3e64ef 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 @@ ActorInit En_Nwc_InitVars = { 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 129b1cbb85e..57b51327e6f 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 @@ ActorInit En_Ny_InitVars = { 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_Collider = COLTYPE_METAL; + this->collider.base.colMaterial_Collider = 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 4e8b360eb42..97798f1b2a9 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 @@ ActorInit En_Okuta_InitVars = { 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 784ac765cf7..90c012e43f2 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -115,14 +115,14 @@ ActorInit En_Ossan_InitVars = { // 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 b67d863e310..564f8eeb4ba 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 @@ ActorInit En_Owl_InitVars = { 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 092d618e1d8..695f4267707 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 @@ ActorInit En_Peehat_InitVars = { 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 3f814e796db..39933a68390 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 @@ ActorInit En_Po_Desert_InitVars = { 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 991f60dce8e..3626a6925d2 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 @@ -47,7 +47,7 @@ ActorInit En_Po_Field_InitVars = { static ColliderCylinderInit D_80AD7080 = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -55,7 +55,7 @@ static ColliderCylinderInit D_80AD7080 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -67,7 +67,7 @@ static ColliderCylinderInit D_80AD7080 = { static ColliderCylinderInit D_80AD70AC = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -75,7 +75,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 4106c8f0cd3..f3b92dc7b3c 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 @@ -47,7 +47,7 @@ ActorInit En_Po_Relay_InitVars = { 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_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index 0e315d3ba67..2e5d256bf22 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 @@ -75,7 +75,7 @@ ActorInit En_Po_Sisters_InitVars = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -83,7 +83,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0x4FC7FFEA, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -209,7 +209,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_ColliderElement = ELEMTYPE_UNK4; + this->collider.elem.elemMaterial_ColliderElement = ELEM_MATERIAL_UNK4; this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC |= DMG_DEKU_NUT; this->collider.base.ocFlags1 = OC1_NONE; func_80AD9C24(this, NULL); @@ -265,7 +265,7 @@ void func_80AD943C(EnPoSisters* this) { void func_80AD944C(EnPoSisters* this) { if (this->unk_22E.a != 0) { - this->collider.base.colType_Collider = COLTYPE_METAL; + this->collider.base.colMaterial_Collider = COL_MATERIAL_METAL; this->collider.base.acFlags |= AC_HARD; } Animation_MorphToLoop(&this->skelAnime, &gPoeSistersAttackAnim, -5.0f); @@ -278,7 +278,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_Collider = COLTYPE_METAL; + this->collider.base.colMaterial_Collider = COL_MATERIAL_METAL; this->collider.base.acFlags |= AC_HARD; Animation_MorphToLoop(&this->skelAnime, &gPoeSistersAttackAnim, -5.0f); } @@ -292,7 +292,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_Collider = COLTYPE_HIT3; + this->collider.base.colMaterial_Collider = COL_MATERIAL_HIT3; this->collider.base.acFlags &= ~AC_HARD; } this->actionFunc = func_80ADA9E8; @@ -429,7 +429,7 @@ void func_80AD9C24(EnPoSisters* this, PlayState* play) { this->actor.flags &= ~ACTOR_FLAG_0; this->unk_19C = 100; this->unk_199 = 32; - this->collider.base.colType_Collider = COLTYPE_HIT3; + this->collider.base.colMaterial_Collider = COL_MATERIAL_HIT3; this->collider.base.acFlags &= ~AC_HARD; if (play != NULL) { vec.x = this->actor.world.pos.x; @@ -671,7 +671,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_Collider = COLTYPE_HIT3; + this->collider.base.colMaterial_Collider = COL_MATERIAL_HIT3; this->collider.base.acFlags &= ~AC_HARD; func_80AD93C4(this); } else { @@ -1145,7 +1145,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_Collider == COLTYPE_METAL || + } else if (this->collider.base.colMaterial_Collider == COL_MATERIAL_METAL || (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0 && this->actor.colChkInfo.damage_CollisionCheckInfo == 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 9f5312fb248..6a1400f47f0 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 @@ ActorInit En_Poh_InitVars = { 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 e9b7d339e83..4426d526431 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 @@ ActorInit En_Rd_InitVars = { 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 e317b356f9b..bb9057ae5a5 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 @@ ActorInit En_Reeba_InitVars = { 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, 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 a95b7598c11..521305772a9 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 b9df80354a0..d96debb7616 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 00cb959f125..34071042ebe 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 d60aa4e40cf..e0142620939 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 @@ ActorInit En_Sa_InitVars = { 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 4e3e1b158af..acc4ad9227c 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 @@ ActorInit En_Sb_InitVars = { 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 b351d6888dc..f276ea92c81 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 @@ ActorInit En_Shopnuts_InitVars = { 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 b6b3adf1611..427408a998c 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 b4ac616f4ef..ce72a68f893 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 3d0e5439afd..117ef763b1d 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 @@ ActorInit En_Skj_InitVars = { 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 df3f584f914..10d390d929d 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 @@ ActorInit En_Skjneedle_InitVars = { 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 6fe753b467f..823f0d2c4d8 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 @@ ActorInit En_Ssh_InitVars = { 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_ColliderElementDamageInfoAC = 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_Collider = COLTYPE_METAL; + this->colCylinder[2].base.colMaterial_Collider = COL_MATERIAL_METAL; this->colCylinder[2].elem.acElemFlags = ACELEM_ON | ACELEM_HOOKABLE | ACELEM_NO_AT_INFO; - this->colCylinder[2].elem.elemType_ColliderElement = ELEMTYPE_UNK2; + this->colCylinder[2].elem.elemMaterial_ColliderElement = ELEM_MATERIAL_UNK2; this->colCylinder[2].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = 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 2e8e1543fb4..805bf5fda08 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 @@ ActorInit En_St_InitVars = { 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_Collider = COLTYPE_METAL; + this->colCylinder[2].base.colMaterial_Collider = COL_MATERIAL_METAL; this->colCylinder[2].elem.acElemFlags = ACELEM_ON | ACELEM_HOOKABLE | ACELEM_NO_AT_INFO; - this->colCylinder[2].elem.elemType_ColliderElement = ELEMTYPE_UNK2; + this->colCylinder[2].elem.elemMaterial_ColliderElement = ELEM_MATERIAL_UNK2; this->colCylinder[2].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = 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 66416baba97..8297d5d6088 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 @@ ActorInit En_Sth_InitVars = { 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 b651eb80688..b7ba32f904c 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 @@ ActorInit En_Sw_InitVars = { 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 9da826cd60c..7a436a45089 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 @@ ActorInit En_Syateki_Niw_InitVars = { 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 b9575cf6eb4..293a6fad01c 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 @@ ActorInit En_Ta_InitVars = { 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 1ee23c17c10..63e7bee7c9c 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 @@ ActorInit En_Test_InitVars = { 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 403ea500f9e..22c978b30b2 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 5c5f0748f52..ea7df190b9a 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 @@ ActorInit En_Tite_InitVars = { 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 b48964c8fbb..90fb089bbc7 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -139,7 +139,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, @@ -147,7 +147,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 cecf51e05a2..d68d4159c29 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_Collider = this->meleeWeaponQuads[1].base.colType_Collider = COLTYPE_METAL; + this->meleeWeaponQuads[0].base.colMaterial_Collider = this->meleeWeaponQuads[1].base.colMaterial_Collider = COL_MATERIAL_METAL; this->meleeWeaponQuads[0].elem.atDmgInfo.damage_ColliderElementDamageInfoAT = this->meleeWeaponQuads[1].elem.atDmgInfo.damage_ColliderElementDamageInfoAT = 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_Collider = COLTYPE_NONE; - this->cylinder.elem.elemType_ColliderElement = ELEMTYPE_UNK5; + this->cylinder.base.colMaterial_Collider = COL_MATERIAL_NONE; + this->cylinder.elem.elemMaterial_ColliderElement = ELEM_MATERIAL_UNK5; } else { - this->cylinder.base.colType_Collider = COLTYPE_HIT5; - this->cylinder.elem.elemType_ColliderElement = ELEMTYPE_UNK1; + this->cylinder.base.colMaterial_Collider = COL_MATERIAL_HIT5; + this->cylinder.elem.elemMaterial_ColliderElement = 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 38e5f46d534..a734aa0f4e9 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 @@ ActorInit En_Toryo_InitVars = { 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 6fe008cfe0f..52300744d3f 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 @@ ActorInit En_Tp_InitVars = { 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 6c21a07c255..db47a4da6ee 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 @@ ActorInit En_Trap_InitVars = { 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 45d19e4f2e5..4a277f1a6be 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 76922dc34c1..4eea536b39c 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 @@ ActorInit En_Vali_InitVars = { static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -51,7 +51,7 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, PLAYER_AC_HIT_REACTION_7, 0x08 }, { 0x00000000, PLAYER_AT_HIT_REACTION_0, 0x00 }, ATELEM_ON | ATELEM_SFX_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,7 +71,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, PLAYER_AC_HIT_REACTION_7, 0x08 }, { 0xFFCFFFFF, PLAYER_AT_HIT_REACTION_1, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, 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 695b88014b8..8c08eb89259 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 @@ ActorInit En_Vb_Ball_InitVars = { 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 25f13383ca3..9cfec22356f 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 @@ ActorInit En_Vm_InitVars = { 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 9e29e216a88..f796dc1fcf8 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 @@ ActorInit En_Wallmas_InitVars = { 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 aa984172f5e..a43d2169ded 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 @@ ActorInit En_Weiyer_InitVars = { 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 350a4babcb2..346a74e0544 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 ec0811065b5..3de79caa952 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 6845d39837f..588c89349fa 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 @@ ActorInit En_Wood02_InitVars = { 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 b2b8dda8c14..a6c628f6b68 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -30,14 +30,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, 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 8d7cf097de2..d38f6a41812 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 c133bde62b3..6dfd2cf3c14 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 @@ ActorInit En_Yukabyun_InitVars = { 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 bec53008a17..1aad9fafb0f 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 @@ ActorInit En_Zf_InitVars = { 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 aed5c9b0fb1..37f063891e2 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 @@ ActorInit En_Zl1_InitVars = { 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 08620c60227..5a4596641e1 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -22,14 +22,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 00fdde50aa8..b318f9d758a 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 @@ ActorInit En_Zl4_InitVars = { 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 e71af51b681..9a85e31fb19 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -279,7 +279,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, @@ -287,7 +287,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 7181accf390..35292448892 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -197,7 +197,7 @@ static u8 sSinkingLureFound = false; static ColliderJntSphElementInit sJntSphElementsInit[12] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -208,7 +208,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -219,7 +219,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -230,7 +230,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -241,7 +241,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -252,7 +252,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -263,7 +263,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -274,7 +274,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -285,7 +285,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -296,7 +296,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -307,7 +307,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -318,7 +318,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[12] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xFFCFFFFF, 0x00, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -331,7 +331,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 acb8dbee3c3..911c8662a41 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 40ef675b229..1dc4ca9f10e 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 @@ ActorInit Magic_Fire_InitVars = { 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 8c200e3dac3..b545f1ef617 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 7a42022b695..2d05ae50708 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 @@ ActorInit Obj_Bean_InitVars = { 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 b3f6b6fce33..c28681e994f 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 @@ ActorInit Obj_Bombiwa_InitVars = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -40,7 +40,7 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, PLAYER_AC_HIT_REACTION_0, 0x00 }, { 0x4FC1FFFE, PLAYER_AT_HIT_REACTION_0, 0x00 }, ATELEM_NONE, 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 4b32991dc4e..c645d67f57b 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 @@ ActorInit Obj_Comb_InitVars = { 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 ab48f3da445..6630799f59a 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 @@ ActorInit Obj_Hamishi_InitVars = { 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 6dea87f6b34..537528230e5 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 @@ ActorInit Obj_Hana_InitVars = { 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 93c939e0307..86ac92c4d7b 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 @@ ActorInit Obj_Ice_Poly_InitVars = { 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 c7752a48916..84bf444465a 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 @@ ActorInit Obj_Kibako_InitVars = { 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 bfcc4bbf263..ede1e682941 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 @@ ActorInit Obj_Kibako2_InitVars = { 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 bb3bb56331f..d7ee7d35059 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 @@ ActorInit Obj_Lightswitch_InitVars = { 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 23c0e243b92..70144bc9d3d 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -73,7 +73,7 @@ static f32 sFocusHeights[] = { static ColliderTrisElementInit sRustyFloorTrisElementsInit[2] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x40000040, 0x00, 0x00 }, ATELEM_NONE, @@ -84,7 +84,7 @@ static ColliderTrisElementInit sRustyFloorTrisElementsInit[2] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x40000040, 0x00, 0x00 }, ATELEM_NONE, @@ -97,7 +97,7 @@ static ColliderTrisElementInit sRustyFloorTrisElementsInit[2] = { static ColliderTrisInit sRustyFloorTrisInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -111,7 +111,7 @@ static ColliderTrisInit sRustyFloorTrisInit = { static ColliderTrisElementInit sEyeTrisElementsInit[2] = { { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x0001F824, 0x00, 0x00 }, ATELEM_NONE, @@ -122,7 +122,7 @@ static ColliderTrisElementInit sEyeTrisElementsInit[2] = { }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x0001F824, 0x00, 0x00 }, ATELEM_NONE, @@ -135,7 +135,7 @@ static ColliderTrisElementInit sEyeTrisElementsInit[2] = { static ColliderTrisInit sEyeTrisInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -149,7 +149,7 @@ static ColliderTrisInit sEyeTrisInit = { static ColliderJntSphElementInit sCrystalJntSphElementInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xEFC1FFFE, 0x00, 0x00 }, ATELEM_NONE, @@ -162,7 +162,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 11ceeec44b9..8071dcdd3e0 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 @@ ActorInit Obj_Syokudai_InitVars = { 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[] = { COLTYPE_METAL, COLTYPE_WOOD, COLTYPE_WOOD }; + static u8 sColTypesStand[] = { COL_MATERIAL_METAL, COL_MATERIAL_WOOD, COL_MATERIAL_WOOD }; s32 pad; ObjSyokudai* this = (ObjSyokudai*)thisx; s32 torchType = this->actor.params & 0xF000; @@ -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_Collider = sColTypesStand[this->actor.params >> 0xC]; + this->colliderStand.base.colMaterial_Collider = sColTypesStand[this->actor.params >> 0xC]; 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 2a3cc521240..cddd21e8735 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 a6afa9baa95..d45a208b684 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 { 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 906354de5e1..4b8c980d378 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -9726,7 +9726,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, @@ -9734,7 +9734,7 @@ static ColliderCylinderInit D_80854624 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_NONE, @@ -9746,7 +9746,7 @@ static ColliderCylinderInit D_80854624 = { static ColliderQuadInit D_80854650 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, @@ -9754,7 +9754,7 @@ static ColliderQuadInit D_80854650 = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000100, 0x00, 0x01 }, { 0xFFCFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, @@ -9766,7 +9766,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, @@ -9774,7 +9774,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 e8bcf41cf24..8603429c847 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_Collider", - "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_Collider", + "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]) From 84ad36b80899823db2e5dbc4f43e2569f31fc651 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 16 Mar 2024 02:02:44 +0100 Subject: [PATCH 05/12] remove temporary suffixes --- docs/tutorial/introduction.md | 2 +- include/z64actor.h | 8 +-- include/z64collision_check.h | 28 ++++---- src/code/z_actor.c | 44 ++++++------ src/code/z_collision_check.c | 72 +++++++++---------- src/code/z_player_lib.c | 2 +- .../actors/ovl_Arms_Hook/z_arms_hook.c | 2 +- .../actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c | 2 +- .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 6 +- src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 2 +- src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c | 16 ++--- .../actors/ovl_Boss_Ganon/z_boss_ganon.c | 16 ++--- .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 8 +-- .../ovl_Boss_Ganondrof/z_boss_ganondrof.c | 12 ++-- .../actors/ovl_Boss_Goma/z_boss_goma.c | 6 +- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 12 ++-- src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 18 ++--- src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 18 ++--- src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 14 ++-- .../actors/ovl_Door_Killer/z_door_killer.c | 4 +- src/overlays/actors/ovl_En_Am/z_en_am.c | 18 ++--- .../actors/ovl_En_Anubice/z_en_anubice.c | 2 +- .../ovl_En_Anubice_Fire/z_en_anubice_fire.c | 2 +- src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 6 +- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 14 ++-- .../actors/ovl_En_Bigokuta/z_en_bigokuta.c | 8 +-- src/overlays/actors/ovl_En_Bili/z_en_bili.c | 10 +-- src/overlays/actors/ovl_En_Bom/z_en_bom.c | 2 +- src/overlays/actors/ovl_En_Brob/z_en_brob.c | 8 +-- .../actors/ovl_En_Bubble/z_en_bubble.c | 8 +-- src/overlays/actors/ovl_En_Bw/z_en_bw.c | 10 +-- src/overlays/actors/ovl_En_Crow/z_en_crow.c | 8 +-- .../actors/ovl_En_Dekubaba/z_en_dekubaba.c | 26 +++---- .../actors/ovl_En_Dekunuts/z_en_dekunuts.c | 8 +-- src/overlays/actors/ovl_En_Dh/z_en_dh.c | 24 +++---- src/overlays/actors/ovl_En_Dha/z_en_dha.c | 2 +- .../actors/ovl_En_Dodojr/z_en_dodojr.c | 4 +- .../actors/ovl_En_Dodongo/z_en_dodongo.c | 20 +++--- src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c | 18 ++--- src/overlays/actors/ovl_En_Fd/z_en_fd.c | 2 +- .../actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c | 2 +- .../actors/ovl_En_Firefly/z_en_firefly.c | 12 ++-- .../actors/ovl_En_Floormas/z_en_floormas.c | 34 ++++----- src/overlays/actors/ovl_En_Fw/z_en_fw.c | 2 +- src/overlays/actors/ovl_En_Fz/z_en_fz.c | 2 +- .../actors/ovl_En_G_Switch/z_en_g_switch.c | 2 +- src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 4 +- src/overlays/actors/ovl_En_GeldB/z_en_geldb.c | 10 +-- src/overlays/actors/ovl_En_Goma/z_en_goma.c | 2 +- src/overlays/actors/ovl_En_Gs/z_en_gs.c | 2 +- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 2 +- src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 2 +- .../actors/ovl_En_Kanban/z_en_kanban.c | 2 +- .../actors/ovl_En_Karebaba/z_en_karebaba.c | 8 +-- .../actors/ovl_En_M_Thunder/z_en_m_thunder.c | 6 +- src/overlays/actors/ovl_En_Mb/z_en_mb.c | 14 ++-- .../actors/ovl_En_Nutsball/z_en_nutsball.c | 2 +- src/overlays/actors/ovl_En_Ny/z_en_ny.c | 4 +- src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 6 +- .../actors/ovl_En_Peehat/z_en_peehat.c | 14 ++-- .../actors/ovl_En_Po_Field/z_en_po_field.c | 4 +- .../ovl_En_Po_Sisters/z_en_po_sisters.c | 28 ++++---- src/overlays/actors/ovl_En_Poh/z_en_poh.c | 4 +- src/overlays/actors/ovl_En_Rd/z_en_rd.c | 2 +- src/overlays/actors/ovl_En_Reeba/z_en_reeba.c | 6 +- src/overlays/actors/ovl_En_Rr/z_en_rr.c | 8 +-- src/overlays/actors/ovl_En_Sb/z_en_sb.c | 2 +- src/overlays/actors/ovl_En_Skb/z_en_skb.c | 12 ++-- src/overlays/actors/ovl_En_Skj/z_en_skj.c | 2 +- src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 22 +++--- src/overlays/actors/ovl_En_St/z_en_st.c | 28 ++++---- src/overlays/actors/ovl_En_Sw/z_en_sw.c | 4 +- src/overlays/actors/ovl_En_Test/z_en_test.c | 20 +++--- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 8 +-- .../actors/ovl_En_Torch2/z_en_torch2.c | 20 +++--- src/overlays/actors/ovl_En_Tp/z_en_tp.c | 8 +-- src/overlays/actors/ovl_En_Vali/z_en_vali.c | 20 +++--- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 14 ++-- .../actors/ovl_En_Weiyer/z_en_weiyer.c | 4 +- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 16 ++--- .../ovl_En_Wonder_Item/z_en_wonder_item.c | 4 +- src/overlays/actors/ovl_En_Zf/z_en_zf.c | 12 ++-- .../actors/ovl_Magic_Fire/z_magic_fire.c | 4 +- .../actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c | 2 +- src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c | 2 +- .../actors/ovl_Obj_Hamishi/z_obj_hamishi.c | 2 +- .../actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c | 2 +- .../actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 6 +- .../actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 2 +- .../actors/ovl_player_actor/z_player.c | 28 ++++---- tools/namefixer.py | 2 +- 91 files changed, 461 insertions(+), 461 deletions(-) diff --git a/docs/tutorial/introduction.md b/docs/tutorial/introduction.md index bef1cd74398..39504fd9ffa 100644 --- a/docs/tutorial/introduction.md +++ b/docs/tutorial/introduction.md @@ -33,7 +33,7 @@ void func_80A13098(EnFirefly* this) { } else { this->actor.params -= 2; } - this->collider.list->body.atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT = PLAYER_AC_HIT_REACTION_1; + this->collider.list->body.atDmgInfo.playerACHitReaction = PLAYER_AC_HIT_REACTION_1; this->auraType = 1; this->onFire = 1; this->actor.naviEnemyId = 0x11; diff --git a/include/z64actor.h b/include/z64actor.h index 04b889ec92e..79db7e4079c 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -140,10 +140,10 @@ typedef struct { /* 0x14 */ s16 cylYShift; // Unused. Purpose inferred from Cylinder16 and CollisionCheck_CylSideVsLineSeg /* 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_CollisionCheckInfo; // Amount to decrement health by - /* 0x19 */ u8 damageEffect_CollisionCheckInfo; // If a damageTable is set, the effect corresponding to the damage type, as specified in the damage table - /* 0x1A */ u8 playerATHitReaction_CollisionCheckInfo; // (for Player) Reaction from an AT collider hit - /* 0x1B */ u8 playerACHitReaction_CollisionCheckInfo; // (for Player) Reaction from an AC collider hit + /* 0x18 */ u8 damage; // Amount to decrement health by + /* 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 typedef struct { diff --git a/include/z64collision_check.h b/include/z64collision_check.h index c4bf9698564..82cba8eb6bc 100644 --- a/include/z64collision_check.h +++ b/include/z64collision_check.h @@ -46,12 +46,12 @@ typedef struct { /* 0x11 */ u8 acFlags; /* 0x12 */ u8 ocFlags1; /* 0x13 */ u8 ocFlags2; // Flags related to which colliders it can OC collide with. - /* 0x14 */ u8 colMaterial_Collider; // 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 { - /* 0x00 */ u8 colMaterial_ColliderInit; + /* 0x00 */ u8 colMaterial; /* 0x01 */ u8 atFlags; /* 0x02 */ u8 acFlags; /* 0x03 */ u8 ocFlags1; @@ -60,7 +60,7 @@ typedef struct { } ColliderInit; // size = 0x06 typedef struct { - /* 0x00 */ u8 colMaterial_ColliderInitType1; + /* 0x00 */ u8 colMaterial; /* 0x01 */ u8 atFlags; /* 0x02 */ u8 acFlags; /* 0x03 */ u8 ocFlags1; @@ -76,22 +76,22 @@ typedef struct { } ColliderInitToActor; // size = 0x08 typedef struct { - /* 0x00 */ u32 dmgFlags_ColliderElementDamageInfoAT; // Damage types dealt by this collider element as AT. - /* 0x04 */ u8 playerACHitReaction_ColliderElementDamageInfoAT; // Player reaction to a Player AC collider hitting this AT collider - /* 0x05 */ u8 damage_ColliderElementDamageInfoAT; // Damage + /* 0x00 */ u32 dmgFlags; // Damage types dealt by this collider element as AT. + /* 0x04 */ u8 playerACHitReaction; // Player reaction to a Player AC collider hitting this AT collider + /* 0x05 */ u8 damage; // Damage } ColliderElementDamageInfoAT; // size = 0x08 typedef struct { - /* 0x00 */ u32 dmgFlags_ColliderElementDamageInfoAC; // Damage types that may affect this collider element as AC. - /* 0x04 */ u8 playerATHitReaction_ColliderElementDamageInfoAC; // Player reaction to a Player AT collider hitting this AC collider - /* 0x05 */ u8 defense_ColliderElementDamageInfoAC; // Damage Resistance + /* 0x00 */ u32 dmgFlags; // Damage types that may affect this collider element as AC. + /* 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 { - /* 0x00 */ u32 dmgFlags_ColliderElementDamageInfoACInit; // Damage types that may affect this collider element as AC. - /* 0x04 */ u8 playerATHitReaction_ColliderElementDamageInfoACInit; // Player reaction to a Player AT collider hitting this AC collider - /* 0x05 */ u8 defense_ColliderElementDamageInfoACInit; // Damage Resistance + /* 0x00 */ u32 dmgFlags; // Damage types that may affect this collider element as AC. + /* 0x04 */ u8 playerATHitReaction; // Player reaction to a Player AT collider hitting this AC collider + /* 0x05 */ u8 defense; // Damage Resistance } ColliderElementDamageInfoACInit; // size = 0x08 typedef enum { @@ -108,7 +108,7 @@ typedef enum { 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 elemMaterial_ColliderElement; // Affects sfx when attacked by Player, and interaction with hookshot and arrows. + /* 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 @@ -119,7 +119,7 @@ typedef struct ColliderElement { } ColliderElement; // size = 0x28 typedef struct { - /* 0x00 */ u8 elemMaterial_ColliderElementInit; // Affects sfx when attacked by Player, and interaction with hookshot and arrows. + /* 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 diff --git a/src/code/z_actor.c b/src/code/z_actor.c index d85085e8ea5..d9b7f579c55 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -4312,10 +4312,10 @@ u8 func_800355E4(PlayState* play, Collider* collider) { } u8 Actor_ApplyDamage(Actor* actor) { - if (actor->colChkInfo.damage_CollisionCheckInfo >= actor->colChkInfo.health) { + if (actor->colChkInfo.damage >= actor->colChkInfo.health) { actor->colChkInfo.health = 0; } else { - actor->colChkInfo.health -= actor->colChkInfo.damage_CollisionCheckInfo; + actor->colChkInfo.health -= actor->colChkInfo.damage; } return actor->colChkInfo.health; @@ -4324,24 +4324,24 @@ u8 Actor_ApplyDamage(Actor* actor) { void Actor_SetDropFlag(Actor* actor, ColliderElement* elem, s32 freezeFlag) { if (elem->acHitElem == NULL) { actor->dropFlag = 0x00; - } else if (freezeFlag && (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_UNKNOWN_1 | DMG_MAGIC_ICE | DMG_MAGIC_FIRE))) { - actor->freezeTimer = elem->acHitElem->atDmgInfo.damage_ColliderElementDamageInfoAT; + } else if (freezeFlag && (elem->acHitElem->atDmgInfo.dmgFlags & (DMG_UNKNOWN_1 | DMG_MAGIC_ICE | DMG_MAGIC_FIRE))) { + actor->freezeTimer = elem->acHitElem->atDmgInfo.damage; actor->dropFlag = 0x00; - } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_FIRE) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_FIRE) { actor->dropFlag = 0x01; - } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_ICE) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_ICE) { actor->dropFlag = 0x02; - } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_UNK1) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_UNK1) { actor->dropFlag = 0x04; - } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_UNK2) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_UNK2) { actor->dropFlag = 0x08; - } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_UNK3) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_UNK3) { actor->dropFlag = 0x10; - } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_LIGHT) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_LIGHT) { actor->dropFlag = 0x20; - } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_MAGIC_LIGHT) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_MAGIC_LIGHT) { if (freezeFlag) { - actor->freezeTimer = elem->acHitElem->atDmgInfo.damage_ColliderElementDamageInfoAT; + actor->freezeTimer = elem->acHitElem->atDmgInfo.damage; } actor->dropFlag = 0x40; } else { @@ -4361,24 +4361,24 @@ void Actor_SetDropFlagJntSph(Actor* actor, ColliderJntSph* jntSph, s32 freezeFla if (elem->acHitElem == NULL) { flag = 0x00; } else if (freezeFlag && - (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_UNKNOWN_1 | DMG_MAGIC_ICE | DMG_MAGIC_FIRE))) { - actor->freezeTimer = elem->acHitElem->atDmgInfo.damage_ColliderElementDamageInfoAT; + (elem->acHitElem->atDmgInfo.dmgFlags & (DMG_UNKNOWN_1 | DMG_MAGIC_ICE | DMG_MAGIC_FIRE))) { + actor->freezeTimer = elem->acHitElem->atDmgInfo.damage; flag = 0x00; - } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_FIRE) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_FIRE) { flag = 0x01; - } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_ICE) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_ICE) { flag = 0x02; - } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_UNK1) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_UNK1) { flag = 0x04; - } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_UNK2) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_UNK2) { flag = 0x08; - } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_UNK3) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_UNK3) { flag = 0x10; - } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_LIGHT) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_LIGHT) { flag = 0x20; - } else if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_MAGIC_LIGHT) { + } else if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_MAGIC_LIGHT) { if (freezeFlag) { - actor->freezeTimer = elem->acHitElem->atDmgInfo.damage_ColliderElementDamageInfoAT; + actor->freezeTimer = elem->acHitElem->atDmgInfo.damage; } flag = 0x40; } else { diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index b8f24ddd26c..081dc46433b 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -103,7 +103,7 @@ s32 Collider_SetBaseToActor(PlayState* play, Collider* col, ColliderInitToActor* */ s32 Collider_SetBaseType1(PlayState* play, Collider* col, Actor* actor, ColliderInitType1* src) { col->actor = actor; - col->colMaterial_Collider = src->colMaterial_ColliderInitType1; + col->colMaterial = src->colMaterial; col->atFlags = src->atFlags; col->acFlags = src->acFlags; col->ocFlags1 = src->ocFlags1; @@ -114,7 +114,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->colMaterial_Collider = src->colMaterial_ColliderInit; + col->colMaterial = src->colMaterial; col->atFlags = src->atFlags; col->acFlags = src->acFlags; col->ocFlags1 = src->ocFlags1; @@ -152,9 +152,9 @@ s32 Collider_DestroyElementDamageInfoAT(PlayState* play, ColliderElementDamageIn s32 Collider_SetElementDamageInfoAT(PlayState* play, ColliderElementDamageInfoAT* dest, ColliderElementDamageInfoAT* src) { - dest->dmgFlags_ColliderElementDamageInfoAT = src->dmgFlags_ColliderElementDamageInfoAT; - dest->playerACHitReaction_ColliderElementDamageInfoAT = src->playerACHitReaction_ColliderElementDamageInfoAT; - dest->damage_ColliderElementDamageInfoAT = src->damage_ColliderElementDamageInfoAT; + dest->dmgFlags = src->dmgFlags; + dest->playerACHitReaction = src->playerACHitReaction; + dest->damage = src->damage; return true; } @@ -174,9 +174,9 @@ s32 Collider_DestroyElementDamageInfoAC(PlayState* play, ColliderElementDamageIn s32 Collider_SetElementDamageInfoAC(PlayState* play, ColliderElementDamageInfoAC* acDmgInfo, ColliderElementDamageInfoACInit* init) { - acDmgInfo->dmgFlags_ColliderElementDamageInfoAC = init->dmgFlags_ColliderElementDamageInfoACInit; - acDmgInfo->playerATHitReaction_ColliderElementDamageInfoAC = init->playerATHitReaction_ColliderElementDamageInfoACInit; - acDmgInfo->defense_ColliderElementDamageInfoAC = init->defense_ColliderElementDamageInfoACInit; + acDmgInfo->dmgFlags = init->dmgFlags; + acDmgInfo->playerATHitReaction = init->playerATHitReaction; + acDmgInfo->defense = init->defense; return true; } @@ -202,7 +202,7 @@ s32 Collider_DestroyElement(PlayState* play, ColliderElement* elem) { } s32 Collider_SetElement(PlayState* play, ColliderElement* elem, ColliderElementInit* elemInit) { - elem->elemMaterial_ColliderElement = elemInit->elemMaterial_ColliderElementInit; + elem->elemMaterial = elemInit->elemMaterial; Collider_SetElementDamageInfoAT(play, &elem->atDmgInfo, &elemInit->atDmgInfo); Collider_SetElementDamageInfoAC(play, &elem->acDmgInfo, &elemInit->acDmgInfo); elem->atElemFlags = elemInit->atElemFlags; @@ -1386,8 +1386,8 @@ s32 CollisionCheck_IsElementNotAC(ColliderElement* elem) { * If the AT element has no dmgFlags in common with the AC element, no collision happens. */ s32 CollisionCheck_NoSharedFlags(ColliderElement* atElem, ColliderElement* acElem) { - if (!(atElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & - acElem->acDmgInfo.dmgFlags_ColliderElementDamageInfoAC)) { + if (!(atElem->atDmgInfo.dmgFlags & + acElem->acDmgInfo.dmgFlags)) { return true; } return false; @@ -1537,7 +1537,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->colMaterial_Collider != COL_MATERIAL_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, @@ -1546,7 +1546,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->colMaterial_Collider == COL_MATERIAL_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); @@ -1575,20 +1575,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 elemMaterial_ColliderElement. + * 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->elemMaterial_ColliderElement == ELEM_MATERIAL_UNK0) { + if (acElem->elemMaterial == ELEM_MATERIAL_UNK0) { Audio_PlaySfxGeneral(NA_SE_IT_SWORD_STRIKE, &atCol->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - } else if (acElem->elemMaterial_ColliderElement == ELEM_MATERIAL_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->elemMaterial_ColliderElement == ELEM_MATERIAL_UNK2) { + } else if (acElem->elemMaterial == ELEM_MATERIAL_UNK2) { Audio_PlaySfxGeneral(NA_SE_NONE, &atCol->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - } else if (acElem->elemMaterial_ColliderElement == ELEM_MATERIAL_UNK3) { + } else if (acElem->elemMaterial == ELEM_MATERIAL_UNK3) { Audio_PlaySfxGeneral(NA_SE_NONE, &atCol->actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } @@ -1648,7 +1648,7 @@ static HitInfo sHitInfo[] = { }; /** - * Handles hitmarks, blood, and sound effects for each AC collision, determined by the AC collider's colMaterial_Collider + * 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) { @@ -1659,12 +1659,12 @@ void CollisionCheck_HitEffects(PlayState* play, Collider* atCol, ColliderElement return; } if (acCol->actor != NULL) { - sBloodFuncs[sHitInfo[acCol->colMaterial_Collider].blood](play, acCol, hitPos); + sBloodFuncs[sHitInfo[acCol->colMaterial].blood](play, acCol, hitPos); } if (acCol->actor != NULL) { - if (sHitInfo[acCol->colMaterial_Collider].effect == HIT_SOLID) { + if (sHitInfo[acCol->colMaterial].effect == HIT_SOLID) { CollisionCheck_HitSolid(play, atElem, acCol, hitPos); - } else if (sHitInfo[acCol->colMaterial_Collider].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, @@ -1672,8 +1672,8 @@ void CollisionCheck_HitEffects(PlayState* play, Collider* atCol, ColliderElement } else { CollisionCheck_SpawnShieldParticlesWood(play, hitPos, &atCol->actor->projectedPos); } - } else if (sHitInfo[acCol->colMaterial_Collider].effect != HIT_NONE) { - EffectSsHitMark_SpawnFixedScale(play, sHitInfo[acCol->colMaterial_Collider].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); } @@ -1713,7 +1713,7 @@ s32 CollisionCheck_SetATvsAC(PlayState* play, Collider* atCol, ColliderElement* atElem->atHitElem = acElem; atElem->atElemFlags |= ATELEM_HIT; if (atCol->actor != NULL) { - atCol->actor->colChkInfo.playerATHitReaction_CollisionCheckInfo = acElem->acDmgInfo.playerATHitReaction_ColliderElementDamageInfoAC; + atCol->actor->colChkInfo.playerATHitReaction = acElem->acDmgInfo.playerATHitReaction; } } acCol->acFlags |= AC_HIT; @@ -1722,13 +1722,13 @@ s32 CollisionCheck_SetATvsAC(PlayState* play, Collider* atCol, ColliderElement* acElem->acHitElem = atElem; acElem->acElemFlags |= ACELEM_HIT; if (acCol->actor != NULL) { - acCol->actor->colChkInfo.playerACHitReaction_CollisionCheckInfo = atElem->atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT; + 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->colMaterial_Collider != COL_MATERIAL_METAL && - acCol->colMaterial_Collider != COL_MATERIAL_WOOD && acCol->colMaterial_Collider != COL_MATERIAL_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); @@ -2989,10 +2989,10 @@ void CollisionCheck_InitInfo(CollisionCheckInfo* info) { * Resets ColisionCheckInfo fields other than DamageTable, mass, and dim. */ void CollisionCheck_ResetDamage(CollisionCheckInfo* info) { - info->damage_CollisionCheckInfo = 0; - info->damageEffect_CollisionCheckInfo = 0; - info->playerATHitReaction_CollisionCheckInfo = PLAYER_AT_HIT_REACTION_0; - info->playerACHitReaction_CollisionCheckInfo = PLAYER_AC_HIT_REACTION_0; + info->damage = 0; + info->damageEffect = 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; } @@ -3056,13 +3056,13 @@ void CollisionCheck_ApplyDamage(PlayState* play, CollisionCheckContext* colChkCt ASSERT(elem->acHitElem != NULL, "pclobj_elem->ac_hit_elem != NULL", "../z_collision_check.c", 6493); tbl = col->actor->colChkInfo.damageTable; if (tbl == NULL) { - damage = (f32)elem->acHitElem->atDmgInfo.damage_ColliderElementDamageInfoAT - elem->acDmgInfo.defense_ColliderElementDamageInfoAC; + damage = (f32)elem->acHitElem->atDmgInfo.damage - elem->acDmgInfo.defense; if (damage < 0) { damage = 0; } } else { s32 i; - u32 flags = elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT; + u32 flags = elem->acHitElem->atDmgInfo.dmgFlags; for (i = 0; i < 32; i++, flags >>= 1) { if (flags == 1) { @@ -3071,10 +3071,10 @@ void CollisionCheck_ApplyDamage(PlayState* play, CollisionCheckContext* colChkCt } damage = tbl->table[i] & 0xF; - col->actor->colChkInfo.damageEffect_CollisionCheckInfo = tbl->table[i] >> 4 & 0xF; + col->actor->colChkInfo.damageEffect = tbl->table[i] >> 4 & 0xF; } if (!(col->acFlags & AC_HARD)) { - col->actor->colChkInfo.damage_CollisionCheckInfo += damage; + col->actor->colChkInfo.damage += damage; } } diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 4e84d2ed08e..be565b32526 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -1256,7 +1256,7 @@ void Player_UpdateShieldCollider(PlayState* play, Player* this, ColliderQuad* co if (this->stateFlags1 & PLAYER_STATE1_22) { Vec3f quadDest[4]; - this->shieldQuad.base.colMaterial_Collider = 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 96c6fb3fb16..ec06e9abc53 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -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->elemMaterial_ColliderElement != ELEM_MATERIAL_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_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index 4c978a7454e..93a43214f1a 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 @@ -96,7 +96,7 @@ void BgDdanKd_CheckForExplosions(BgDdanKd* this, PlayState* play) { explosive = Actor_GetCollidedExplosive(play, &this->collider.base); if (explosive != NULL) { - PRINTF("dam %d\n", this->dyna.actor.colChkInfo.damage_CollisionCheckInfo); + PRINTF("dam %d\n", this->dyna.actor.colChkInfo.damage); explosive->params = 2; } diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 7b8dc7fe5d8..a502fb6f2e5 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -1242,8 +1242,8 @@ void BossDodongo_UpdateDamage(BossDodongo* this, PlayState* play) { if (this->collider.elements[i].base.acElemFlags & ACELEM_HIT) { acHitElem = this->collider.elements[i].base.acHitElem; - if ((acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_BOOMERANG) || - (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SLINGSHOT)) { + if ((acHitElem->atDmgInfo.dmgFlags & DMG_BOOMERANG) || + (acHitElem->atDmgInfo.dmgFlags & DMG_SLINGSHOT)) { this->collider.elements[i].base.acElemFlags &= ~ACELEM_HIT; this->unk_1C0 = 2; BossDodongo_SetupWalk(this); @@ -1258,7 +1258,7 @@ void BossDodongo_UpdateDamage(BossDodongo* this, PlayState* play) { this->collider.elements[0].base.acElemFlags &= ~ACELEM_HIT; acHitElem = this->collider.elements[0].base.acHitElem; if ((this->actionFunc == BossDodongo_Vulnerable) || (this->actionFunc == BossDodongo_LayDown)) { - swordDamage = damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT); + swordDamage = damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags); if (damage != 0) { Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_K_DAMAGE); diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index 7d1f4cc909b..6ba94dbed53 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -1291,7 +1291,7 @@ void BossFd_CollisionCheck(BossFd* this, PlayState* play) { headCollider->base.acElemFlags &= ~ACELEM_HIT; acHitElem = headCollider->base.acHitElem; this->actor.colChkInfo.health -= 2; - if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_ICE) { + if (acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_ICE) { this->actor.colChkInfo.health -= 2; } if ((s8)this->actor.colChkInfo.health <= 2) { 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 da58fa1ccb4..9b09fe47cdb 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.elemMaterial_ColliderElement = ELEM_MATERIAL_UNK2; - this->collider.base.colMaterial_Collider = COL_MATERIAL_METAL; + this->collider.elements[0].base.elemMaterial = ELEM_MATERIAL_UNK2; + this->collider.base.colMaterial = COL_MATERIAL_METAL; } else { - this->collider.elements[0].base.elemMaterial_ColliderElement = ELEM_MATERIAL_UNK3; - this->collider.base.colMaterial_Collider = COL_MATERIAL_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) { @@ -834,7 +834,7 @@ void BossFd2_CollisionCheck(BossFd2* this, PlayState* play) { acHitElem = this->collider.elements[0].base.acHitElem; if (!bossFd->faceExposed) { - if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HAMMER) { + if (acHitElem->atDmgInfo.dmgFlags & DMG_HAMMER) { bossFd->actor.colChkInfo.health -= 2; if ((s8)bossFd->actor.colChkInfo.health <= 2) { bossFd->actor.colChkInfo.health = 1; @@ -865,12 +865,12 @@ void BossFd2_CollisionCheck(BossFd2* this, PlayState* play) { u8 canKill = false; u8 damage; - if ((damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT)) == 0) { - damage = (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_ICE) ? 4 : 2; + if ((damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags)) == 0) { + damage = (acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_ICE) ? 4 : 2; } else { canKill = true; } - if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT) { + if (acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT) { damage = 0; } if (((s8)bossFd->actor.colChkInfo.health > 2) || canKill) { 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 4f051f16923..13ebf118071 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -2370,7 +2370,7 @@ void BossGanon_SetupBlock(BossGanon* this, PlayState* play) { } void BossGanon_Block(BossGanon* this, PlayState* play) { - this->collider.base.colMaterial_Collider = COL_MATERIAL_METAL; + this->collider.base.colMaterial = COL_MATERIAL_METAL; SkelAnime_Update(&this->skelAnime); sCape->backPush = -9.0f; sCape->backSwayMagnitude = 0.25f; @@ -2691,14 +2691,14 @@ void BossGanon_UpdateDamage(BossGanon* this, PlayState* play) { acHitElem = this->collider.elem.acHitElem; if ((this->actionFunc == BossGanon_HitByLightBall) || (this->actionFunc == BossGanon_ChargeBigMagic)) { - if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_LIGHT) { + if (acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_LIGHT) { BossGanon_SetupVulnerable(this, play); this->timers[2] = 0; Actor_PlaySfx(&this->actor, NA_SE_EN_GANON_DAMAGE1); this->unk_1A6 = 15; } } else if ((this->actionFunc == BossGanon_Vulnerable) && (this->unk_1C2 >= 3)) { - if (!(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT)) { + if (!(acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT)) { u8 hitWithSword = false; u8 damage; Vec3f sp50; @@ -2712,7 +2712,7 @@ void BossGanon_UpdateDamage(BossGanon* this, PlayState* play) { 0x1E); } - damage = flags = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT); + damage = flags = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags); if (flags == 0) { damage = 2; @@ -2746,7 +2746,7 @@ void BossGanon_UpdateDamage(BossGanon* this, PlayState* play) { sCape->tearTimer = 1; } } - } else if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_RANGED) { + } else if (acHitElem->atDmgInfo.dmgFlags & DMG_RANGED) { Actor_PlaySfx(&this->actor, 0); for (i = 0; i < ARRAY_COUNT(sCape->strands); i++) { @@ -2821,7 +2821,7 @@ void BossGanon_Update(Actor* thisx, PlayState* play2) { } } - this->collider.base.colMaterial_Collider = COL_MATERIAL_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; sCape->gravity = -3.0f; this->shockGlow = false; this->actor.flags &= ~ACTOR_FLAG_0; @@ -3941,7 +3941,7 @@ void BossGanon_LightBall_Update(Actor* thisx, PlayState* play2) { this->collider.base.acFlags &= ~AC_HIT; - if ((hitWithBottle == false) && (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SHIELD)) { + if ((hitWithBottle == false) && (acHitElem->atDmgInfo.dmgFlags & DMG_SHIELD)) { spBA = 2; Audio_PlaySfxGeneral(NA_SE_IT_SHIELD_REFLECT_MG, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, @@ -4427,7 +4427,7 @@ void func_808E2544(Actor* thisx, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; - if (!(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SHIELD) || Player_HasMirrorShieldEquipped(play)) { + if (!(acHitElem->atDmgInfo.dmgFlags & DMG_SHIELD) || Player_HasMirrorShieldEquipped(play)) { Rumble_Request(this->actor.xyzDistToPlayerSq, 180, 20, 100); this->unk_1C2 = 0xC; this->actor.speed = -30.0f; diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index f3536b3d17e..ced201f7b15 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -1899,13 +1899,13 @@ void BossGanon2_CollisionCheck(BossGanon2* this, PlayState* play) { if (this->unk_424.elements[0].base.acElemFlags & ACELEM_HIT) { this->unk_424.elements[0].base.acElemFlags &= ~ACELEM_HIT; acHitElem = this->unk_424.elements[0].base.acHitElem; - if ((acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW_LIGHT) && (this->actionFunc != func_80900890)) { + if ((acHitElem->atDmgInfo.dmgFlags & DMG_ARROW_LIGHT) && (this->actionFunc != func_80900890)) { func_809000A0(this, play); Actor_PlaySfx(&this->actor, NA_SE_EN_FANTOM_HIT_THUNDER); Actor_PlaySfx(&this->actor, NA_SE_EN_MGANON_DAMAGE); Audio_StopSfxById(NA_SE_EN_MGANON_UNARI); } else if ((this->actionFunc == func_80900890) && - (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_JUMP_MASTER | DMG_SPIN_MASTER | DMG_SLASH_MASTER))) { + (acHitElem->atDmgInfo.dmgFlags & (DMG_JUMP_MASTER | DMG_SPIN_MASTER | DMG_SLASH_MASTER))) { this->unk_316 = 60; this->unk_342 = 5; Actor_PlaySfx(&this->actor, NA_SE_EN_MGANON_DAMAGE); @@ -1937,8 +1937,8 @@ void BossGanon2_CollisionCheck(BossGanon2* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_EN_MGANON_DAMAGE); Audio_StopSfxById(NA_SE_EN_MGANON_UNARI); phi_v1_2 = 1; - if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_JUMP_MASTER | DMG_SPIN_MASTER | DMG_SLASH_MASTER)) { - if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_JUMP_MASTER) { + if (acHitElem->atDmgInfo.dmgFlags & (DMG_JUMP_MASTER | DMG_SPIN_MASTER | DMG_SLASH_MASTER)) { + if (acHitElem->atDmgInfo.dmgFlags & DMG_JUMP_MASTER) { phi_v1_2 = 4; } else { phi_v1_2 = 2; 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 915254fc2e4..050047a264a 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -773,7 +773,7 @@ void BossGanondrof_SetupBlock(BossGanondrof* this, PlayState* play) { } void BossGanondrof_Block(BossGanondrof* this, PlayState* play) { - this->colliderBody.base.colMaterial_Collider = COL_MATERIAL_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.colMaterial_Collider = COL_MATERIAL_METAL; + this->colliderBody.base.colMaterial = COL_MATERIAL_METAL; SkelAnime_Update(&this->skelAnime); switch (this->work[GND_ACTION_STATE]) { case CHARGE_WINDUP: @@ -1239,14 +1239,14 @@ void BossGanondrof_CollisionCheck(BossGanondrof* this, PlayState* play) { } if (this->flyMode != GND_FLY_PAINTING) { if (acHit && (this->actionFunc != BossGanondrof_Stunned) && - (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_RANGED)) { + (acHitElem->atDmgInfo.dmgFlags & DMG_RANGED)) { Actor_PlaySfx(&this->actor, NA_SE_NONE); PRINTF("hit != 0 \n"); } else if (this->actionFunc != BossGanondrof_Charge) { if (this->returnCount == 0) { u8 dmg; u8 canKill = false; - s32 dmgFlags = acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT; + s32 dmgFlags = acHitElem->atDmgInfo.dmgFlags; if (dmgFlags & DMG_HOOKSHOT) { return; @@ -1273,7 +1273,7 @@ void BossGanondrof_CollisionCheck(BossGanondrof* this, PlayState* play) { } else { Actor_PlaySfx(&this->actor, NA_SE_NONE); } - } else if (acHit && (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_RANGED)) { + } else if (acHit && (acHitElem->atDmgInfo.dmgFlags & DMG_RANGED)) { this->work[GND_INVINC_TIMER] = 10; this->actor.colChkInfo.health -= 2; horse->hitTimer = 20; @@ -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.colMaterial_Collider = COL_MATERIAL_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 63fd54b4929..50a44f965d0 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -1820,7 +1820,7 @@ void BossGoma_UpdateHit(BossGoma* this, PlayState* play) { BossGoma_SetupFallStruckDown(this); Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_DAM2); } else if (this->actionFunc == BossGoma_FloorStunned && - (damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT)) != 0) { + (damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags)) != 0) { this->actor.colChkInfo.health -= damage; if ((s8)this->actor.colChkInfo.health > 0) { @@ -1834,14 +1834,14 @@ void BossGoma_UpdateHit(BossGoma* this, PlayState* play) { this->invincibilityFrames = 10; } else if (this->actionFunc != BossGoma_FloorStunned && this->patienceTimer != 0 && - (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_SLINGSHOT | DMG_DEKU_NUT))) { + (acHitElem->atDmgInfo.dmgFlags & (DMG_SLINGSHOT | DMG_DEKU_NUT))) { Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_DAM2); Audio_StopSfxById(NA_SE_EN_GOMA_CRY1); this->invincibilityFrames = 10; BossGoma_SetupFloorStunned(this); this->sfxFaintTimer = 100; - if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_DEKU_NUT) { + if (acHitElem->atDmgInfo.dmgFlags & DMG_DEKU_NUT) { this->framesUntilNextAction = 40; } else { this->framesUntilNextAction = 90; diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index f906fcdb185..94021d0ee1c 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -1154,14 +1154,14 @@ void BossMo_TentCollisionCheck(BossMo* this, PlayState* play) { } acHitElem = this->tentCollider.elements[i1].base.acHitElem; this->work[MO_TENT_INVINC_TIMER] = 5; - if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_MAGIC_FIRE) { + if (acHitElem->atDmgInfo.dmgFlags & DMG_MAGIC_FIRE) { Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_CUT); this->cutIndex = 15; this->meltIndex = this->cutIndex + 1; this->work[MO_TENT_ACTION_STATE] = MO_TENT_CUT; this->timers[0] = 40; this->cutScale = 1.0f; - } else if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_JUMP_MASTER | DMG_JUMP_GIANT | DMG_SPIN_MASTER | + } else if (acHitElem->atDmgInfo.dmgFlags & (DMG_JUMP_MASTER | DMG_JUMP_GIANT | DMG_SPIN_MASTER | DMG_SPIN_GIANT | DMG_SLASH_GIANT | DMG_SLASH_MASTER)) { this->playerHitTimer = 5; } @@ -1755,13 +1755,13 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) { // "hit!!" PRINTF("Core_Damage_check 当り！！\n"); this->coreCollider.base.acFlags &= ~AC_HIT; - if ((acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_MAGIC_FIRE) && (this->work[MO_TENT_ACTION_STATE] == MO_CORE_ATTACK)) { + if ((acHitElem->atDmgInfo.dmgFlags & DMG_MAGIC_FIRE) && (this->work[MO_TENT_ACTION_STATE] == MO_CORE_ATTACK)) { this->work[MO_TENT_ACTION_STATE] = MO_CORE_RETREAT; } // "hit 2 !!" PRINTF("Core_Damage_check 当り 2 ！！\n"); if ((this->work[MO_TENT_ACTION_STATE] != MO_CORE_UNDERWATER) && (this->work[MO_TENT_INVINC_TIMER] == 0)) { - u8 damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT); + u8 damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags); if ((damage != 0) && (this->work[MO_TENT_ACTION_STATE] < MO_CORE_ATTACK)) { // "sword hit !!" @@ -1799,8 +1799,8 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) { } } this->work[MO_TENT_INVINC_TIMER] = 10; - } else if (!(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SHIELD) && - (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT)) { + } else if (!(acHitElem->atDmgInfo.dmgFlags & DMG_SHIELD) && + (acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT)) { if (this->work[MO_TENT_ACTION_STATE] >= MO_CORE_ATTACK) { Sfx_PlaySfxAtPos(&sMorphaTent1->tentTipPos, NA_SE_EN_MOFER_CUT); sMorphaTent1->cutIndex = this->work[MO_CORE_POS_IN_TENT]; 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 053aa166b33..7be76335f9e 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -873,7 +873,7 @@ void BossSst_HeadStunned(BossSst* this, PlayState* play) { void BossSst_HeadSetupVulnerable(BossSst* this) { Animation_MorphToLoop(&this->skelAnime, &gBongoHeadStunnedAnim, -5.0f); this->colliderCyl.base.acFlags |= AC_ON; - this->colliderCyl.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_SWORD | DMG_DEKU_STICK; + this->colliderCyl.elem.acDmgInfo.dmgFlags = DMG_SWORD | DMG_DEKU_STICK; this->actor.speed = 0.0f; this->colliderJntSph.elements[10].base.acElemFlags |= (ACELEM_ON | ACELEM_HOOKABLE); this->colliderJntSph.elements[0].base.acElemFlags &= ~ACELEM_ON; @@ -932,7 +932,7 @@ void BossSst_HeadDamage(BossSst* this, PlayState* play) { void BossSst_HeadSetupRecover(BossSst* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gBongoHeadRecoverAnim, -5.0f); this->colliderCyl.base.acFlags &= ~AC_ON; - this->colliderCyl.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_DEFAULT; + this->colliderCyl.elem.acDmgInfo.dmgFlags = DMG_DEFAULT; this->colliderJntSph.elements[10].base.acElemFlags &= ~(ACELEM_ON | ACELEM_HOOKABLE); this->colliderJntSph.elements[0].base.acElemFlags |= ACELEM_ON; this->vVanish = true; @@ -2500,17 +2500,17 @@ void BossSst_HandSetDamage(BossSst* this, s32 damage) { this->colliderJntSph.base.atFlags |= AT_ON; for (i = 0; i < 11; i++) { - this->colliderJntSph.elements[i].base.atDmgInfo.damage_ColliderElementDamageInfoAT = damage; + this->colliderJntSph.elements[i].base.atDmgInfo.damage = damage; } } void BossSst_HandSetInvulnerable(BossSst* this, s32 isInv) { this->colliderJntSph.base.acFlags &= ~AC_HIT; if (isInv) { - this->colliderJntSph.base.colMaterial_Collider = COL_MATERIAL_HARD; + this->colliderJntSph.base.colMaterial = COL_MATERIAL_HARD; this->colliderJntSph.base.acFlags |= AC_HARD; } else { - this->colliderJntSph.base.colMaterial_Collider = COL_MATERIAL_HIT0; + this->colliderJntSph.base.colMaterial = COL_MATERIAL_HIT0; this->colliderJntSph.base.acFlags &= ~AC_HARD; } } @@ -2520,11 +2520,11 @@ void BossSst_HeadSfx(BossSst* this, u16 sfxId) { } void BossSst_HandCollisionCheck(BossSst* this, PlayState* play) { - if ((this->colliderJntSph.base.acFlags & AC_HIT) && (this->colliderJntSph.base.colMaterial_Collider != COL_MATERIAL_HARD)) { + if ((this->colliderJntSph.base.acFlags & AC_HIT) && (this->colliderJntSph.base.colMaterial != COL_MATERIAL_HARD)) { s32 bothHands = true; this->colliderJntSph.base.acFlags &= ~AC_HIT; - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { + if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); this->colliderJntSph.base.acFlags &= ~AC_ON; this->colliderJntSph.base.ocFlags1 &= ~OC1_NO_PUSH; @@ -2535,7 +2535,7 @@ void BossSst_HandCollisionCheck(BossSst* this, PlayState* play) { } this->actor.flags &= ~ACTOR_FLAG_0; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 3) { + if (this->actor.colChkInfo.damageEffect == 3) { BossSst_HandSetupFrozen(this); } else { BossSst_HandSetupReel(this); @@ -2555,7 +2555,7 @@ void BossSst_HandCollisionCheck(BossSst* this, PlayState* play) { void BossSst_HeadCollisionCheck(BossSst* this, PlayState* play) { if (this->colliderCyl.base.acFlags & AC_HIT) { this->colliderCyl.base.acFlags &= ~AC_HIT; - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { + if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { if (this->actionFunc == BossSst_HeadVulnerable) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); 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 5f596734616..8ea3c3afc6b 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -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.playerACHitReaction_ColliderElementDamageInfoAT = PLAYER_AC_HIT_REACTION_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.colMaterial_Collider = COL_MATERIAL_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.colMaterial_Collider = COL_MATERIAL_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.colMaterial_Collider = COL_MATERIAL_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); @@ -3097,7 +3097,7 @@ void BossTw_TwinrovaUpdate(Actor* thisx, PlayState* play2) { ColliderElement* acHitElem = this->collider.elem.acHitElem; this->collider.base.acFlags &= ~AC_HIT; - if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_SLINGSHOT | DMG_ARROW)) {} + if (acHitElem->atDmgInfo.dmgFlags & (DMG_SLINGSHOT | DMG_ARROW)) {} } } else if (this->collider.base.acFlags & AC_HIT) { u8 damage; @@ -3106,7 +3106,7 @@ void BossTw_TwinrovaUpdate(Actor* thisx, PlayState* play2) { this->collider.base.acFlags &= ~AC_HIT; swordDamage = false; - damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT); + damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags); if (damage == 0) { damage = 2; @@ -3114,7 +3114,7 @@ void BossTw_TwinrovaUpdate(Actor* thisx, PlayState* play2) { swordDamage = true; } - if (!(acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT)) { + if (!(acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT)) { if (((s8)this->actor.colChkInfo.health < 3) && !swordDamage) { damage = 0; } @@ -4338,7 +4338,7 @@ s32 BossTw_BlastShieldCheck(BossTw* this, PlayState* play) { this->collider.base.atFlags &= ~AT_HIT; acHitElem = this->collider.elem.acHitElem; - if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SHIELD) { + if (acHitElem->atDmgInfo.dmgFlags & DMG_SHIELD) { this->work[INVINC_TIMER] = 7; play->envCtx.lightBlend = 1.0f; Rumble_Request(0.0f, 100, 5, 4); @@ -5435,7 +5435,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.colMaterial_Collider = COL_MATERIAL_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 43ad90c8017..9aa0a19c9e9 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -1128,7 +1128,7 @@ void BossVa_BodyPhase2(BossVa* this, PlayState* play) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 160); this->actor.colorFilterTimer = this->invincibilityTimer; } else { - this->colliderBody.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_BOOMERANG; + this->colliderBody.elem.acDmgInfo.dmgFlags = DMG_BOOMERANG; } } @@ -1138,7 +1138,7 @@ void BossVa_BodyPhase2(BossVa* this, PlayState* play) { if (this->colliderBody.base.ac->id == ACTOR_EN_BOOM) { sPhase2Timer &= 0xFE00; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 160); - this->colliderBody.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_SWORD | DMG_BOOMERANG | DMG_DEKU_STICK; + this->colliderBody.elem.acDmgInfo.dmgFlags = DMG_SWORD | DMG_BOOMERANG | DMG_DEKU_STICK; } else { sKillBari++; if ((this->actor.colorFilterTimer != 0) && !(this->actor.colorFilterParams & 0x4000)) { @@ -1217,7 +1217,7 @@ void BossVa_BodyPhase2(BossVa* this, PlayState* play) { } void BossVa_SetupBodyPhase3(BossVa* this) { - this->colliderBody.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_BOOMERANG; + this->colliderBody.elem.acDmgInfo.dmgFlags = DMG_BOOMERANG; this->actor.speed = 0.0f; sPhase3StopMoving = false; BossVa_SetupAction(this, BossVa_BodyPhase3); @@ -1371,11 +1371,11 @@ void BossVa_BodyPhase4(BossVa* this, PlayState* play) { if (this->timer >= 0) { if (this->invincibilityTimer == 0) { this->invincibilityTimer = 8; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 1) { + if (this->actor.colChkInfo.damageEffect != 1) { this->actor.world.rot.y = this->actor.yawTowardsPlayer; Actor_PlaySfx(&this->actor, NA_SE_EN_BALINADE_DAMAGE); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 12); - sPhase4HP -= this->actor.colChkInfo.damage_CollisionCheckInfo; + sPhase4HP -= this->actor.colChkInfo.damage; if (sPhase4HP <= 0) { this->timer = 0; sFightPhase++; @@ -1421,7 +1421,7 @@ void BossVa_BodyPhase4(BossVa* this, PlayState* play) { } Math_SmoothStepToF(&this->actor.speed, ((sFightPhase - PHASE_4 + 1) * 1.5f) + 4.0f, 1.0f, 0.25f, 0.0f); } - this->colliderBody.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_BOOMERANG; + this->colliderBody.elem.acDmgInfo.dmgFlags = DMG_BOOMERANG; } else { Math_SmoothStepToS(&this->vaBodySpinRate, 0, 1, 0x96, 0); if (this->timer > 0) { @@ -1429,7 +1429,7 @@ void BossVa_BodyPhase4(BossVa* this, PlayState* play) { this->timer = 35; } Math_SmoothStepToF(&this->actor.shape.yOffset, -480.0f, 1.0f, 30.0f, 0.0f); - this->colliderBody.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_SWORD | DMG_BOOMERANG | DMG_DEKU_STICK; + this->colliderBody.elem.acDmgInfo.dmgFlags = DMG_SWORD | DMG_BOOMERANG | DMG_DEKU_STICK; this->timer--; } else { if ((player->stateFlags1 & PLAYER_STATE1_26) && (this->timer < -60)) { 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 c856061d25c..cc393eec5b6 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -423,10 +423,10 @@ void DoorKiller_Wait(DoorKiller* this, PlayState* play) { if (DoorKiller_IsHit(&this->actor, play)) { // AC cylinder: wobble if hit by most weapons, die if hit by explosives or hammer - if (this->colliderCylinder.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_RANGED | DMG_SLASH | DMG_DEKU_STICK)) { + if (this->colliderCylinder.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_RANGED | DMG_SLASH | DMG_DEKU_STICK)) { this->timer = 16; this->actionFunc = DoorKiller_Wobble; - } else if (this->colliderCylinder.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_HAMMER_SWING | DMG_EXPLOSIVE)) { + } else if (this->colliderCylinder.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_HAMMER_SWING | DMG_EXPLOSIVE)) { DoorKiller_SpawnRubble(&this->actor, play); this->actionFunc = DoorKiller_Die; SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 20, NA_SE_EN_KDOOR_BREAK); 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 4b4b856fc85..7df536ecce7 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -794,27 +794,27 @@ void EnAm_UpdateDamage(EnAm* this, PlayState* play) { } else if ((this->hurtCollider.base.acFlags & AC_HIT) && (this->behavior >= AM_BEHAVIOR_5)) { this->hurtCollider.base.acFlags &= ~AC_HIT; - if (this->dyna.actor.colChkInfo.damageEffect_CollisionCheckInfo != AM_DMGEFF_MAGIC_FIRE_LIGHT) { + if (this->dyna.actor.colChkInfo.damageEffect != AM_DMGEFF_MAGIC_FIRE_LIGHT) { this->unk_264 = 0; - this->damageEffect = this->dyna.actor.colChkInfo.damageEffect_CollisionCheckInfo; + this->damageEffect = this->dyna.actor.colChkInfo.damageEffect; Actor_SetDropFlag(&this->dyna.actor, &this->hurtCollider.elem, false); - if ((this->dyna.actor.colChkInfo.damageEffect_CollisionCheckInfo == AM_DMGEFF_NUT) || - (this->dyna.actor.colChkInfo.damageEffect_CollisionCheckInfo == AM_DMGEFF_STUN) || - (this->dyna.actor.colChkInfo.damageEffect_CollisionCheckInfo == AM_DMGEFF_ICE)) { + if ((this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_NUT) || + (this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_STUN) || + (this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_ICE)) { if (this->behavior != AM_BEHAVIOR_STUNNED) { EnAm_SetupStunned(this, play); - if (this->dyna.actor.colChkInfo.damage_CollisionCheckInfo != 0) { + if (this->dyna.actor.colChkInfo.damage != 0) { this->dyna.actor.colChkInfo.health = 0; } - } else if (this->dyna.actor.colChkInfo.damageEffect_CollisionCheckInfo == AM_DMGEFF_STUN) { + } else if (this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_STUN) { Vec3f sparkPos = this->dyna.actor.world.pos; sparkPos.y += 50.0f; CollisionCheck_SpawnShieldParticlesMetal(play, &sparkPos); } - } else if ((this->dyna.actor.colChkInfo.damageEffect_CollisionCheckInfo == AM_DMGEFF_KILL) || + } else if ((this->dyna.actor.colChkInfo.damageEffect == AM_DMGEFF_KILL) || (this->behavior == AM_BEHAVIOR_STUNNED)) { this->dyna.actor.colChkInfo.health = 0; @@ -841,7 +841,7 @@ void EnAm_Update(Actor* thisx, PlayState* play) { EnAm_UpdateDamage(this, play); } - if (this->dyna.actor.colChkInfo.damageEffect_CollisionCheckInfo != AM_DMGEFF_MAGIC_FIRE_LIGHT) { + if (this->dyna.actor.colChkInfo.damageEffect != AM_DMGEFF_MAGIC_FIRE_LIGHT) { if (this->attackTimer != 0) { this->attackTimer--; } 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 fd6ae79898a..47a30358e19 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -384,7 +384,7 @@ void EnAnubice_Update(Actor* thisx, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == ANUBICE_DMGEFF_FIRE) { + if (this->actor.colChkInfo.damageEffect == ANUBICE_DMGEFF_FIRE) { Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_PROP); this->actor.flags &= ~ACTOR_FLAG_0; Enemy_StartFinishingBlow(play, &this->actor); 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 6191d3d0307..dc7bb4cf2cb 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 @@ -113,7 +113,7 @@ void func_809B27D8(EnAnubiceFire* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_IT_SHIELD_REFLECT_SW); this->cylinder.base.atFlags &= ~(AT_HIT | AT_BOUNCED | AT_TYPE_ENEMY); this->cylinder.base.atFlags |= AT_TYPE_PLAYER; - this->cylinder.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_DEKU_STICK; + this->cylinder.elem.atDmgInfo.dmgFlags = DMG_DEKU_STICK; this->unk_15A = 30; this->actor.params = 1; this->actor.velocity.x *= -1.0f; 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 7344f6e1ad1..a7262762fe0 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -128,8 +128,8 @@ void EnArrow_Init(Actor* thisx, PlayState* play) { if (this->actor.params < 0) { this->collider.base.atFlags = (AT_ON | AT_TYPE_ENEMY); } else if (this->actor.params <= ARROW_SEED) { - this->collider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = dmgFlags[this->actor.params]; - LOG_HEX("this->at_info.cl_elem.at_btl_info.at_type", this->collider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT, + this->collider.elem.atDmgInfo.dmgFlags = dmgFlags[this->actor.params]; + LOG_HEX("this->at_info.cl_elem.at_btl_info.at_type", this->collider.elem.atDmgInfo.dmgFlags, "../z_en_arrow.c", 707); } } @@ -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->elemMaterial_ColliderElement != ELEM_MATERIAL_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_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 6cff6eaf53e..c675ac1b742 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -332,8 +332,8 @@ void EnBb_Init(Actor* thisx, PlayState* play) { this->flameScaleY = 80.0f; this->flameScaleX = 100.0f; this->collider.elements[0].base.atElemFlags = ATELEM_ON | ATELEM_SFX_HARD; - this->collider.elements[0].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_DEFAULT; - this->collider.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 8; + this->collider.elements[0].base.atDmgInfo.dmgFlags = DMG_DEFAULT; + this->collider.elements[0].base.atDmgInfo.damage = 8; this->bobSize = this->actionState * 20.0f; this->flamePrimAlpha = 255; this->moveMode = BBMOVE_NORMAL; @@ -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.playerACHitReaction_ColliderElementDamageInfoAT = PLAYER_AC_HIT_REACTION_1; + this->collider.elements[0].base.atDmgInfo.playerACHitReaction = PLAYER_AC_HIT_REACTION_1; EnBb_SetupRed(play, this); break; case ENBB_WHITE: @@ -1151,11 +1151,11 @@ void EnBb_CollisionCheck(EnBb* this, PlayState* play) { } if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - this->dmgEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; + this->dmgEffect = this->actor.colChkInfo.damageEffect; Actor_SetDropFlag(&this->actor, &this->collider.elements[0].base, false); switch (this->dmgEffect) { case 7: - this->actor.freezeTimer = this->collider.elements[0].base.acHitElem->atDmgInfo.damage_ColliderElementDamageInfoAT; + this->actor.freezeTimer = this->collider.elements[0].base.acHitElem->atDmgInfo.damage; FALLTHROUGH; case 5: this->fireIceTimer = 0x30; @@ -1165,7 +1165,7 @@ void EnBb_CollisionCheck(EnBb* this, PlayState* play) { //! Din's Fire on a white bubble will do just that. The mechanism is complex and described below. goto block_15; case 6: - this->actor.freezeTimer = this->collider.elements[0].base.acHitElem->atDmgInfo.damage_ColliderElementDamageInfoAT; + this->actor.freezeTimer = this->collider.elements[0].base.acHitElem->atDmgInfo.damage; break; case 8: case 9: @@ -1234,7 +1234,7 @@ void EnBb_Update(Actor* thisx, PlayState* play2) { if (this->actor.params <= ENBB_BLUE) { EnBb_CollisionCheck(this, play); } - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0xD) { + if (this->actor.colChkInfo.damageEffect != 0xD) { this->actionFunc(this, play); if ((this->actor.params <= ENBB_BLUE) && (this->actor.speed >= -6.0f) && ((this->actor.flags & ACTOR_FLAG_15) == 0)) { 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 4cd8e24cc10..14ece51c363 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -333,7 +333,7 @@ void func_809BD524(EnBigokuta* this) { this->unk_19A = 0; this->cylinder[0].base.atFlags |= AT_ON; Actor_PlaySfx(&this->actor, NA_SE_EN_DAIOCTA_MAHI); - if (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_DEKU_NUT) { + if (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & DMG_DEKU_NUT) { this->unk_195 = true; this->unk_196 = 20; } else { @@ -747,12 +747,12 @@ void func_809BE798(EnBigokuta* this, PlayState* play) { void EnBigokuta_UpdateDamage(EnBigokuta* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0 || this->actor.colChkInfo.damage_CollisionCheckInfo != 0) { - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) { + if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) { + if (this->actor.colChkInfo.damageEffect == 1) { if (this->actionFunc != func_809BE058) { func_809BD524(this); } - } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0xF) { + } else if (this->actor.colChkInfo.damageEffect == 0xF) { func_809BD47C(this); } else if (!Actor_IsFacingPlayer(&this->actor, 0x4000)) { if (Actor_ApplyDamage(&this->actor) == 0) { // Dead 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 58441b75c9c..52e6e51c12f 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -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.playerATHitReaction_ColliderElementDamageInfoAC = PLAYER_AT_HIT_REACTION_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.playerATHitReaction_ColliderElementDamageInfoAC = PLAYER_AT_HIT_REACTION_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); @@ -551,14 +551,14 @@ void EnBili_UpdateDamage(EnBili* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem, true); - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { + if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { if (Actor_ApplyDamage(&this->actor) == 0) { Actor_PlaySfx(&this->actor, NA_SE_EN_BIRI_DEAD); Enemy_StartFinishingBlow(play, &this->actor); this->actor.flags &= ~ACTOR_FLAG_0; } - damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; + damageEffect = this->actor.colChkInfo.damageEffect; if (damageEffect == BIRI_DMGEFF_DEKUNUT) { if (this->actionFunc != EnBili_Stunned) { @@ -586,7 +586,7 @@ void EnBili_UpdateDamage(EnBili* this, PlayState* play) { EnBili_SetupBurnt(this); } - if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_ARROW) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_ARROW) { this->actor.flags |= ACTOR_FLAG_4; } } 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 a37c57f3b50..fc6901686a3 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -101,7 +101,7 @@ void EnBom_Init(Actor* thisx, PlayState* play) { Collider_InitJntSph(play, &this->explosionCollider); Collider_SetCylinder(play, &this->bombCollider, thisx, &sCylinderInit); Collider_SetJntSph(play, &this->explosionCollider, thisx, &sJntSphInit, &this->explosionColliderItems[0]); - this->explosionColliderItems[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT += (thisx->shape.rot.z & 0xFF00) >> 8; + this->explosionColliderItems[0].base.atDmgInfo.damage += (thisx->shape.rot.z & 0xFF00) >> 8; thisx->shape.rot.z &= 0xFF; if (thisx->shape.rot.z & 0x80) { 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 973f82e3258..4a262ecba5a 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.c +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.c @@ -263,8 +263,8 @@ void EnBrob_Update(Actor* thisx, PlayState* play2) { acHits[0] = (this->colliders[0].base.acFlags & AC_HIT) != 0; acHits[1] = (this->colliders[1].base.acFlags & AC_HIT) != 0; - if ((acHits[0] && (this->colliders[0].elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_BOOMERANG)) || - (acHits[1] && (this->colliders[1].elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_BOOMERANG))) { + if ((acHits[0] && (this->colliders[0].elem.acHitElem->atDmgInfo.dmgFlags & DMG_BOOMERANG)) || + (acHits[1] && (this->colliders[1].elem.acHitElem->atDmgInfo.dmgFlags & DMG_BOOMERANG))) { for (i = 0; i < 2; i++) { this->colliders[i].base.atFlags &= ~(AT_HIT | AT_BOUNCED); @@ -273,8 +273,8 @@ void EnBrob_Update(Actor* thisx, PlayState* play2) { EnBrob_SetupStunned(this); } else if ((this->colliders[0].base.atFlags & AT_HIT) || (this->colliders[1].base.atFlags & AT_HIT) || - (acHits[0] && (this->colliders[0].elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SLASH_KOKIRI)) || - (acHits[1] && (this->colliders[1].elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SLASH_KOKIRI))) { + (acHits[0] && (this->colliders[0].elem.acHitElem->atDmgInfo.dmgFlags & DMG_SLASH_KOKIRI)) || + (acHits[1] && (this->colliders[1].elem.acHitElem->atDmgInfo.dmgFlags & DMG_SLASH_KOKIRI))) { if (this->actionFunc == EnBrob_MoveUp && !(this->colliders[0].base.atFlags & AT_BOUNCED) && !(this->colliders[1].base.atFlags & AT_BOUNCED)) { 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 3a78eff606b..749a4776378 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -97,9 +97,9 @@ void EnBubble_SetDimensions(EnBubble* this, f32 dim) { u32 func_809CBCBC(EnBubble* this) { ColliderElement* elem = &this->colliderSphere.elements[0].base; - elem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_EXPLOSIVE; - elem->atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT = PLAYER_AC_HIT_REACTION_0; - elem->atDmgInfo.damage_ColliderElementDamageInfoAT = 4; + elem->atDmgInfo.dmgFlags = DMG_EXPLOSIVE; + elem->atDmgInfo.playerACHitReaction = PLAYER_AC_HIT_REACTION_0; + elem->atDmgInfo.damage = 4; elem->atElemFlags = ATELEM_ON; this->actor.velocity.y = 0.0f; return 6; @@ -112,7 +112,7 @@ u32 func_809CBCEC(EnBubble* this) { } void EnBubble_DamagePlayer(EnBubble* this, PlayState* play) { - s32 damage = -this->colliderSphere.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT; + s32 damage = -this->colliderSphere.elements[0].base.atDmgInfo.damage; play->damagePlayer(play, damage); func_8002F7A0(play, &this->actor, 6.0f, this->actor.yawTowardsPlayer, 6.0f); 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 f4ac90bb089..fc364d5f0ac 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -686,10 +686,10 @@ void func_809D0584(EnBw* this, PlayState* play) { } else { if (this->collider2.base.acFlags & AC_HIT) { this->collider2.base.acFlags &= ~AC_HIT; - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0) || (this->unk_220 == 6)) { + if ((this->actor.colChkInfo.damageEffect == 0) || (this->unk_220 == 6)) { return; } - this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; + this->damageEffect = this->actor.colChkInfo.damageEffect; Actor_SetDropFlag(&this->actor, &this->collider2.elem, false); if ((this->damageEffect == 1) || (this->damageEffect == 0xE)) { if (this->unk_23C == 0) { @@ -751,7 +751,7 @@ void EnBw_Update(Actor* thisx, PlayState* play2) { Color_RGBA8 sp44 = { 0, 0, 0, 220 }; func_809D0584(this, play); - if (thisx->colChkInfo.damageEffect_CollisionCheckInfo != 6) { + if (thisx->colChkInfo.damageEffect != 6) { this->actionFunc(this, play); if (this->unk_23C == 0) { this->unk_23A = (this->unk_23A + 4) & 0x7F; @@ -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.playerACHitReaction_ColliderElementDamageInfoAT = PLAYER_AC_HIT_REACTION_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.playerACHitReaction_ColliderElementDamageInfoAT = PLAYER_AC_HIT_REACTION_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_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index ec0783755da..ccadaeecc18 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -156,7 +156,7 @@ void EnCrow_SetupDamaged(EnCrow* this, PlayState* play) { this->actor.targetArrowOffset = 0.0f; Actor_PlaySfx(&this->actor, NA_SE_EN_KAICHO_DEAD); - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 3) { // Ice arrows + if (this->actor.colChkInfo.damageEffect == 3) { // Ice arrows Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 40); for (i = 0; i < 8; i++) { iceParticlePos.x = ((i & 1 ? 7.0f : -7.0f) * scale) + this->actor.world.pos.x; @@ -165,7 +165,7 @@ void EnCrow_SetupDamaged(EnCrow* this, PlayState* play) { EffectSsEnIce_SpawnFlyingVec3f(play, &this->actor, &iceParticlePos, 150, 150, 150, 250, 235, 245, 255, ((Rand_ZeroOne() * 0.15f) + 0.85f) * scale); } - } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 2) { // Fire arrows and Din's Fire + } else if (this->actor.colChkInfo.damageEffect == 2) { // Fire arrows and Din's Fire Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 40); for (i = 0; i < 4; i++) { @@ -413,8 +413,8 @@ void EnCrow_UpdateDamage(EnCrow* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elements[0].base, true); - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) { // Deku Nuts + if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { + if (this->actor.colChkInfo.damageEffect == 1) { // Deku Nuts EnCrow_SetupTurnAway(this); } else { Actor_ApplyDamage(&this->actor); 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 d9de2dd00d4..682acda0a55 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -299,7 +299,7 @@ void EnDekubaba_SetupWait(EnDekubaba* this) { Actor_SetScale(&this->actor, this->size * 0.01f * 0.5f); - this->collider.base.colMaterial_Collider = COL_MATERIAL_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.colMaterial_Collider = COL_MATERIAL_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,15 +1034,15 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlagJntSph(&this->actor, &this->collider, true); - if ((this->collider.base.colMaterial_Collider != COL_MATERIAL_HARD) && - ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != DEKUBABA_DMGEFF_NONE) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0))) { + 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_CollisionCheckInfo; + phi_s0 = this->actor.colChkInfo.health - this->actor.colChkInfo.damage; if (this->actionFunc != EnDekubaba_StunnedVertical) { - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DEKUBABA_DMGEFF_BOOMERANG) || - (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DEKUBABA_DMGEFF_DEKUNUT)) { - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DEKUBABA_DMGEFF_BOOMERANG) { + if ((this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_BOOMERANG) || + (this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_DEKUNUT)) { + if (this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_BOOMERANG) { phi_s0 = this->actor.colChkInfo.health; } @@ -1056,14 +1056,14 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) { } else { EnDekubaba_SetupHit(this, 0); } - } else if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DEKUBABA_DMGEFF_BOOMERANG) || - (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DEKUBABA_DMGEFF_SWORD)) { + } else if ((this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_BOOMERANG) || + (this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_SWORD)) { if (phi_s0 > 0) { EnDekubaba_SetupSway(this); } else { EnDekubaba_SetupPrunedSomersault(this); } - } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != DEKUBABA_DMGEFF_DEKUNUT) { + } else if (this->actor.colChkInfo.damageEffect != DEKUBABA_DMGEFF_DEKUNUT) { EnDekubaba_SetupHit(this, 0); } else { return; @@ -1071,7 +1071,7 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) { this->actor.colChkInfo.health = CLAMP_MIN(phi_s0, 0); - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DEKUBABA_DMGEFF_FIRE) { + if (this->actor.colChkInfo.damageEffect == DEKUBABA_DMGEFF_FIRE) { firePos = &this->actor.world.pos; fireScale = (this->size * 70.0f); @@ -1082,7 +1082,7 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) { } else { return; } - } else if ((play->actorCtx.unk_02 != 0) && (this->collider.base.colMaterial_Collider != COL_MATERIAL_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 7d79450998e..34970510c58 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -204,7 +204,7 @@ void EnDekunuts_SetupGasp(EnDekunuts* this) { void EnDekunuts_SetupBeDamaged(EnDekunuts* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gDekuNutsDamageAnim, -3.0f); - if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_ARROW | DMG_SLINGSHOT)) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_ARROW | DMG_SLINGSHOT)) { this->actor.world.rot.y = this->collider.base.ac->world.rot.y; } else { this->actor.world.rot.y = Actor_WorldYawTowardActor(&this->actor, this->collider.base.ac) + 0x8000; @@ -447,9 +447,9 @@ void EnDekunuts_ColliderCheck(EnDekunuts* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem, true); if (this->actor.colChkInfo.mass == 0x32) { - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 1) { - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 2) { + if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { + if (this->actor.colChkInfo.damageEffect != 1) { + if (this->actor.colChkInfo.damageEffect == 2) { EffectSsFCircle_Spawn(play, &this->actor, &this->actor.world.pos, 40, 50); } EnDekunuts_SetupBeDamaged(this); 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 ff7c47e3046..234dd50c372 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -303,7 +303,7 @@ void EnDh_Attack(EnDh* this, PlayState* play) { -4.0f); this->actionState = 4; this->collider2.base.atFlags = this->collider2.elements[0].base.atElemFlags = AT_NONE; // also ATELEM_NONE - this->collider2.elements[0].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = this->collider2.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 0; + this->collider2.elements[0].base.atDmgInfo.dmgFlags = this->collider2.elements[0].base.atDmgInfo.damage = 0; } switch (this->actionState) { case 1: @@ -318,15 +318,15 @@ void EnDh_Attack(EnDh* this, PlayState* play) { if (this->skelAnime.curFrame >= 4.0f) { this->collider2.base.atFlags = this->collider2.elements[0].base.atElemFlags = AT_ON | AT_TYPE_ENEMY; // also ATELEM_ON | ATELEM_SFX_WOOD - this->collider2.elements[0].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_DEFAULT; - this->collider2.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 8; + this->collider2.elements[0].base.atDmgInfo.dmgFlags = DMG_DEFAULT; + this->collider2.elements[0].base.atDmgInfo.damage = 8; } if (this->collider2.base.atFlags & AT_BOUNCED) { this->collider2.base.atFlags &= ~(AT_HIT | AT_BOUNCED); this->collider2.base.atFlags = this->collider2.elements[0].base.atElemFlags = AT_NONE; // also ATELEM_NONE - this->collider2.elements[0].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = - this->collider2.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 0; + this->collider2.elements[0].base.atDmgInfo.dmgFlags = + this->collider2.elements[0].base.atDmgInfo.damage = 0; this->actionState++; } else if (this->collider2.base.atFlags & AT_HIT) { this->collider2.base.atFlags &= ~AT_HIT; @@ -346,8 +346,8 @@ void EnDh_Attack(EnDh* this, PlayState* play) { this->actionState++; this->collider2.base.atFlags = this->collider2.elements[0].base.atElemFlags = AT_NONE; // also ATELEM_NONE - this->collider2.elements[0].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = - this->collider2.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 0; + this->collider2.elements[0].base.atDmgInfo.dmgFlags = + this->collider2.elements[0].base.atDmgInfo.damage = 0; } break; case 5: @@ -378,8 +378,8 @@ void EnDh_Burrow(EnDh* this, PlayState* play) { this->drawDirtWave++; this->collider1.base.atFlags = this->collider1.elem.atElemFlags = AT_ON | AT_TYPE_ENEMY; // also ATELEM_ON | ATELEM_SFX_WOOD - this->collider1.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_DEFAULT; - this->collider1.elem.atDmgInfo.damage_ColliderElementDamageInfoAT = 4; + this->collider1.elem.atDmgInfo.dmgFlags = DMG_DEFAULT; + this->collider1.elem.atDmgInfo.damage = 4; FALLTHROUGH; case 1: this->dirtWavePhase += 0x47E; @@ -396,7 +396,7 @@ void EnDh_Burrow(EnDh* this, PlayState* play) { this->drawDirtWave = false; this->collider1.dim.radius = 35; this->collider1.base.atFlags = this->collider1.elem.atElemFlags = AT_NONE; // Also ATELEM_NONE - this->collider1.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = this->collider1.elem.atDmgInfo.damage_ColliderElementDamageInfoAT = 0; + this->collider1.elem.atDmgInfo.dmgFlags = this->collider1.elem.atDmgInfo.damage = 0; EnDh_SetupWait(this); break; } @@ -478,9 +478,9 @@ void EnDh_CollisionCheck(EnDh* this, PlayState* play) { if ((this->collider2.base.acFlags & AC_HIT) && !this->retreat) { this->collider2.base.acFlags &= ~AC_HIT; - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) && (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 6)) { + if ((this->actor.colChkInfo.damageEffect != 0) && (this->actor.colChkInfo.damageEffect != 6)) { this->collider2.base.atFlags = this->collider2.elements[0].base.atElemFlags = AT_NONE; // also ATELEM_NONE - this->collider2.elements[0].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = this->collider2.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 0; + this->collider2.elements[0].base.atDmgInfo.dmgFlags = this->collider2.elements[0].base.atDmgInfo.damage = 0; if (player->unk_844 != 0) { this->unk_258 = player->unk_845; } 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 d2405c11ad4..9a20b48310e 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -380,7 +380,7 @@ void EnDha_UpdateHealth(EnDha* this, PlayState* play) { if (!((this->unk_1C0 >= 8) || !(this->collider.base.acFlags & AC_HIT))) { this->collider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0 || this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 6) { + if (this->actor.colChkInfo.damageEffect == 0 || this->actor.colChkInfo.damageEffect == 6) { return; } else { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 8); 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 e374c1b833b..f24b5b2ac0b 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -348,14 +348,14 @@ s32 EnDodojr_CheckDamaged(EnDodojr* this, PlayState* play) { this->actor.shape.shadowDraw = ActorShadow_DrawCircle; } - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0) && (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { + if ((this->actor.colChkInfo.damageEffect == 0) && (this->actor.colChkInfo.damage != 0)) { Enemy_StartFinishingBlow(play, &this->actor); this->freezeFrameTimer = 2; this->actionFunc = EnDodojr_WaitFreezeFrames; return true; } - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) && (this->actionFunc != EnDodojr_Stunned) && + if ((this->actor.colChkInfo.damageEffect == 1) && (this->actionFunc != EnDodojr_Stunned) && (this->actionFunc != EnDodojr_StunnedBounce)) { Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); this->stunTimer = 120; 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 235bf01a129..9fb80a2ab7b 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -608,10 +608,10 @@ void EnDodongo_SweepTail(EnDodongo* this, PlayState* play) { this->sphElements[2].base.atElemFlags = ATELEM_NONE; this->sphElements[1].base.atElemFlags = ATELEM_NONE; this->colliderBody.base.atFlags = AT_NONE; - this->sphElements[2].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = 0; - this->sphElements[1].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = 0; - this->sphElements[2].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 0; - this->sphElements[1].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 0; + this->sphElements[2].base.atDmgInfo.dmgFlags = 0; + this->sphElements[1].base.atDmgInfo.dmgFlags = 0; + this->sphElements[2].base.atDmgInfo.damage = 0; + this->sphElements[1].base.atDmgInfo.damage = 0; EnDodongo_SetupBreatheFire(this); this->timer = Rand_S16Offset(5, 10); } else { @@ -630,8 +630,8 @@ void EnDodongo_SweepTail(EnDodongo* this, PlayState* play) { this->timer = 18; this->colliderBody.base.atFlags = this->sphElements[1].base.atElemFlags = this->sphElements[2].base.atElemFlags = AT_ON | AT_TYPE_ENEMY; // also ATELEM_ON | ATELEM_SFX_WOOD - this->sphElements[1].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = this->sphElements[2].base.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_DEFAULT; - this->sphElements[1].base.atDmgInfo.damage_ColliderElementDamageInfoAT = this->sphElements[2].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 8; + this->sphElements[1].base.atDmgInfo.dmgFlags = this->sphElements[2].base.atDmgInfo.dmgFlags = DMG_DEFAULT; + this->sphElements[1].base.atDmgInfo.damage = this->sphElements[2].base.atDmgInfo.damage = 8; } } else if (this->timer > 1) { Vec3f tailPos; @@ -715,9 +715,9 @@ void EnDodongo_CollisionCheck(EnDodongo* this, PlayState* play) { } else if ((this->colliderBody.base.acFlags & AC_HIT) && (this->actionState > DODONGO_DEATH)) { this->colliderBody.base.acFlags &= ~AC_HIT; Actor_SetDropFlagJntSph(&this->actor, &this->colliderBody, false); - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0xE) { - this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) || (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0xF)) { + if (this->actor.colChkInfo.damageEffect != 0xE) { + this->damageEffect = this->actor.colChkInfo.damageEffect; + if ((this->actor.colChkInfo.damageEffect == 1) || (this->actor.colChkInfo.damageEffect == 0xF)) { if (this->actionState != DODONGO_STUNNED) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); Actor_ApplyDamage(&this->actor); @@ -765,7 +765,7 @@ void EnDodongo_Update(Actor* thisx, PlayState* play) { EnDodongo* this = (EnDodongo*)thisx; EnDodongo_CollisionCheck(this, play); - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0xE) { + if (this->actor.colChkInfo.damageEffect != 0xE) { this->actionFunc(this, play); Actor_MoveXZGravity(&this->actor); Actor_UpdateBgCheckInfo(play, &this->actor, 75.0f, 60.0f, 70.0f, 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 1895082799e..3d4e881b9ce 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -178,7 +178,7 @@ void EnEiyer_RotateAroundHome(EnEiyer* this) { } void EnEiyer_SetupAppearFromGround(EnEiyer* this) { - this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT; + this->collider.elem.acDmgInfo.dmgFlags = DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT; Animation_PlayLoop(&this->skelanime, &gStingerIdleAnim); this->actor.world.pos.x = this->actor.home.pos.x; @@ -228,7 +228,7 @@ void EnEiyer_SetupInactive(EnEiyer* this) { void EnEiyer_SetupAmbush(EnEiyer* this, PlayState* play) { this->actor.speed = 0.0f; Animation_PlayOnce(&this->skelanime, &gStingerBackflipAnim); - this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_DEFAULT; + this->collider.elem.acDmgInfo.dmgFlags = DMG_DEFAULT; this->basePos = this->actor.world.pos; this->actor.world.rot.y = this->actor.shape.rot.y; this->actor.flags |= ACTOR_FLAG_IGNORE_QUAKE; @@ -290,14 +290,14 @@ void EnEiyer_SetupDie(EnEiyer* this) { this->timer = 20; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 200, COLORFILTER_BUFFLAG_OPA, 40); - if (this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC != (DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT)) { + if (this->collider.elem.acDmgInfo.dmgFlags != (DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT)) { this->actor.speed = 6.0f; Animation_MorphToLoop(&this->skelanime, &gStingerHitAnim, -3.0f); } else { this->actor.speed -= 6.0f; } - this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_DEFAULT; + this->collider.elem.acDmgInfo.dmgFlags = DMG_DEFAULT; this->collider.base.atFlags &= ~AT_ON; this->collider.base.acFlags &= ~AC_ON; this->actionFunc = EnEiyer_Die; @@ -604,7 +604,7 @@ void EnEiyer_UpdateDamage(EnEiyer* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem, true); - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0 || this->actor.colChkInfo.damage_CollisionCheckInfo != 0) { + if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); Actor_PlaySfx(&this->actor, NA_SE_EN_EIER_DEAD); @@ -612,13 +612,13 @@ void EnEiyer_UpdateDamage(EnEiyer* this, PlayState* play) { } // If underground, one hit kill - if (this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC == (DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT)) { - if (this->actor.colChkInfo.damage_CollisionCheckInfo == 0) { + if (this->collider.elem.acDmgInfo.dmgFlags == (DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT)) { + if (this->actor.colChkInfo.damage == 0) { EnEiyer_SetupAmbush(this, play); } else { EnEiyer_SetupDie(this); } - } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) { + } else if (this->actor.colChkInfo.damageEffect == 1) { if (this->actionFunc != EnEiyer_Stunned) { EnEiyer_SetupStunned(this); } @@ -687,7 +687,7 @@ s32 EnEiyer_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos->z += 2500.0f; } - if (this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC == (DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT) && limbIndex != 9 && + if (this->collider.elem.acDmgInfo.dmgFlags == (DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT) && limbIndex != 9 && limbIndex != 10) { *dList = NULL; } 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 9ec655b55fd..420f2796e61 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -283,7 +283,7 @@ s32 EnFd_ColliderCheck(EnFd* this, PlayState* play) { return false; } elem = &this->collider.elements[0].base; - if (elem->acHitElem != NULL && (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT)) { + if (elem->acHitElem != NULL && (elem->acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT)) { return false; } 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 9fd21e27b4d..a28487d4e27 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 @@ -491,7 +491,7 @@ void EnFhgFire_EnergyBall(EnFhgFire* this, PlayState* play) { (s16)(Rand_ZeroOne() * 25.0f) + 50, FHGFLASH_LIGHTBALL_GREEN); } canBottleReflect2 = canBottleReflect1; - if (!canBottleReflect2 && (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SHIELD)) { + if (!canBottleReflect2 && (acHitElem->atDmgInfo.dmgFlags & DMG_SHIELD)) { killMode = BALL_IMPACT; Audio_PlaySfxGeneral(NA_SE_IT_SHIELD_REFLECT_MG, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, 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 6b1b2f595c3..c8f3bbad504 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -118,7 +118,7 @@ static InitChainEntry sInitChain[] = { void EnFirefly_Extinguish(EnFirefly* this) { this->actor.params += 2; - this->collider.elements[0].base.atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT = PLAYER_AC_HIT_REACTION_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.playerACHitReaction_ColliderElementDamageInfoAT = PLAYER_AC_HIT_REACTION_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.playerACHitReaction_ColliderElementDamageInfoAT = PLAYER_AC_HIT_REACTION_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.playerACHitReaction_ColliderElementDamageInfoAT = PLAYER_AC_HIT_REACTION_0; // Nothing + this->collider.elements[0].base.atDmgInfo.playerACHitReaction = PLAYER_AC_HIT_REACTION_0; // Nothing this->actor.naviEnemyId = NAVI_ENEMY_KEESE; } @@ -622,13 +622,13 @@ void EnFirefly_UpdateDamage(EnFirefly* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elements[0].base, true); - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { + if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); this->actor.flags &= ~ACTOR_FLAG_0; } - damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; + damageEffect = this->actor.colChkInfo.damageEffect; if (damageEffect == 2) { // Din's Fire if (this->actor.params == KEESE_ICE_FLY) { 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 9afd284a184..e5853929d15 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -181,13 +181,13 @@ void EnFloormas_Destroy(Actor* thisx, PlayState* play) { } void EnFloormas_MakeInvulnerable(EnFloormas* this) { - this->collider.base.colMaterial_Collider = COL_MATERIAL_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.colMaterial_Collider = COL_MATERIAL_HIT0; + this->collider.base.colMaterial = COL_MATERIAL_HIT0; this->actionTarget = 0; this->collider.base.acFlags &= ~AC_HARD; } @@ -389,7 +389,7 @@ void EnFloormas_SetupSmallWait(EnFloormas* this) { void EnFloormas_SetupTakeDamage(EnFloormas* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gWallmasterDamageAnim, -3.0f); - if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_ARROW | DMG_SLINGSHOT)) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_ARROW | DMG_SLINGSHOT)) { this->actor.world.rot.y = this->collider.base.ac->world.rot.y; } else { this->actor.world.rot.y = Actor_WorldYawTowardActor(&this->actor, this->collider.base.ac) + 0x8000; @@ -410,7 +410,7 @@ void EnFloormas_SetupRecover(EnFloormas* this) { void EnFloormas_SetupFreeze(EnFloormas* this) { Animation_Change(&this->skelAnime, &gWallmasterJumpAnim, 1.5f, 0, 20.0f, ANIMMODE_ONCE, -3.0f); this->actor.speed = 0.0f; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 4) { + if (this->actor.colChkInfo.damageEffect == 4) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 255, COLORFILTER_BUFFLAG_OPA, 80); } else { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 80); @@ -979,15 +979,15 @@ void EnFloormas_ColliderCheck(EnFloormas* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem, true); - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { - if (this->collider.base.colMaterial_Collider != COL_MATERIAL_HARD) { + if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { + if (this->collider.base.colMaterial != COL_MATERIAL_HARD) { isSmall = false; if (this->actor.scale.x < 0.01f) { isSmall = true; } - if (isSmall && this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT) { - this->actor.colChkInfo.damage_CollisionCheckInfo = 2; - this->actor.colChkInfo.damageEffect_CollisionCheckInfo = 0; + if (isSmall && this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT) { + this->actor.colChkInfo.damage = 2; + this->actor.colChkInfo.damageEffect = 0; } if (Actor_ApplyDamage(&this->actor) == 0) { if (isSmall) { @@ -997,16 +997,16 @@ void EnFloormas_ColliderCheck(EnFloormas* this, PlayState* play) { } Enemy_StartFinishingBlow(play, &this->actor); this->actor.flags &= ~ACTOR_FLAG_0; - } else if (this->actor.colChkInfo.damage_CollisionCheckInfo != 0) { + } else if (this->actor.colChkInfo.damage != 0) { Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_DAMAGE); } - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 4) || (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1)) { + if ((this->actor.colChkInfo.damageEffect == 4) || (this->actor.colChkInfo.damageEffect == 1)) { if (this->actionFunc != EnFloormas_Freeze) { EnFloormas_SetupFreeze(this); } } else { - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 2) { + if (this->actor.colChkInfo.damageEffect == 2) { EffectSsFCircle_Spawn(play, &this->actor, &this->actor.world.pos, this->actor.scale.x * 4000.0f, this->actor.scale.x * 4000.0f); } @@ -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.colMaterial_Collider == COL_MATERIAL_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.colMaterial_Collider == COL_MATERIAL_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.colMaterial_Collider == COL_MATERIAL_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.colMaterial_Collider == COL_MATERIAL_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.colMaterial_Collider == COL_MATERIAL_HARD) { + if (this->collider.base.colMaterial == COL_MATERIAL_HARD) { func_80026A6C(play); } 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 ecb5eb9e415..5cf9845c823 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -139,7 +139,7 @@ s32 EnFw_CheckCollider(EnFw* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { elem = &this->collider.elements[0].base; - if (elem->acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT) { + if (elem->acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT) { this->lastDmgHook = true; } else { this->lastDmgHook = false; 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 4106d9fd303..77d2a640365 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -341,7 +341,7 @@ void EnFz_ApplyDamage(EnFz* this, PlayState* play) { this->collider1.base.acFlags &= ~AC_HIT; } else if (this->collider1.base.acFlags & AC_HIT) { this->collider1.base.acFlags &= ~AC_HIT; - switch (this->actor.colChkInfo.damageEffect_CollisionCheckInfo) { + switch (this->actor.colChkInfo.damageEffect) { case 0xF: Actor_ApplyDamage(&this->actor); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_XLU, 8); 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 afe49d2636f..e05c64454d5 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 @@ -137,7 +137,7 @@ void EnGSwitch_Init(Actor* thisx, PlayState* play) { this->actor.scale.x = 0.25f; this->actor.scale.y = 0.45f; this->actor.scale.z = 0.25f; - this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_ARROW; + this->collider.elem.acDmgInfo.dmgFlags = DMG_ARROW; this->objectId = OBJECT_TSUBO; this->requiredObjectSlot = Object_GetSlot(&play->objectCtx, this->objectId); if (this->requiredObjectSlot < 0) { 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 6b8dd591e0e..90795e26396 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -556,7 +556,7 @@ void EnGe2_Update(Actor* thisx, PlayState* play) { this->actionFunc(this, play); } else if (this->collider.base.acFlags & AC_HIT) { if ((this->collider.elem.acHitElem != NULL) && - (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT)) { + (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT)) { //! @bug duration parameter is larger than 255 which messes with the internal bitpacking of the colorfilter. //! Because of the duration being tracked as an unsigned byte it ends up being truncated to 144 Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 400); @@ -609,7 +609,7 @@ void EnGe2_UpdateStunned(Actor* thisx, PlayState* play2) { if ((this->collider.base.acFlags & AC_HIT) && ((this->collider.elem.acHitElem == NULL) || - !(this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HOOKSHOT))) { + !(this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_HOOKSHOT))) { this->actor.colorFilterTimer = 0; EnGe2_ChangeAction(this, GE2_ACTION_KNOCKEDOUT); this->timer = 100; 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 e98efc5d5cd..13592534bde 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -1372,12 +1372,12 @@ void EnGeldB_CollisionCheck(EnGeldB* this, PlayState* play) { } else if ((this->bodyCollider.base.acFlags & AC_HIT) && (this->action >= GELDB_READY) && (this->spinAttackState < 2)) { this->bodyCollider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != GELDB_DMG_UNK_6) { - this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; + if (this->actor.colChkInfo.damageEffect != GELDB_DMG_UNK_6) { + this->damageEffect = this->actor.colChkInfo.damageEffect; Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, true); Audio_StopSfxByPosAndId(&this->actor.projectedPos, NA_SE_EN_GERUDOFT_BREATH); - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == GELDB_DMG_STUN) || - (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == GELDB_DMG_FREEZE)) { + if ((this->actor.colChkInfo.damageEffect == GELDB_DMG_STUN) || + (this->actor.colChkInfo.damageEffect == GELDB_DMG_FREEZE)) { if (this->action != GELDB_STUNNED) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); Actor_ApplyDamage(&this->actor); @@ -1411,7 +1411,7 @@ void EnGeldB_Update(Actor* thisx, PlayState* play) { EnGeldB* this = (EnGeldB*)thisx; EnGeldB_CollisionCheck(this, play); - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != GELDB_DMG_UNK_6) { + if (this->actor.colChkInfo.damageEffect != GELDB_DMG_UNK_6) { Actor_MoveXZGravity(&this->actor); Actor_UpdateBgCheckInfo(play, &this->actor, 15.0f, 30.0f, 60.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 | 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 68511c67ee2..9415c38c78b 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -623,7 +623,7 @@ void EnGoma_UpdateHit(EnGoma* this, PlayState* play) { this->colCyl2.base.acFlags &= ~AC_HIT; if (this->gomaType == ENGOMA_NORMAL) { - u32 dmgFlags = acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT; + u32 dmgFlags = acHitElem->atDmgInfo.dmgFlags; if (dmgFlags & DMG_SHIELD) { if (this->actionFunc == EnGoma_Jump) { 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 d8d070349d4..945edd1c941 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -530,7 +530,7 @@ void EnGs_Update(Actor* thisx, PlayState* play2) { this->unk_19F = 0; this->collider.base.acFlags &= ~AC_HIT; - switch (this->actor.colChkInfo.damageEffect_CollisionCheckInfo) { + switch (this->actor.colChkInfo.damageEffect) { case 15: this->unk_19E |= 1; func_80A4F77C(this); 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 d2ebfb5f9cf..d7319849fe5 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -732,7 +732,7 @@ void EnIk_UpdateDamage(EnIk* this, PlayState* play) { Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, true); - this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; + this->damageEffect = this->actor.colChkInfo.damageEffect; this->bodyCollider.base.acFlags &= ~AC_HIT; if ((this->damageEffect == EN_IK_DMGEFF_NONE) || (this->damageEffect == EN_IK_DMGEFF_SPARKS_NO_DMG) || 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 7b2521b00f9..bb6d00428a8 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -356,7 +356,7 @@ void EnIshi_Wait(EnIshi* this, PlayState* play) { EnIshi_SpawnBugs(this, play); } } else if ((this->collider.base.acFlags & AC_HIT) && (type == ROCK_SMALL) && - this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_HAMMER | DMG_EXPLOSIVE)) { + this->collider.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_HAMMER | DMG_EXPLOSIVE)) { EnIshi_DropCollectible(this, play); SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, sBreakSfxDurations[type], sBreakSfxIds[type]); sFragmentSpawnFuncs[type](this, play); 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 ea289f2610a..1f7ed16a79e 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -303,7 +303,7 @@ void EnKanban_Update(Actor* thisx, PlayState* play2) { s16 yawDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; u8 i; - if (acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_SLASH) { + if (acHitElem->atDmgInfo.dmgFlags & DMG_SLASH) { this->cutType = sCutTypes[player->meleeWeaponAnimation]; } else { this->cutType = CUT_POST; 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 09ff804ce99..e3d14852f45 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -123,9 +123,9 @@ 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.colMaterial_Collider = COL_MATERIAL_HARD; + this->bodyCollider.base.colMaterial = COL_MATERIAL_HARD; this->bodyCollider.base.acFlags |= AC_HARD; - this->bodyCollider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_DEFAULT; + this->bodyCollider.elem.acDmgInfo.dmgFlags = DMG_DEFAULT; this->headCollider.dim.height = 25; } @@ -153,9 +153,9 @@ void EnKarebaba_SetupAwaken(EnKarebaba* this) { void EnKarebaba_SetupUpright(EnKarebaba* this) { if (this->actionFunc != EnKarebaba_Spin) { Actor_SetScale(&this->actor, 0.01f); - this->bodyCollider.base.colMaterial_Collider = COL_MATERIAL_HIT6; + this->bodyCollider.base.colMaterial = COL_MATERIAL_HIT6; this->bodyCollider.base.acFlags &= ~AC_HARD; - this->bodyCollider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = + this->bodyCollider.elem.acDmgInfo.dmgFlags = !LINK_IS_ADULT ? ((DMG_SWORD | DMG_BOOMERANG) & ~DMG_JUMP_MASTER) : (DMG_SWORD | DMG_BOOMERANG); this->bodyCollider.dim.radius = 15; this->bodyCollider.dim.height = 80; 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 2bd0fc55f94..b0ef61b4376 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 @@ -90,7 +90,7 @@ void EnMThunder_Init(Actor* thisx, PlayState* play2) { player->stateFlags2 &= ~PLAYER_STATE2_17; this->unk_1CA = 1; - this->collider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = D_80AA044C[this->unk_1C7]; + this->collider.elem.atDmgInfo.dmgFlags = D_80AA044C[this->unk_1C7]; this->unk_1C6 = 1; this->unk_1C9 = ((this->unk_1C7 == 1) ? 2 : 4); func_80A9EFE0(this, func_80A9F9B4); @@ -189,11 +189,11 @@ void func_80A9F408(EnMThunder* this, PlayState* play) { gSaveContext.magicState = MAGIC_STATE_CONSUME_SETUP; } if (player->unk_858 < 0.85f) { - this->collider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = D_80AA044C[this->unk_1C7]; + this->collider.elem.atDmgInfo.dmgFlags = D_80AA044C[this->unk_1C7]; this->unk_1C6 = 1; this->unk_1C9 = ((this->unk_1C7 == 1) ? 2 : 4); } else { - this->collider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = D_80AA0458[this->unk_1C7]; + this->collider.elem.atDmgInfo.dmgFlags = D_80AA0458[this->unk_1C7]; this->unk_1C6 = 0; this->unk_1C9 = ((this->unk_1C7 == 1) ? 4 : 8); } 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 8eff4601126..e7b4a4bd520 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -296,7 +296,7 @@ void EnMb_Init(Actor* thisx, PlayState* play) { this->actor.uncullZoneScale = 800.0f; this->actor.uncullZoneDownward = 1800.0f; this->playerDetectionRange = 710.0f; - this->attackCollider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_UNBLOCKABLE; + this->attackCollider.elem.atDmgInfo.dmgFlags = DMG_UNBLOCKABLE; relYawFromPlayer = this->actor.world.rot.y - Math_Vec3f_Yaw(&this->actor.world.pos, &player->actor.world.pos); @@ -1376,19 +1376,19 @@ void EnMb_CheckColliding(EnMb* this, PlayState* play) { this->bodyCollider.base.acFlags &= ~AC_HIT; } else if ((this->bodyCollider.base.acFlags & AC_HIT) && this->state >= ENMB_STATE_STUNNED) { this->bodyCollider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != ENMB_DMGEFF_IGNORE && - this->actor.colChkInfo.damageEffect_CollisionCheckInfo != ENMB_DMGEFF_FREEZE) { + if (this->actor.colChkInfo.damageEffect != ENMB_DMGEFF_IGNORE && + this->actor.colChkInfo.damageEffect != ENMB_DMGEFF_FREEZE) { if ((player->stateFlags2 & PLAYER_STATE2_7) && player->actor.parent == &this->actor) { player->stateFlags2 &= ~PLAYER_STATE2_7; player->actor.parent = NULL; player->av2.actionVar2 = 200; func_8002F71C(play, &this->actor, 6.0f, this->actor.world.rot.y, 6.0f); } - this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; + this->damageEffect = this->actor.colChkInfo.damageEffect; this->attack = ENMB_ATTACK_NONE; Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, false); - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == ENMB_DMGEFF_STUN || - this->actor.colChkInfo.damageEffect_CollisionCheckInfo == ENMB_DMGEFF_STUN_ICE) { + if (this->actor.colChkInfo.damageEffect == ENMB_DMGEFF_STUN || + this->actor.colChkInfo.damageEffect == ENMB_DMGEFF_STUN_ICE) { if (this->state != ENMB_STATE_STUNNED) { Actor_ApplyDamage(&this->actor); EnMb_SetupStunned(this); @@ -1419,7 +1419,7 @@ void EnMb_Update(Actor* thisx, PlayState* play) { s32 pad; EnMb_CheckColliding(this, play); - if (thisx->colChkInfo.damageEffect_CollisionCheckInfo != ENMB_DMGEFF_FREEZE) { + if (thisx->colChkInfo.damageEffect != ENMB_DMGEFF_FREEZE) { this->actionFunc(this, play); Actor_MoveXZGravity(thisx); Actor_UpdateBgCheckInfo(play, thisx, 40.0f, 40.0f, 70.0f, 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 b4bfae3fc61..bf3efeaeee4 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -120,7 +120,7 @@ void func_80ABBBA8(EnNutsball* this, PlayState* play) { this->collider.base.atFlags &= ~AT_TYPE_ENEMY & ~AT_BOUNCED & ~AT_HIT; this->collider.base.atFlags |= AT_TYPE_PLAYER; - this->collider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_DEKU_STICK; + this->collider.elem.atDmgInfo.dmgFlags = DMG_DEKU_STICK; Matrix_MtxFToYXZRotS(&player->shieldMf, &sp4C, 0); this->actor.world.rot.y = sp4C.y + 0x8000; this->timer = 30; 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 57b51327e6f..64fb3894fce 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -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.colMaterial_Collider = COL_MATERIAL_METAL; + this->collider.base.colMaterial = COL_MATERIAL_METAL; } } @@ -309,7 +309,7 @@ s32 EnNy_CollisionCheck(EnNy* this, PlayState* play) { effectPos.y = this->collider.elements[0].base.acDmgInfo.hitPos.y; effectPos.z = this->collider.elements[0].base.acDmgInfo.hitPos.z; if ((this->unk_1E0 == 0.25f) && (this->unk_1D4 == 0xFF)) { - switch (this->actor.colChkInfo.damageEffect_CollisionCheckInfo) { + switch (this->actor.colChkInfo.damageEffect) { case 0xE: sp3F = 1; FALLTHROUGH; 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 97798f1b2a9..1ba428fa9e5 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -490,7 +490,7 @@ void EnOkuta_ProjectileFly(EnOkuta* this, PlayState* play) { this->collider.base.atFlags & AT_BOUNCED) { this->collider.base.atFlags &= ~(AT_HIT | AT_BOUNCED | AT_TYPE_ENEMY); this->collider.base.atFlags |= AT_TYPE_PLAYER; - this->collider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_DEKU_STICK; + this->collider.elem.atDmgInfo.dmgFlags = DMG_DEKU_STICK; Matrix_MtxFToYXZRotS(&player->shieldMf, &shieldRot, 0); this->actor.world.rot.y = shieldRot.y + 0x8000; this->timer = 30; @@ -556,11 +556,11 @@ void EnOkuta_ColliderCheck(EnOkuta* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem, true); - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { + if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { Enemy_StartFinishingBlow(play, &this->actor); this->actor.colChkInfo.health = 0; this->actor.flags &= ~ACTOR_FLAG_0; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 3) { + if (this->actor.colChkInfo.damageEffect == 3) { EnOkuta_SetupFreeze(this); } else { EnOkuta_SetupWaitToDie(this); 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 695f4267707..0b9fda4c07a 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -231,7 +231,7 @@ void EnPeehat_Init(Actor* thisx, PlayState* play) { this->colCylinder.dim.radius = 25; this->colCylinder.dim.height = 15; this->colCylinder.dim.yShift = -5; - this->colCylinder.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_ARROW | DMG_SLINGSHOT; + this->colCylinder.elem.acDmgInfo.dmgFlags = DMG_ARROW | DMG_SLINGSHOT; this->colQuad.base.atFlags = AT_ON | AT_TYPE_ENEMY; this->colQuad.base.acFlags = AC_ON | AC_TYPE_PLAYER; this->actor.naviEnemyId = NAVI_ENEMY_PEAHAT_LARVA; @@ -884,13 +884,13 @@ void EnPeehat_Adult_CollisionCheck(EnPeehat* this, PlayState* play) { } else if (this->colJntSph.base.acFlags & AC_HIT) { this->colJntSph.base.acFlags &= ~AC_HIT; Actor_SetDropFlagJntSph(&this->actor, &this->colJntSph, true); - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == PEAHAT_DMG_EFF_NUT || - this->actor.colChkInfo.damageEffect_CollisionCheckInfo == PEAHAT_DMG_EFF_LIGHT_ICE_ARROW) { + if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_NUT || + this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_LIGHT_ICE_ARROW) { return; } - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == PEAHAT_DMG_EFF_HOOKSHOT) { + if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_HOOKSHOT) { this->actor.colChkInfo.health = 0; - } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == PEAHAT_DMG_EFF_BOOMERANG) { + } else if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_BOOMERANG) { if (this->state != PEAHAT_STATE_STUNNED) { EnPeehat_SetStateBoomerangStunned(this); } @@ -901,7 +901,7 @@ void EnPeehat_Adult_CollisionCheck(EnPeehat* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_EN_PIHAT_DAMAGE); } - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == PEAHAT_DMG_EFF_FIRE) { + if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_FIRE) { Vec3f pos; s32 i; for (i = 4; i >= 0; i--) { @@ -931,7 +931,7 @@ void EnPeehat_Update(Actor* thisx, PlayState* play) { if (thisx->params <= 0) { EnPeehat_Adult_CollisionCheck(this, play); } - if (thisx->colChkInfo.damageEffect_CollisionCheckInfo != PEAHAT_DMG_EFF_LIGHT_ICE_ARROW) { + if (thisx->colChkInfo.damageEffect != PEAHAT_DMG_EFF_LIGHT_ICE_ARROW) { if (thisx->speed != 0.0f || thisx->velocity.y != 0.0f) { Actor_MoveXZGravity(thisx); Actor_UpdateBgCheckInfo(play, thisx, 25.0f, 30.0f, 30.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2); 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 3626a6925d2..e634b589fa0 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 @@ -263,7 +263,7 @@ void EnPoField_SetupFlee(EnPoField* this) { void EnPoField_SetupDamage(EnPoField* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gPoeFieldDamagedAnim, -6.0f); - if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_ARROW | DMG_SLINGSHOT)) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_ARROW | DMG_SLINGSHOT)) { this->actor.world.rot.y = this->collider.base.ac->world.rot.y; } else { this->actor.world.rot.y = Actor_WorldYawTowardActor(&this->actor, this->collider.base.ac) + 0x8000; @@ -724,7 +724,7 @@ void EnPoField_SoulInteract(EnPoField* this, PlayState* play) { void EnPoField_TestForDamage(EnPoField* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0 || this->actor.colChkInfo.damage_CollisionCheckInfo != 0) { + if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DEAD); 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 2e5d256bf22..44c8cec7633 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 @@ -209,8 +209,8 @@ void EnPoSisters_Init(Actor* thisx, PlayState* play) { func_80AD9AA8(this, play); } else { this->actor.flags &= ~(ACTOR_FLAG_9 | ACTOR_FLAG_14); - this->collider.elem.elemMaterial_ColliderElement = ELEM_MATERIAL_UNK4; - this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC |= DMG_DEKU_NUT; + 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); } @@ -265,7 +265,7 @@ void func_80AD943C(EnPoSisters* this) { void func_80AD944C(EnPoSisters* this) { if (this->unk_22E.a != 0) { - this->collider.base.colMaterial_Collider = COL_MATERIAL_METAL; + this->collider.base.colMaterial = COL_MATERIAL_METAL; this->collider.base.acFlags |= AC_HARD; } Animation_MorphToLoop(&this->skelAnime, &gPoeSistersAttackAnim, -5.0f); @@ -278,7 +278,7 @@ void func_80AD944C(EnPoSisters* this) { void func_80AD94E0(EnPoSisters* this) { this->actor.speed = 5.0f; if (this->unk_194 == 0) { - this->collider.base.colMaterial_Collider = COL_MATERIAL_METAL; + this->collider.base.colMaterial = COL_MATERIAL_METAL; this->collider.base.acFlags |= AC_HARD; Animation_MorphToLoop(&this->skelAnime, &gPoeSistersAttackAnim, -5.0f); } @@ -292,7 +292,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.colMaterial_Collider = COL_MATERIAL_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; this->collider.base.acFlags &= ~AC_HARD; } this->actionFunc = func_80ADA9E8; @@ -301,7 +301,7 @@ void func_80AD9568(EnPoSisters* this) { void func_80AD95D8(EnPoSisters* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gPoeSistersDamagedAnim, -3.0f); if (this->collider.base.ac != NULL) { - this->actor.world.rot.y = (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_ARROW | DMG_SLINGSHOT)) + this->actor.world.rot.y = (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_ARROW | DMG_SLINGSHOT)) ? this->collider.base.ac->world.rot.y : Actor_WorldYawTowardActor(&this->actor, this->collider.base.ac) + 0x8000; } @@ -429,7 +429,7 @@ void func_80AD9C24(EnPoSisters* this, PlayState* play) { this->actor.flags &= ~ACTOR_FLAG_0; this->unk_19C = 100; this->unk_199 = 32; - this->collider.base.colMaterial_Collider = COL_MATERIAL_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; this->collider.base.acFlags &= ~AC_HARD; if (play != NULL) { vec.x = this->actor.world.pos.x; @@ -671,7 +671,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.colMaterial_Collider = COL_MATERIAL_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; this->collider.base.acFlags &= ~AC_HARD; func_80AD93C4(this); } else { @@ -744,7 +744,7 @@ void func_80ADAD54(EnPoSisters* this, PlayState* play) { if (SkelAnime_Update(&this->skelAnime)) { this->unk_22E.a = 0; - this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_MAGIC_ICE | DMG_MAGIC_FIRE | DMG_DEKU_NUT; + this->collider.elem.acDmgInfo.dmgFlags = DMG_MAGIC_ICE | DMG_MAGIC_FIRE | DMG_DEKU_NUT; func_80AD93C4(this); } else { endFrame = this->skelAnime.endFrame; @@ -757,7 +757,7 @@ void func_80ADAE6C(EnPoSisters* this, PlayState* play) { this->unk_22E.a = 255; if (this->unk_194 != 0) { this->unk_199 |= 1; - this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = (DMG_SWORD | DMG_ARROW | DMG_HAMMER | DMG_MAGIC_ICE | + this->collider.elem.acDmgInfo.dmgFlags = (DMG_SWORD | DMG_ARROW | DMG_HAMMER | DMG_MAGIC_ICE | DMG_MAGIC_FIRE | DMG_HOOKSHOT | DMG_EXPLOSIVE | DMG_DEKU_STICK); if (this->unk_19A != 0) { this->unk_19A--; @@ -1145,16 +1145,16 @@ 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.colMaterial_Collider == COL_MATERIAL_METAL || - (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0 && this->actor.colChkInfo.damage_CollisionCheckInfo == 0)) { + } 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; } - } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0xF) { + } else if (this->actor.colChkInfo.damageEffect == 0xF) { this->actor.world.rot.y = this->actor.shape.rot.y; this->unk_199 |= 2; func_80AD98F4(this, play); - } else if (this->unk_194 == 0 && this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0xE && + } else if (this->unk_194 == 0 && this->actor.colChkInfo.damageEffect == 0xE && this->actionFunc == func_80ADB770) { if (this->unk_19C == 0) { this->unk_19C = -45; 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 6a1400f47f0..5b8f35b7c0f 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -293,7 +293,7 @@ void func_80ADE28C(EnPoh* this) { } else { Animation_PlayOnce(&this->skelAnime, &gPoeComposerDamagedAnim); } - if (this->colliderCyl.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_ARROW | DMG_SLINGSHOT)) { + if (this->colliderCyl.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_ARROW | DMG_SLINGSHOT)) { this->actor.world.rot.y = this->colliderCyl.base.ac->world.rot.y; } else { this->actor.world.rot.y = Actor_WorldYawTowardActor(&this->actor, this->colliderCyl.base.ac) + 0x8000; @@ -864,7 +864,7 @@ void EnPoh_TalkComposer(EnPoh* this, PlayState* play) { void func_80AE032C(EnPoh* this, PlayState* play) { if (this->colliderCyl.base.acFlags & AC_HIT) { this->colliderCyl.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0 || this->actor.colChkInfo.damage_CollisionCheckInfo != 0) { + if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DEAD); 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 4426d526431..fba8cf09ac8 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -800,7 +800,7 @@ void EnRd_UpdateDamage(EnRd* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; + this->damageEffect = this->actor.colChkInfo.damageEffect; if (this->action != REDEAD_ACTION_RISE_FROM_COFFIN) { Actor_SetDropFlag(&this->actor, &this->collider.elem, true); 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 bb9057ae5a5..e3d9cbab35a 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -132,8 +132,8 @@ 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.playerACHitReaction_ColliderElementDamageInfoAT = PLAYER_AC_HIT_REACTION_4; - this->collider.elem.atDmgInfo.damage_ColliderElementDamageInfoAT = 16; + 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); } @@ -537,7 +537,7 @@ void EnReeba_CheckDamage(EnReeba* this, PlayState* play) { this->actor.shape.rot.x = this->actor.shape.rot.z = 0; this->stunType = LEEVER_STUN_NONE; - switch (this->actor.colChkInfo.damageEffect_CollisionCheckInfo) { + switch (this->actor.colChkInfo.damageEffect) { case LEEVER_DMGEFF_UNUSED: case LEEVER_DMGEFF_BOOMERANG: if ((this->actor.colChkInfo.health > 1) && (this->stunType != LEEVER_STUN_OTHER)) { 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 521305772a9..3c194d210bb 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -428,13 +428,13 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) { u8 dropType = RR_DROP_RANDOM_RUPEE; this->collider1.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) { + if (this->actor.colChkInfo.damageEffect != 0) { hitPos.x = this->collider1.elem.acDmgInfo.hitPos.x; hitPos.y = this->collider1.elem.acDmgInfo.hitPos.y; hitPos.z = this->collider1.elem.acDmgInfo.hitPos.z; CollisionCheck_BlueBlood(play, NULL, &hitPos); } - switch (this->actor.colChkInfo.damageEffect_CollisionCheckInfo) { + switch (this->actor.colChkInfo.damageEffect) { case RR_DMG_LIGHT_ARROW: dropType++; // purple rupee FALLTHROUGH; @@ -450,8 +450,8 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) { case RR_DMG_NORMAL: // "ouch" PRINTF(VT_FGCOL(RED) "いてっ( %d : LIFE %d : DAMAGE %d : %x )！！" VT_RST "\n", this->frameCount, - this->actor.colChkInfo.health, this->actor.colChkInfo.damage_CollisionCheckInfo, - this->actor.colChkInfo.damageEffect_CollisionCheckInfo); + this->actor.colChkInfo.health, this->actor.colChkInfo.damage, + this->actor.colChkInfo.damageEffect); this->stopScroll = false; Actor_ApplyDamage(&this->actor); this->invincibilityTimer = 40; 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 acc4ad9227c..411c1ba31bd 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -382,7 +382,7 @@ s32 EnSb_UpdateDamage(EnSb* this, PlayState* play) { tookDamage = false; this->collider.base.acFlags &= ~AC_HIT; - switch (this->actor.colChkInfo.damageEffect_CollisionCheckInfo) { + switch (this->actor.colChkInfo.damageEffect) { case 14: // wind arrow hitByWindArrow = true; FALLTHROUGH; 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 ce72a68f893..c80080bc169 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -457,11 +457,11 @@ void EnSkb_CheckDamage(EnSkb* this, PlayState* play) { } else if (this->actionState >= SKB_BEHAVIOR_ATTACKING) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 6) { - this->lastDamageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; + if (this->actor.colChkInfo.damageEffect != 6) { + this->lastDamageEffect = this->actor.colChkInfo.damageEffect; Actor_SetDropFlag(&this->actor, &this->collider.elements[1].base, true); this->setColliderAT = false; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) { + if (this->actor.colChkInfo.damageEffect == 1) { if (this->actionState != SKB_BEHAVIOR_STUNNED) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); @@ -470,7 +470,7 @@ void EnSkb_CheckDamage(EnSkb* this, PlayState* play) { } } else { colorFilterDuration = 8; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 7) { + if (this->actor.colChkInfo.damageEffect == 7) { scale = this->actor.scale.y * 7500.0f; for (i = 4; i >= 0; i--) { flamePos = this->actor.world.pos; @@ -489,8 +489,8 @@ void EnSkb_CheckDamage(EnSkb* this, PlayState* play) { } player = GET_PLAYER(play); if (this->breakFlags == 0) { - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0xD) || - ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 0xE) && + if ((this->actor.colChkInfo.damageEffect == 0xD) || + ((this->actor.colChkInfo.damageEffect == 0xE) && ((player->meleeWeaponAnimation >= PLAYER_MWA_RIGHT_SLASH_1H && player->meleeWeaponAnimation <= PLAYER_MWA_LEFT_COMBO_2H) || (player->meleeWeaponAnimation == PLAYER_MWA_BACKSLASH_RIGHT || 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 117ef763b1d..75ada192bc5 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -583,7 +583,7 @@ s32 EnSkj_CollisionCheck(EnSkj* this, PlayState* play) { if (!((this->unk_2D3 == 0) || (D_80B01EA0 != 0) || !(this->collider.base.acFlags & AC_HIT))) { this->collider.base.acFlags &= ~AC_HIT; - switch (this->actor.colChkInfo.damageEffect_CollisionCheckInfo) { + switch (this->actor.colChkInfo.damageEffect) { case 0xF: effectPos.x = this->collider.elem.acDmgInfo.hitPos.x; effectPos.y = this->collider.elem.acDmgInfo.hitPos.y; 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 823f0d2c4d8..a5ff009cc99 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -200,15 +200,15 @@ void EnSsh_InitColliders(EnSsh* this, PlayState* play) { Collider_SetCylinder(play, &this->colCylinder[i], &this->actor, cylinders[i]); } - this->colCylinder[0].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = + this->colCylinder[0].elem.acDmgInfo.dmgFlags = DMG_ARROW | DMG_MAGIC_FIRE | DMG_HOOKSHOT | DMG_HAMMER_SWING | DMG_EXPLOSIVE | DMG_DEKU_NUT; - this->colCylinder[1].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = + 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.colMaterial_Collider = COL_MATERIAL_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.elemMaterial_ColliderElement = ELEM_MATERIAL_UNK2; - this->colCylinder[2].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = + 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); CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(2), &sColChkInfoInit); @@ -438,13 +438,13 @@ void EnSsh_CheckBodyStickHit(EnSsh* this, PlayState* play) { Player* player = GET_PLAYER(play); if (player->unk_860 != 0) { - elem->acDmgInfo.dmgFlags_ColliderElementDamageInfoAC |= DMG_DEKU_STICK; - this->colCylinder[1].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC &= ~DMG_DEKU_STICK; - this->colCylinder[2].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC &= ~DMG_DEKU_STICK; + elem->acDmgInfo.dmgFlags |= DMG_DEKU_STICK; + this->colCylinder[1].elem.acDmgInfo.dmgFlags &= ~DMG_DEKU_STICK; + this->colCylinder[2].elem.acDmgInfo.dmgFlags &= ~DMG_DEKU_STICK; } else { - elem->acDmgInfo.dmgFlags_ColliderElementDamageInfoAC &= ~DMG_DEKU_STICK; - this->colCylinder[1].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC |= DMG_DEKU_STICK; - this->colCylinder[2].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC |= DMG_DEKU_STICK; + elem->acDmgInfo.dmgFlags &= ~DMG_DEKU_STICK; + this->colCylinder[1].elem.acDmgInfo.dmgFlags |= DMG_DEKU_STICK; + this->colCylinder[2].elem.acDmgInfo.dmgFlags |= DMG_DEKU_STICK; } } 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 805bf5fda08..a832e421259 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -285,16 +285,16 @@ void EnSt_InitColliders(EnSt* this, PlayState* play) { Collider_SetCylinder(play, &this->colCylinder[i], &this->actor, cylinders[i]); } - this->colCylinder[0].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = + this->colCylinder[0].elem.acDmgInfo.dmgFlags = DMG_MAGIC_FIRE | DMG_ARROW | DMG_HOOKSHOT | DMG_HAMMER_SWING | DMG_BOOMERANG | DMG_EXPLOSIVE | DMG_DEKU_NUT; - this->colCylinder[1].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = + this->colCylinder[1].elem.acDmgInfo.dmgFlags = 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.colMaterial_Collider = COL_MATERIAL_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.elemMaterial_ColliderElement = ELEM_MATERIAL_UNK2; - this->colCylinder[2].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = + 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); @@ -309,13 +309,13 @@ void EnSt_CheckBodyStickHit(EnSt* this, PlayState* play) { Player* player = GET_PLAYER(play); if (player->unk_860 != 0) { - bodyElem->acDmgInfo.dmgFlags_ColliderElementDamageInfoAC |= DMG_DEKU_STICK; - this->colCylinder[1].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC &= ~DMG_DEKU_STICK; - this->colCylinder[2].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC &= ~DMG_DEKU_STICK; + bodyElem->acDmgInfo.dmgFlags |= DMG_DEKU_STICK; + this->colCylinder[1].elem.acDmgInfo.dmgFlags &= ~DMG_DEKU_STICK; + this->colCylinder[2].elem.acDmgInfo.dmgFlags &= ~DMG_DEKU_STICK; } else { - bodyElem->acDmgInfo.dmgFlags_ColliderElementDamageInfoAC &= ~DMG_DEKU_STICK; - this->colCylinder[1].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC |= DMG_DEKU_STICK; - this->colCylinder[2].elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC |= DMG_DEKU_STICK; + bodyElem->acDmgInfo.dmgFlags &= ~DMG_DEKU_STICK; + this->colCylinder[1].elem.acDmgInfo.dmgFlags |= DMG_DEKU_STICK; + this->colCylinder[2].elem.acDmgInfo.dmgFlags |= DMG_DEKU_STICK; } } @@ -431,14 +431,14 @@ s32 EnSt_CheckHitBackside(EnSt* this, PlayState* play) { if (cyl->base.acFlags & AC_HIT) { cyl->base.acFlags &= ~AC_HIT; hit = true; - flags |= cyl->elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT; + flags |= cyl->elem.acHitElem->atDmgInfo.dmgFlags; } cyl = &this->colCylinder[1]; if (cyl->base.acFlags & AC_HIT) { cyl->base.acFlags &= ~AC_HIT; hit = true; - flags |= cyl->elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT; + flags |= cyl->elem.acHitElem->atDmgInfo.dmgFlags; } if (!hit) { @@ -446,7 +446,7 @@ s32 EnSt_CheckHitBackside(EnSt* this, PlayState* play) { } this->invulnerableTimer = 8; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) { + if (this->actor.colChkInfo.damageEffect == 1) { if (this->stunTimer == 0) { Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); this->stunTimer = 120; 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 b7ba32f904c..3d462ecc8b9 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -283,7 +283,7 @@ void EnSw_Init(Actor* thisx, PlayState* play) { this->actor.scale.x = 0.0f; FALLTHROUGH; case 1: - this->collider.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT *= 2; + this->collider.elements[0].base.atDmgInfo.damage *= 2; this->actor.naviEnemyId = NAVI_ENEMY_GOLD_SKULLTULA; this->actor.colChkInfo.health *= 2; this->actor.flags &= ~ACTOR_FLAG_0; @@ -322,7 +322,7 @@ s32 func_80B0C9F0(EnSw* this, PlayState* play) { if (this->actor.xyzDistToPlayerSq < SQ(400.0f) && ((this->actor.params & 0xE000) >> 0xD) == 0 && play->actorCtx.unk_02 != 0) { - this->actor.colChkInfo.damage_CollisionCheckInfo = this->actor.colChkInfo.health; + this->actor.colChkInfo.damage = this->actor.colChkInfo.health; phi_v1 = true; } 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 63e7bee7c9c..224ce41eb16 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -899,7 +899,7 @@ void EnTest_SetupSlashDown(EnTest* this) { this->unk_7C8 = 0x10; this->actor.speed = 0.0f; EnTest_SetupAction(this, EnTest_SlashDown); - this->swordCollider.elem.atDmgInfo.damage_ColliderElementDamageInfoAT = 16; + this->swordCollider.elem.atDmgInfo.damage = 16; if (this->unk_7DE != 0) { this->unk_7DE = 3; @@ -996,7 +996,7 @@ void EnTest_SetupSlashUp(EnTest* this) { Animation_PlayOnce(&this->skelAnime, &gStalfosUpSlashAnim); this->swordCollider.base.atFlags &= ~AT_BOUNCED; this->unk_7C8 = 0x11; - this->swordCollider.elem.atDmgInfo.damage_ColliderElementDamageInfoAT = 16; + this->swordCollider.elem.atDmgInfo.damage = 16; this->actor.speed = 0.0f; EnTest_SetupAction(this, EnTest_SlashUp); @@ -1085,7 +1085,7 @@ void EnTest_SetupJumpslash(EnTest* this) { this->actor.world.rot.y = this->actor.shape.rot.y; this->swordCollider.base.atFlags &= ~AT_BOUNCED; EnTest_SetupAction(this, EnTest_Jumpslash); - this->swordCollider.elem.atDmgInfo.damage_ColliderElementDamageInfoAT = 32; + this->swordCollider.elem.atDmgInfo.damage = 32; if (this->unk_7DE != 0) { this->unk_7DE = 3; @@ -1663,9 +1663,9 @@ void EnTest_UpdateDamage(EnTest* this, PlayState* play) { } else if (this->bodyCollider.base.acFlags & AC_HIT) { this->bodyCollider.base.acFlags &= ~AC_HIT; - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != STALFOS_DMGEFF_SLING) && - (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != STALFOS_DMGEFF_FIREMAGIC)) { - this->lastDamageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; + if ((this->actor.colChkInfo.damageEffect != STALFOS_DMGEFF_SLING) && + (this->actor.colChkInfo.damageEffect != STALFOS_DMGEFF_FIREMAGIC)) { + this->lastDamageEffect = this->actor.colChkInfo.damageEffect; if (this->swordState >= 1) { this->swordState = 0; } @@ -1674,9 +1674,9 @@ void EnTest_UpdateDamage(EnTest* this, PlayState* play) { Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, false); Audio_StopSfxByPosAndId(&this->actor.projectedPos, NA_SE_EN_STAL_WARAU); - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == STALFOS_DMGEFF_STUN) || - (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == STALFOS_DMGEFF_FREEZE) || - (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == STALFOS_DMGEFF_LIGHT)) { + if ((this->actor.colChkInfo.damageEffect == STALFOS_DMGEFF_STUN) || + (this->actor.colChkInfo.damageEffect == STALFOS_DMGEFF_FREEZE) || + (this->actor.colChkInfo.damageEffect == STALFOS_DMGEFF_LIGHT)) { if (this->unk_7C8 != 0xB) { Actor_ApplyDamage(&this->actor); EnTest_SetupStunned(this); @@ -1708,7 +1708,7 @@ void EnTest_Update(Actor* thisx, PlayState* play) { EnTest_UpdateDamage(this, play); - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != STALFOS_DMGEFF_FIREMAGIC) { + if (this->actor.colChkInfo.damageEffect != STALFOS_DMGEFF_FIREMAGIC) { Actor_MoveXZGravity(&this->actor); Actor_UpdateBgCheckInfo(play, &this->actor, 75.0f, 30.0f, 30.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 | 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 ea7df190b9a..141abade581 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -850,11 +850,11 @@ void EnTite_CheckDamage(Actor* thisx, PlayState* play) { if ((this->collider.base.acFlags & AC_HIT) && (this->action >= TEKTITE_IDLE)) { this->collider.base.acFlags &= ~AC_HIT; - if (thisx->colChkInfo.damageEffect_CollisionCheckInfo != 0xE) { // Immune to fire magic - this->damageEffect = thisx->colChkInfo.damageEffect_CollisionCheckInfo; + if (thisx->colChkInfo.damageEffect != 0xE) { // Immune to fire magic + this->damageEffect = thisx->colChkInfo.damageEffect; Actor_SetDropFlag(thisx, &this->collider.elements[0].base, false); // Stun if Tektite hit by nut, boomerang, hookshot, ice arrow or ice magic - if ((thisx->colChkInfo.damageEffect_CollisionCheckInfo == 1) || (thisx->colChkInfo.damageEffect_CollisionCheckInfo == 0xF)) { + if ((thisx->colChkInfo.damageEffect == 1) || (thisx->colChkInfo.damageEffect == 0xF)) { if (this->action != TEKTITE_STUNNED) { Actor_SetColorFilter(thisx, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); Actor_ApplyDamage(thisx); @@ -900,7 +900,7 @@ void EnTite_Update(Actor* thisx, PlayState* play) { EnTite_CheckDamage(thisx, play); // Stay still if hit by immunity damage type this frame - if (thisx->colChkInfo.damageEffect_CollisionCheckInfo != 0xE) { + if (thisx->colChkInfo.damageEffect != 0xE) { this->actionFunc(this, play); Actor_MoveXZGravity(thisx); Actor_UpdateBgCheckInfo(play, thisx, 25.0f, 40.0f, 20.0f, this->unk_2DC); 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 d68d4159c29..163e400e957 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -103,8 +103,8 @@ 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.colMaterial_Collider = this->meleeWeaponQuads[1].base.colMaterial_Collider = COL_MATERIAL_METAL; - this->meleeWeaponQuads[0].elem.atDmgInfo.damage_ColliderElementDamageInfoAT = this->meleeWeaponQuads[1].elem.atDmgInfo.damage_ColliderElementDamageInfoAT = 8; + 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; this->shieldQuad.base.acFlags = AC_ON | AC_HARD | AC_TYPE_PLAYER; @@ -576,7 +576,7 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { this->unk_8A1 = 2; this->unk_8A4 = 6.0f; this->unk_8A8 = 6.0f; - this->unk_8A0 = this->actor.colChkInfo.damage_CollisionCheckInfo; + this->unk_8A0 = this->actor.colChkInfo.damage; this->unk_8A2 = this->actor.yawTowardsPlayer + 0x8000; sDeathFlag++; sActionState = ENTORCH2_DEATH; @@ -585,7 +585,7 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { this->stateFlags3 &= ~PLAYER_STATE3_2; } else { func_800F5ACC(NA_BGM_MINI_BOSS); - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) { + if (this->actor.colChkInfo.damageEffect == 1) { if (sAlpha == 255) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 80); } else { @@ -593,7 +593,7 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { } } else { this->actor.flags &= ~ACTOR_FLAG_0; - this->unk_8A0 = this->actor.colChkInfo.damage_CollisionCheckInfo; + this->unk_8A0 = this->actor.colChkInfo.damage; this->unk_8A1 = 1; this->unk_8A8 = 6.0f; this->unk_8A4 = 8.0f; @@ -609,7 +609,7 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { } } } - this->actor.colChkInfo.damage_CollisionCheckInfo = 0; + this->actor.colChkInfo.damage = 0; this->unk_8A0 = 0; } @@ -697,11 +697,11 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { sDodgeRollState = (this->invincibilityTimer > 0) ? 2 : 0; } if (this->invincibilityTimer != 0) { - this->cylinder.base.colMaterial_Collider = COL_MATERIAL_NONE; - this->cylinder.elem.elemMaterial_ColliderElement = ELEM_MATERIAL_UNK5; + this->cylinder.base.colMaterial = COL_MATERIAL_NONE; + this->cylinder.elem.elemMaterial = ELEM_MATERIAL_UNK5; } else { - this->cylinder.base.colMaterial_Collider = COL_MATERIAL_HIT5; - this->cylinder.elem.elemMaterial_ColliderElement = ELEM_MATERIAL_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_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c index 52300744d3f..9474e90f8d2 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -581,10 +581,10 @@ void EnTp_UpdateDamage(EnTp* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlagJntSph(&this->actor, &this->collider, true); - this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; + this->damageEffect = this->actor.colChkInfo.damageEffect; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != TAILPASARAN_DMGEFF_NONE) { - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == TAILPASARAN_DMGEFF_DEKUNUT) { + if (this->actor.colChkInfo.damageEffect != TAILPASARAN_DMGEFF_NONE) { + if (this->actor.colChkInfo.damageEffect == TAILPASARAN_DMGEFF_DEKUNUT) { phi_s4 = 1; } @@ -599,7 +599,7 @@ void EnTp_UpdateDamage(EnTp* this, PlayState* play) { if (head->actor.params <= TAILPASARAN_HEAD) { EnTp_SetupDie(head); - head->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; + head->damageEffect = this->actor.colChkInfo.damageEffect; head->actor.params = TAILPASARAN_HEAD_DYING; } } else { 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 4eea536b39c..0d2cdbfe5e7 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -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.playerATHitReaction_ColliderElementDamageInfoAC = PLAYER_AT_HIT_REACTION_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.playerATHitReaction_ColliderElementDamageInfoAC = PLAYER_AT_HIT_REACTION_1; // Shock? + this->bodyCollider.elem.acDmgInfo.playerATHitReaction = PLAYER_AT_HIT_REACTION_1; // Shock? EnVali_SetupFloatIdle(this); } } @@ -498,21 +498,21 @@ void EnVali_UpdateDamage(EnVali* this, PlayState* play) { this->bodyCollider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, true); - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != BARI_DMGEFF_NONE) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { + if ((this->actor.colChkInfo.damageEffect != BARI_DMGEFF_NONE) || (this->actor.colChkInfo.damage != 0)) { if (Actor_ApplyDamage(&this->actor) == 0) { Actor_PlaySfx(&this->actor, NA_SE_EN_BARI_DEAD); Enemy_StartFinishingBlow(play, &this->actor); this->actor.flags &= ~ACTOR_FLAG_0; - } else if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != BARI_DMGEFF_STUN) && - (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != BARI_DMGEFF_SLINGSHOT)) { + } else if ((this->actor.colChkInfo.damageEffect != BARI_DMGEFF_STUN) && + (this->actor.colChkInfo.damageEffect != BARI_DMGEFF_SLINGSHOT)) { Actor_PlaySfx(&this->actor, NA_SE_EN_BARI_DAMAGE); } - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == BARI_DMGEFF_STUN) { + if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_STUN) { if (this->actionFunc != EnVali_Stunned) { EnVali_SetupStunned(this); } - } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == BARI_DMGEFF_SWORD) { + } else if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_SWORD) { if (this->actionFunc != EnVali_Stunned) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 150, COLORFILTER_BUFFLAG_XLU, 30); this->actor.params = BARI_TYPE_SWORD_DAMAGE; @@ -520,11 +520,11 @@ void EnVali_UpdateDamage(EnVali* this, PlayState* play) { } else { EnVali_SetupRetaliate(this); } - } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == BARI_DMGEFF_FIRE) { + } else if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_FIRE) { EnVali_SetupBurnt(this); - } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == BARI_DMGEFF_ICE) { + } else if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_ICE) { EnVali_SetupFrozen(this); - } else if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == BARI_DMGEFF_SLINGSHOT) { + } else if (this->actor.colChkInfo.damageEffect == BARI_DMGEFF_SLINGSHOT) { if (this->slingshotReactionTimer == 0) { this->slingshotReactionTimer = 20; } 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 f796dc1fcf8..57eb73ec17b 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -219,7 +219,7 @@ void EnWallmas_SetupReturnToCeiling(EnWallmas* this) { void EnWallmas_SetupTakeDamage(EnWallmas* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gWallmasterDamageAnim, -3.0f); - if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & (DMG_ARROW | DMG_SLINGSHOT)) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_ARROW | DMG_SLINGSHOT)) { this->actor.world.rot.y = this->collider.base.ac->world.rot.y; } else { this->actor.world.rot.y = Actor_WorldYawTowardActor(&this->actor, this->collider.base.ac) + 0x8000; @@ -278,7 +278,7 @@ void EnWallmas_SetupStun(EnWallmas* this) { Animation_Change(&this->skelAnime, &gWallmasterJumpAnim, 1.5f, 0, 20.0f, ANIMMODE_ONCE, -3.0f); this->actor.speed = 0.0f; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 4) { + if (this->actor.colChkInfo.damageEffect == 4) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 255, COLORFILTER_BUFFLAG_OPA, 80); } else { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 80); @@ -508,24 +508,24 @@ void EnWallmas_ColUpdate(EnWallmas* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem, true); - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { + if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_DEAD); this->actor.flags &= ~ACTOR_FLAG_0; } else { - if (this->actor.colChkInfo.damage_CollisionCheckInfo != 0) { + if (this->actor.colChkInfo.damage != 0) { Actor_PlaySfx(&this->actor, NA_SE_EN_FALL_DAMAGE); } } - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DAMAGE_EFFECT_STUN_WHITE) || - (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DAMAGE_EFFECT_STUN_BLUE)) { + if ((this->actor.colChkInfo.damageEffect == DAMAGE_EFFECT_STUN_WHITE) || + (this->actor.colChkInfo.damageEffect == DAMAGE_EFFECT_STUN_BLUE)) { if (this->actionFunc != EnWallmas_Stun) { EnWallmas_SetupStun(this); } } else { - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == DAMAGE_EFFECT_BURN) { + if (this->actor.colChkInfo.damageEffect == DAMAGE_EFFECT_BURN) { EffectSsFCircle_Spawn(play, &this->actor, &this->actor.world.pos, 40, 40); } 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 a43d2169ded..1aeaeb5f28b 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -563,8 +563,8 @@ void func_80B3368C(EnWeiyer* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem, true); - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo != 0) || (this->actor.colChkInfo.damage_CollisionCheckInfo != 0)) { - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == 1) { + if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { + if (this->actor.colChkInfo.damageEffect == 1) { if (this->actionFunc != func_80B333B8) { func_80B32660(this); } 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 346a74e0544..a22cbd1bd3c 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -241,8 +241,8 @@ void EnWf_Init(Actor* thisx, PlayState* play) { SkelAnime_InitFlex(play, &this->skelAnime, &gWolfosWhiteSkel, &gWolfosWaitingAnim, this->jointTable, this->morphTable, WOLFOS_LIMB_MAX); Actor_SetScale(thisx, 0.01f); - this->colliderSpheres.elements[0].base.atDmgInfo.damage_ColliderElementDamageInfoAT = - this->colliderSpheres.elements[1].base.atDmgInfo.damage_ColliderElementDamageInfoAT = 8; + this->colliderSpheres.elements[0].base.atDmgInfo.damage = + this->colliderSpheres.elements[1].base.atDmgInfo.damage = 8; thisx->naviEnemyId = NAVI_ENEMY_WHITE_WOLFOS; } @@ -1258,19 +1258,19 @@ void EnWf_UpdateDamage(EnWf* this, PlayState* play) { if ((!(this->colliderCylinderBody.base.acFlags & AC_HIT) && (this->colliderCylinderTail.base.acFlags & AC_HIT)) || (ABS(yawDiff) > 19000)) { - this->actor.colChkInfo.damage_CollisionCheckInfo *= 4; + this->actor.colChkInfo.damage *= 4; } this->colliderCylinderBody.base.acFlags &= ~AC_HIT; this->colliderCylinderTail.base.acFlags &= ~AC_HIT; - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != ENWF_DMGEFF_ICE_MAGIC) { - this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; + if (this->actor.colChkInfo.damageEffect != ENWF_DMGEFF_ICE_MAGIC) { + this->damageEffect = this->actor.colChkInfo.damageEffect; Actor_SetDropFlag(&this->actor, &this->colliderCylinderBody.elem, true); this->slashStatus = 0; - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == ENWF_DMGEFF_STUN) || - (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == ENWF_DMGEFF_UNDEF)) { + if ((this->actor.colChkInfo.damageEffect == ENWF_DMGEFF_STUN) || + (this->actor.colChkInfo.damageEffect == ENWF_DMGEFF_UNDEF)) { if (this->action != WOLFOS_ACTION_STUNNED) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); @@ -1302,7 +1302,7 @@ void EnWf_Update(Actor* thisx, PlayState* play) { EnWf_UpdateDamage(this, play); - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != ENWF_DMGEFF_ICE_MAGIC) { + if (this->actor.colChkInfo.damageEffect != ENWF_DMGEFF_ICE_MAGIC) { Actor_MoveXZGravity(&this->actor); Actor_UpdateBgCheckInfo(play, &this->actor, 32.0f, 30.0f, 60.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 | 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 3de79caa952..c74a6c610c4 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 @@ -159,7 +159,7 @@ void EnWonderItem_Init(Actor* thisx, PlayState* play) { colTypeIndex = this->actor.world.rot.z & 0xFF; Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); - this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = damageFlags[colTypeIndex]; + this->collider.elem.acDmgInfo.dmgFlags = damageFlags[colTypeIndex]; this->collider.dim.radius = 20; this->collider.dim.height = 30; this->updateFunc = EnWonderItem_InteractSwitch; @@ -188,7 +188,7 @@ void EnWonderItem_Init(Actor* thisx, PlayState* play) { case WONDERITEM_BOMB_SOLDIER: Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); - this->collider.elem.acDmgInfo.dmgFlags_ColliderElementDamageInfoAC = DMG_SLINGSHOT; + this->collider.elem.acDmgInfo.dmgFlags = DMG_SLINGSHOT; this->unkPos = this->actor.world.pos; this->collider.dim.radius = 35; this->collider.dim.height = 75; 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 1aad9fafb0f..705e3da2566 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -2009,12 +2009,12 @@ void EnZf_UpdateDamage(EnZf* this, PlayState* play) { if (((this->actor.params < ENZF_TYPE_LIZALFOS_MINIBOSS_A) /* not miniboss */ || (D_80B4A1B4 != this->actor.params)) && - (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != ENZF_DMGEFF_IMMUNE)) { - this->damageEffect = this->actor.colChkInfo.damageEffect_CollisionCheckInfo; + (this->actor.colChkInfo.damageEffect != ENZF_DMGEFF_IMMUNE)) { + this->damageEffect = this->actor.colChkInfo.damageEffect; Actor_SetDropFlag(&this->actor, &this->bodyCollider.elem, false); - if ((this->actor.colChkInfo.damageEffect_CollisionCheckInfo == ENZF_DMGEFF_STUN) || - (this->actor.colChkInfo.damageEffect_CollisionCheckInfo == ENZF_DMGEFF_ICE)) { + if ((this->actor.colChkInfo.damageEffect == ENZF_DMGEFF_STUN) || + (this->actor.colChkInfo.damageEffect == ENZF_DMGEFF_ICE)) { if (this->action != ENZF_ACTION_STUNNED) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80); Actor_ApplyDamage(&this->actor); @@ -2035,7 +2035,7 @@ void EnZf_UpdateDamage(EnZf* this, PlayState* play) { Item_DropCollectibleRandom(play, &this->actor, &this->actor.world.pos, dropParams); Enemy_StartFinishingBlow(play, &this->actor); } else { - if ((D_80B4A1B4 != -1) && ((this->actor.colChkInfo.health + this->actor.colChkInfo.damage_CollisionCheckInfo) >= 4) && + if ((D_80B4A1B4 != -1) && ((this->actor.colChkInfo.health + this->actor.colChkInfo.damage) >= 4) && (this->actor.colChkInfo.health < 4)) { this->damageEffect = ENZF_DMGEFF_PROJECTILE; } @@ -2053,7 +2053,7 @@ void EnZf_Update(Actor* thisx, PlayState* play) { s32 pad2; EnZf_UpdateDamage(this, play); - if (this->actor.colChkInfo.damageEffect_CollisionCheckInfo != ENZF_DMGEFF_IMMUNE) { + if (this->actor.colChkInfo.damageEffect != ENZF_DMGEFF_IMMUNE) { this->unk_3F8 = false; if ((this->hopAnimIndex != 1) && (this->action != ENZF_ACTION_HOP_AWAY)) { if (this->actor.speed != 0.0f) { 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 1dc4ca9f10e..cb7ad9b0da3 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -133,9 +133,9 @@ void MagicFire_Update(Actor* thisx, PlayState* play) { } if (this->action == DF_ACTION_EXPAND_SLOWLY) { - this->collider.elem.atDmgInfo.damage_ColliderElementDamageInfoAT = this->actionTimer + 25; + this->collider.elem.atDmgInfo.damage = this->actionTimer + 25; } else if (this->action == DF_ACTION_STOP_EXPANDING) { - this->collider.elem.atDmgInfo.damage_ColliderElementDamageInfoAT = this->actionTimer; + this->collider.elem.atDmgInfo.damage = this->actionTimer; } Collider_UpdateCylinder(&this->actor, &this->collider); this->collider.dim.radius = (this->actor.scale.x * 325.0f); 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 c28681e994f..2d89c3755a2 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -125,7 +125,7 @@ void ObjBombiwa_Update(Actor* thisx, PlayState* play) { s32 pad; if ((func_80033684(play, &this->actor) != NULL) || - ((this->collider.base.acFlags & AC_HIT) && (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HAMMER))) { + ((this->collider.base.acFlags & AC_HIT) && (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_HAMMER))) { ObjBombiwa_Break(this, play); Flags_SetSwitch(play, this->actor.params & 0x3F); SfxSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 80, NA_SE_EV_WALL_BROKEN); 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 c645d67f57b..23c5406381e 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -176,7 +176,7 @@ void ObjComb_Wait(ObjComb* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - dmgFlags = this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT; + dmgFlags = this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags; if (dmgFlags & (DMG_HAMMER | DMG_ARROW | DMG_SLINGSHOT | DMG_DEKU_STICK)) { this->unk_1B0 = 1500; } else { 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 6630799f59a..544ccec7559 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -170,7 +170,7 @@ void ObjHamishi_Update(Actor* thisx, PlayState* play) { ObjHamishi_Shake(this); - if ((this->collider.base.acFlags & AC_HIT) && (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & DMG_HAMMER)) { + if ((this->collider.base.acFlags & AC_HIT) && (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_HAMMER)) { this->collider.base.acFlags &= ~AC_HIT; this->hitCount++; if (this->hitCount < 2) { 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 86ac92c4d7b..a12a3768042 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 @@ -117,7 +117,7 @@ void ObjIcePoly_Idle(ObjIcePoly* this, PlayState* play) { Vec3f pos; if (this->colliderIce.base.acFlags & AC_HIT) { - this->meltTimer = -this->colliderIce.elem.acHitElem->atDmgInfo.damage_ColliderElementDamageInfoAT; + this->meltTimer = -this->colliderIce.elem.acHitElem->atDmgInfo.damage; this->actor.focus.rot.y = this->actor.yawTowardsPlayer; OnePointCutscene_Init(play, 5120, 40, &this->actor, CAM_ID_MAIN); this->actionFunc = ObjIcePoly_Melt; 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 8071dcdd3e0..91ed096b49b 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -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.colMaterial_Collider = sColTypesStand[this->actor.params >> 0xC]; + this->colliderStand.base.colMaterial = sColTypesStand[this->actor.params >> 0xC]; Collider_InitCylinder(play, &this->colliderFlame); Collider_SetCylinder(play, &this->colliderFlame, &this->actor, &sCylInitFlame); @@ -171,7 +171,7 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) { } } if (this->colliderFlame.base.acFlags & AC_HIT) { - dmgFlags = this->colliderFlame.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT; + dmgFlags = this->colliderFlame.elem.acHitElem->atDmgInfo.dmgFlags; if (dmgFlags & (DMG_FIRE | DMG_ARROW_NORMAL)) { interactionType = 1; } @@ -197,7 +197,7 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) { arrow = (EnArrow*)this->colliderFlame.base.ac; if ((arrow->actor.update != NULL) && (arrow->actor.id == ACTOR_EN_ARROW)) { arrow->actor.params = 0; - arrow->collider.elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = DMG_ARROW_FIRE; + arrow->collider.elem.atDmgInfo.dmgFlags = DMG_ARROW_FIRE; } } if ((0 <= this->litTimer) && (this->litTimer < (50 * litTimeScale + 100)) && (torchType != 0)) { 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 cddd21e8735..2d3e7cc476f 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -246,7 +246,7 @@ void ObjTsubo_Idle(ObjTsubo* this, PlayState* play) { ObjTsubo_SpawnCollectible(this, play); Actor_Kill(&this->actor); } else if ((this->collider.base.acFlags & AC_HIT) && - (this->collider.elem.acHitElem->atDmgInfo.dmgFlags_ColliderElementDamageInfoAT & + (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & (DMG_SWORD | DMG_RANGED | DMG_HAMMER | DMG_BOOMERANG | DMG_EXPLOSIVE))) { ObjTsubo_AirBreak(this, play); ObjTsubo_SpawnCollectible(this, play); diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 4b8c980d378..c3637193550 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -4007,7 +4007,7 @@ s32 func_80837818(Player* this) { } void func_80837918(Player* this, s32 quadIndex, u32 dmgFlags) { - this->meleeWeaponQuads[quadIndex].elem.atDmgInfo.dmgFlags_ColliderElementDamageInfoAT = dmgFlags; + this->meleeWeaponQuads[quadIndex].elem.atDmgInfo.dmgFlags = dmgFlags; if (dmgFlags == DMG_DEKU_STICK) { this->meleeWeaponQuads[quadIndex].elem.atElemFlags = ATELEM_ON | ATELEM_NEAREST | ATELEM_SFX_WOOD; @@ -4120,7 +4120,7 @@ void func_80837C0C(PlayState* play, Player* this, s32 arg2, f32 arg3, f32 arg4, Player_PlaySfx(this, NA_SE_PL_DAMAGE); - if (!func_80837B18(play, this, 0 - this->actor.colChkInfo.damage_CollisionCheckInfo)) { + if (!func_80837B18(play, this, 0 - this->actor.colChkInfo.damage)) { this->stateFlags2 &= ~PLAYER_STATE2_7; if (!(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) && !(this->stateFlags1 & PLAYER_STATE1_27)) { func_80837B9C(this, play); @@ -4212,7 +4212,7 @@ void func_80837C0C(PlayState* play, Player* this, s32 arg2, f32 arg3, f32 arg4, Player_SetupAction(play, this, Player_Action_8084370C, 0); func_80833C3C(this); - if (this->actor.colChkInfo.damage_CollisionCheckInfo < 5) { + if (this->actor.colChkInfo.damage < 5) { Player_RequestRumble(this, 120, 20, 10, 0); } else { Player_RequestRumble(this, 180, 20, 100, 0); @@ -4284,7 +4284,7 @@ void func_8083821C(Player* this) { } void func_80838280(Player* this) { - if (this->actor.colChkInfo.playerACHitReaction_CollisionCheckInfo == PLAYER_AC_HIT_REACTION_1) { + if (this->actor.colChkInfo.playerACHitReaction == PLAYER_AC_HIT_REACTION_1) { func_8083821C(this); } func_80832698(this, NA_SE_VO_LI_FALL_L); @@ -4351,7 +4351,7 @@ s32 func_808382DC(Player* this, PlayState* play) { this->bodyShockTimer = 40; } - this->actor.colChkInfo.damage_CollisionCheckInfo += this->unk_8A0; + this->actor.colChkInfo.damage += this->unk_8A0; func_80837C0C(play, this, sp5C[this->unk_8A1 - 1], this->unk_8A4, this->unk_8A8, this->unk_8A2, 20); } else { sp64 = (this->shieldQuad.base.acFlags & AC_BOUNCED) != 0; @@ -4394,7 +4394,7 @@ s32 func_808382DC(Player* this, PlayState* play) { } } - if (sp64 && (this->shieldQuad.elem.acHitElem->atDmgInfo.playerACHitReaction_ColliderElementDamageInfoAT == 1)) { + if (sp64 && (this->shieldQuad.elem.acHitElem->atDmgInfo.playerACHitReaction == 1)) { func_8083819C(this, play); } @@ -4417,11 +4417,11 @@ s32 func_808382DC(Player* this, PlayState* play) { if (this->stateFlags1 & PLAYER_STATE1_27) { sp4C = 0; - } else if (this->actor.colChkInfo.playerACHitReaction_CollisionCheckInfo == PLAYER_AC_HIT_REACTION_2) { + } else if (this->actor.colChkInfo.playerACHitReaction == PLAYER_AC_HIT_REACTION_2) { sp4C = 3; - } else if (this->actor.colChkInfo.playerACHitReaction_CollisionCheckInfo == PLAYER_AC_HIT_REACTION_3) { + } else if (this->actor.colChkInfo.playerACHitReaction == PLAYER_AC_HIT_REACTION_3) { sp4C = 4; - } else if (this->actor.colChkInfo.playerACHitReaction_CollisionCheckInfo == PLAYER_AC_HIT_REACTION_4) { + } else if (this->actor.colChkInfo.playerACHitReaction == PLAYER_AC_HIT_REACTION_4) { sp4C = 1; } else { func_80838280(this); @@ -4442,7 +4442,7 @@ s32 func_808382DC(Player* this, PlayState* play) { ((sp48 >= 0) && ((this->currentTunic != PLAYER_TUNIC_GORON) || (this->floorTypeTimer >= D_808544F4[sp48])))) { this->floorTypeTimer = 0; - this->actor.colChkInfo.damage_CollisionCheckInfo = 4; + this->actor.colChkInfo.damage = 4; func_80837C0C(play, this, 0, 4.0f, 5.0f, this->actor.shape.rot.y, 20); } else { return 0; @@ -8466,8 +8466,8 @@ 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.playerATHitReaction_CollisionCheckInfo == PLAYER_AT_HIT_REACTION_1) { - this->actor.colChkInfo.damage_CollisionCheckInfo = 8; + 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; } @@ -9072,7 +9072,7 @@ void Player_Action_80844A44(Player* this, PlayState* play) { Math_StepToF(&this->speedXZ, 0.0f, 0.05f); if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { - this->actor.colChkInfo.damage_CollisionCheckInfo = 0x10; + this->actor.colChkInfo.damage = 0x10; func_80837C0C(play, this, 1, 4.0f, 5.0f, this->actor.shape.rot.y, 20); } } @@ -13100,7 +13100,7 @@ void Player_Action_8084E6D4(Player* this, PlayState* play) { this->actor.world.pos.y + 100.0f, this->actor.world.pos.z, 0, 0, 0, 0); func_8083C0E8(this, play); } else { - this->actor.colChkInfo.damage_CollisionCheckInfo = 0; + this->actor.colChkInfo.damage = 0; func_80837C0C(play, this, 3, 0.0f, 0.0f, 0, 20); } return; diff --git a/tools/namefixer.py b/tools/namefixer.py index 8603429c847..8349032befb 100755 --- a/tools/namefixer.py +++ b/tools/namefixer.py @@ -216,7 +216,7 @@ "bumper.flags":"bumper.dmgFlags", "maskA ":"ocFlags1 ", "maskB ":"ocFlags2 ", - ".base.type":".base.colMaterial_Collider", + ".base.type":".base.colMaterial", "COL_MATERIAL_UNK11":"COL_MATERIAL_HARD", "COL_MATERIAL_UNK12":"COL_MATERIAL_WOOD", "COL_MATERIAL_UNK13":"COL_MATERIAL_TREE", From 0cf935b6db88715fbe8ac87dfe8f7ccb030d7dbf Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 16 Mar 2024 02:15:46 +0100 Subject: [PATCH 06/12] format --- src/code/z_collision_check.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 081dc46433b..5ce92ce1be1 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -182,11 +182,16 @@ s32 Collider_SetElementDamageInfoAC(PlayState* play, ColliderElementDamageInfoAC s32 Collider_InitElement(PlayState* play, ColliderElement* elem) { static ColliderElement init = { - { 0, 0, 0 }, { 0xFFCFFFFF, 0, 0, { 0, 0, 0 } }, - ELEM_MATERIAL_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; @@ -1386,8 +1391,7 @@ s32 CollisionCheck_IsElementNotAC(ColliderElement* elem) { * If the AT element has no dmgFlags in common with the AC element, no collision happens. */ s32 CollisionCheck_NoSharedFlags(ColliderElement* atElem, ColliderElement* acElem) { - if (!(atElem->atDmgInfo.dmgFlags & - acElem->acDmgInfo.dmgFlags)) { + if (!(atElem->atDmgInfo.dmgFlags & acElem->acDmgInfo.dmgFlags)) { return true; } return false; From 65b4c9b4de6f2c6b5a46cb786a037d80ac415e66 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Thu, 1 Aug 2024 20:09:59 +0200 Subject: [PATCH 07/12] fix bss --- src/overlays/actors/ovl_Fishing/z_fishing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index bd622b8a478..e10ec054382 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -12,7 +12,7 @@ #include "terminal.h" // For retail BSS ordering, the block number of sStreamSfxProjectedPos must be 0. -#pragma increment_block_number 206 +#pragma increment_block_number 202 #define FLAGS ACTOR_FLAG_4 From 110a8a1301368139d2583651f2e940f6d1558b62 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sun, 11 Aug 2024 16:54:37 +0200 Subject: [PATCH 08/12] fix bss --- src/code/z_player_lib.c | 2 ++ src/overlays/actors/ovl_Fishing/z_fishing.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index e712b315883..6b79b6600fc 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -3,6 +3,8 @@ #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-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" + typedef struct { /* 0x00 */ Gfx* dList; /* 0x04 */ Vec3f pos; diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 064fcb28590..8562ad4bcb0 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -11,7 +11,7 @@ #include "ichain.h" #include "terminal.h" -#pragma increment_block_number "gc-eu:205 gc-eu-mq:205 gc-jp:207 gc-jp-ce:207 gc-jp-mq:207 gc-us:207 gc-us-mq:207" +#pragma increment_block_number "gc-eu:201 gc-eu-mq:201 gc-jp:203 gc-jp-ce:203 gc-jp-mq:203 gc-us:203 gc-us-mq:203" #define FLAGS ACTOR_FLAG_4 From 24d1cf36bb787a18b75ed25263b6e1899add9b36 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Wed, 21 Aug 2024 16:52:07 +0200 Subject: [PATCH 09/12] bss --- src/code/graph.c | 2 +- src/code/sys_cfb.c | 2 +- src/code/sys_matrix.c | 2 +- src/code/z_collision_check.c | 2 +- src/code/z_skin.c | 2 +- src/overlays/actors/ovl_Fishing/z_fishing.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/code/graph.c b/src/code/graph.c index 70e72881537..af98cdae6d0 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -4,7 +4,7 @@ #define GFXPOOL_HEAD_MAGIC 0x1234 #define GFXPOOL_TAIL_MAGIC 0x5678 -#pragma increment_block_number "gc-eu-mq:128" +#pragma increment_block_number "gc-eu:128 gc-eu-mq:128" /** * The time at which the previous `Graph_Update` ended. diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c index 8a54583be53..0529695c7da 100644 --- a/src/code/sys_cfb.c +++ b/src/code/sys_cfb.c @@ -1,6 +1,6 @@ #include "global.h" -#pragma increment_block_number "gc-eu-mq:128" +#pragma increment_block_number "gc-eu:128 gc-eu-mq:128" uintptr_t sSysCfbFbPtr[2]; uintptr_t sSysCfbEnd; diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index 0319a48f102..550b39e4e74 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -16,7 +16,7 @@ MtxF gMtxFClear = { }; // clang-format on -#pragma increment_block_number "gc-eu-mq:128" +#pragma increment_block_number "gc-eu:128 gc-eu-mq:128" MtxF* sMatrixStack; // "Matrix_stack" MtxF* sCurrentMatrix; // "Matrix_now" diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 4961aa3625d..a05d0672b46 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -12,7 +12,7 @@ typedef s32 (*ColChkLineFunc)(PlayState*, CollisionCheckContext*, Collider*, Vec #define SAC_ENABLE (1 << 0) -#pragma increment_block_number "gc-eu:64 gc-eu-mq:0 gc-jp:64 gc-jp-ce:64 gc-jp-mq:64 gc-us:64 gc-us-mq:64" +#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:64 gc-jp-ce:64 gc-jp-mq:64 gc-us:64 gc-us-mq:64" #if OOT_DEBUG /** diff --git a/src/code/z_skin.c b/src/code/z_skin.c index bc58abc88fc..ab3b8624a43 100644 --- a/src/code/z_skin.c +++ b/src/code/z_skin.c @@ -1,6 +1,6 @@ #include "global.h" -#pragma increment_block_number "gc-eu-mq:128" +#pragma increment_block_number "gc-eu:128 gc-eu-mq:128" MtxF gSkinLimbMatrices[60]; // holds matrices for each limb of the skeleton currently being drawn diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 139d5172791..685048ec189 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -14,7 +14,7 @@ #include "cic6105.h" #endif -#pragma increment_block_number "gc-eu:167 gc-eu-mq:165 gc-jp:167 gc-jp-ce:167 gc-jp-mq:167 gc-us:167 gc-us-mq:167" +#pragma increment_block_number "gc-eu:165 gc-eu-mq:165 gc-jp:167 gc-jp-ce:167 gc-jp-mq:167 gc-us:167 gc-us-mq:167" #define FLAGS ACTOR_FLAG_4 From 0546db8651f43ddd3eef858545047def022268a8 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sun, 25 Aug 2024 17:57:10 +0200 Subject: [PATCH 10/12] bss --- src/boot/z_std_dma.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index c2752c1dc91..c331ea0c83d 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -26,8 +26,6 @@ #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:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" - StackEntry sDmaMgrStackInfo; OSMesgQueue sDmaMgrMsgQueue; OSMesg sDmaMgrMsgBuf[32]; From eb38f4b29579815c982eba59d682eff22fbc46c7 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Wed, 11 Sep 2024 11:36:24 +0200 Subject: [PATCH 11/12] bss --- src/code/fault_gc.c | 2 +- src/code/z_kankyo.c | 4 ++-- src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c | 2 ++ src/overlays/actors/ovl_En_Xc/z_en_xc.c | 2 +- src/overlays/actors/ovl_Fishing/z_fishing.c | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) 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_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/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 c3c9252c946..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) 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 b2dec7f241b..591c6776489 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -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_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index b7d5e1e5da2..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 From 421d9dffbfd71521762b7eb6feb024fc77a7a83e Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Wed, 11 Sep 2024 11:56:11 +0200 Subject: [PATCH 12/12] bss --- src/code/z_common_data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;