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 5029801380..90234e26ba 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -127,14 +127,14 @@ static ColliderQuadInit sQuadInit = { { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; -typedef enum ArmosDamageEffect { +typedef enum ArmosDamageReaction { /* 0 */ AM_DMGREAC_NONE, // used by anything that can't kill the armos /* 1 */ AM_DMGREAC_NUT, /* 6 */ AM_DMGREAC_STUN = 6, // doesn't include deku nuts /* 13 */ AM_DMGREAC_ICE = 13, /* 14 */ AM_DMGREAC_MAGIC_FIRE_LIGHT, /* 15 */ AM_DMGREAC_KILL // any damage source that can kill the armos (and isn't a special case) -} ArmosDamageEffect; +} ArmosDamageReaction; static DamageTable sDamageTable = { /* Deku nut */ DMG_ENTRY(0, AM_DMGREAC_NUT), 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 bf21e44c35..61c3569106 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -73,11 +73,11 @@ static ColliderCylinderInit sCylinderInit = { { 29, 103, 0, { 0, 0, 0 } }, }; -typedef enum AnubiceDamageEffect { +typedef enum AnubiceDamageReaction { /* 0x0 */ ANUBICE_DMGREAC_NONE, /* 0x2 */ ANUBICE_DMGREAC_FIRE = 2, /* 0xF */ ANUBICE_DMGREAC_0xF = 0xF // Treated the same as ANUBICE_DMGREAC_NONE in code -} AnubiceDamageEffect; +} AnubiceDamageReaction; static DamageTable sDamageTable[] = { /* Deku nut */ DMG_ENTRY(0, ANUBICE_DMGREAC_NONE), 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 efc0e0a89e..cc3a751345 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -78,14 +78,14 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit2 sColChkInfoInit = { 1, 9, 28, -20, 30 }; -typedef enum BiriDamageEffect { +typedef enum BiriDamageReaction { /* 0x0 */ BIRI_DMGREAC_NONE, /* 0x1 */ BIRI_DMGREAC_DEKUNUT, /* 0x2 */ BIRI_DMGREAC_FIRE, /* 0x3 */ BIRI_DMGREAC_ICE, /* 0xE */ BIRI_DMGREAC_SLINGSHOT = 0xE, /* 0xF */ BIRI_DMGREAC_SWORD -} BiriDamageEffect; +} BiriDamageReaction; static DamageTable sDamageTable = { /* Deku nut */ DMG_ENTRY(0, BIRI_DMGREAC_DEKUNUT), 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 694ec1c977..d508a9b15c 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -150,13 +150,13 @@ static ColliderJntSphInit sJntSphInit = { static CollisionCheckInfoInit sColChkInfoInit = { 2, 25, 25, MASS_IMMOVABLE }; -typedef enum DekuBabaDamageEffect { +typedef enum DekuBabaDamageReaction { /* 0x0 */ DEKUBABA_DMGREAC_NONE, /* 0x1 */ DEKUBABA_DMGREAC_DEKUNUT, /* 0x2 */ DEKUBABA_DMGREAC_FIRE, /* 0xE */ DEKUBABA_DMGREAC_BOOMERANG = 14, /* 0xF */ DEKUBABA_DMGREAC_SWORD -} DekuBabaDamageEffect; +} DekuBabaDamageReaction; static DamageTable sDekuBabaDamageTable = { /* Deku nut */ DMG_ENTRY(0, DEKUBABA_DMGREAC_DEKUNUT), 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 fefe9aa73f..0cdae2d7f6 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -177,14 +177,14 @@ static ColliderQuadInit sSwordQuadInit = { { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; -typedef enum EnGeldBDamageEffects { +typedef enum EnGeldBDamageReactions { /* 0x0 */ GELDB_DMG_NORMAL, /* 0x1 */ GELDB_DMG_STUN, /* 0x6 */ GELDB_DMG_UNK_6 = 0x6, /* 0xD */ GELDB_DMG_UNK_D = 0xD, /* 0xE */ GELDB_DMG_UNK_E, /* 0xF */ GELDB_DMG_FREEZE -} EnGeldBDamageEffects; +} EnGeldBDamageReactions; static DamageTable sDamageTable = { /* Deku nut */ DMG_ENTRY(0, GELDB_DMG_STUN), 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 b8b0f48f1b..8e69cb2069 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -52,13 +52,13 @@ typedef enum EnIkCsDrawMode { /* 0x02 */ IK_CS_DRAW_DEFEAT } EnIkCsDrawMode; -typedef enum EnIkDamageEffect { +typedef enum EnIkDamageReaction { /* 0x0 */ EN_IK_DMGREAC_NONE, /* 0x6 */ EN_IK_DMGREAC_ELEMENTAL_MAGIC = 0x6, /* 0xD */ EN_IK_DMGREAC_SPARKS_NO_DMG = 0xD, /* 0xE */ EN_IK_DMGREAC_PROJECTILE, /* 0xF */ EN_IK_DMGREAC_DAMAGE -} EnIkDamageEffect; +} EnIkDamageReaction; void EnIk_UpdateEnemy(Actor* thisx, PlayState* play); void EnIk_DrawEnemy(Actor* thisx, PlayState* play); 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 777f2fed78..677811d393 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -184,13 +184,13 @@ static ColliderQuadInit sAttackColliderQuadInit = { { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; -typedef enum EnMbDamageEffect { +typedef enum EnMbDamageReaction { /* 0x0 */ ENMB_DMGREAC_IGNORE, /* 0x1 */ ENMB_DMGREAC_STUN, /* 0x5 */ ENMB_DMGREAC_FREEZE = 0x5, /* 0x6 */ ENMB_DMGREAC_STUN_ICE, /* 0xF */ ENMB_DMGREAC_DEFAULT = 0xF -} EnMbDamageEffect; +} EnMbDamageReaction; static DamageTable sSpearMoblinDamageTable = { /* Deku nut */ DMG_ENTRY(0, ENMB_DMGREAC_FREEZE), 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 153fbc2346..a40a326cd7 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -137,14 +137,14 @@ static ColliderQuadInit sQuadInit = { { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; -typedef enum DamageEffect { +typedef enum DamageReaction { /* 00 */ PEAHAT_DMG_EFF_ATTACK = 0, /* 06 */ PEAHAT_DMG_EFF_LIGHT_ICE_ARROW = 6, /* 12 */ PEAHAT_DMG_EFF_FIRE = 12, /* 13 */ PEAHAT_DMG_EFF_HOOKSHOT = 13, /* 14 */ PEAHAT_DMG_EFF_BOOMERANG = 14, /* 15 */ PEAHAT_DMG_EFF_NUT = 15 -} DamageEffect; +} DamageReaction; static DamageTable sDamageTable = { /* Deku nut */ DMG_ENTRY(0, PEAHAT_DMG_EFF_NUT), 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 9e9ff5155e..2f5c36a8d6 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -108,14 +108,14 @@ static ColliderCylinderInit sCylinderInit = { { 20, 70, 0, { 0, 0, 0 } }, }; -typedef enum EnRdDamageEffect { +typedef enum EnRdDamageReaction { /* 0x0 */ REDEAD_DMGREAC_NONE, // Does not interact with the Gibdo/Redead at all /* 0x1 */ REDEAD_DMGREAC_HOOKSHOT, // Stuns the Gibdo/Redead /* 0x6 */ REDEAD_DMGREAC_ICE_MAGIC = 0x6, // Does not interact with the Gibdo/Redead at all /* 0xD */ REDEAD_DMGREAC_LIGHT_MAGIC = 0xD, // Stuns the Gibdo/Redead /* 0xE */ REDEAD_DMGREAC_FIRE_MAGIC, // Applies a fire effect /* 0xF */ REDEAD_DMGREAC_DAMAGE // Deals damage without stunning or applying an effect -} EnRdDamageEffect; +} EnRdDamageReaction; static DamageTable sDamageTable = { /* Deku nut */ DMG_ENTRY(0, REDEAD_DMGREAC_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 662e7fcee4..db853da462 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -48,7 +48,7 @@ void EnReeba_Die(EnReeba* this, PlayState* play); void EnReeba_Stunned(EnReeba* this, PlayState* play); void EnReeba_StunDie(EnReeba* this, PlayState* play); -typedef enum LeeverDamageEffect { +typedef enum LeeverDamageReaction { /* 0x00 */ LEEVER_DMGREAC_NONE, // used by anything that cant kill the Leever /* 0x01 */ LEEVER_DMGREAC_UNK, // used by "unknown 1" attack /* 0x03 */ LEEVER_DMGREAC_ICE = 3, @@ -56,7 +56,7 @@ typedef enum LeeverDamageEffect { /* 0x0C */ LEEVER_DMGREAC_BOOMERANG, /* 0x0D */ LEEVER_DMGREAC_HOOKSHOT, /* 0x0E */ LEEVER_DMGREAC_OTHER -} LeeverDamageEffect; +} LeeverDamageReaction; static DamageTable sDamageTable = { /* Deku nut */ DMG_ENTRY(0, LEEVER_DMGREAC_NONE), 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 a5bb4cb174..61e19f0975 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -44,7 +44,7 @@ typedef enum EnRrReachState { /* 5 */ REACH_CLOSE } EnRrReachState; -typedef enum EnRrDamageEffect { +typedef enum EnRrDamageReaction { /* 0x0 */ RR_DMG_NONE, /* 0x1 */ RR_DMG_STUN, /* 0x2 */ RR_DMG_FIRE, @@ -55,7 +55,7 @@ typedef enum EnRrDamageEffect { /* 0xD */ RR_DMG_WIND_ARROW, /* 0xE */ RR_DMG_SPRT_ARROW, /* 0xF */ RR_DMG_NORMAL -} EnRrDamageEffect; +} EnRrDamageReaction; typedef enum EnRrDropType { /* 0 */ RR_DROP_RANDOM_RUPEE, 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 b4f2d4625b..4b808e389b 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -212,14 +212,14 @@ static ColliderQuadInit sSwordColliderQuadInit = { { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; -typedef enum StalfosDamageEffect { +typedef enum StalfosDamageReaction { /* 0x0 */ STALFOS_DMGREAC_NORMAL, /* 0x1 */ STALFOS_DMGREAC_STUN, /* 0x6 */ STALFOS_DMGREAC_FIREMAGIC = 6, /* 0xD */ STALFOS_DMGREAC_SLING = 0xD, /* 0xE */ STALFOS_DMGREAC_LIGHT, /* 0xF */ STALFOS_DMGREAC_FREEZE -} StalfosDamageEffect; +} StalfosDamageReaction; static DamageTable sDamageTable = { /* Deku nut */ DMG_ENTRY(0, STALFOS_DMGREAC_STUN), 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 6c80eabdae..ab987463a5 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -95,12 +95,12 @@ static ColliderJntSphInit sJntSphInit = { sJntSphElementsInit, }; -typedef enum TailpasaranDamageEffect { +typedef enum TailpasaranDamageReaction { /* 00 */ TAILPASARAN_DMGREAC_NONE, /* 01 */ TAILPASARAN_DMGREAC_DEKUNUT, /* 14 */ TAILPASARAN_DMGREAC_SHOCKING = 14, // Kills the Tailpasaran but shocks Player /* 15 */ TAILPASARAN_DMGREAC_INSULATING // Kills the Tailpasaran and does not shock Player -} TailpasaranDamageEffect; +} TailpasaranDamageReaction; static DamageTable sDamageTable = { /* Deku nut */ DMG_ENTRY(0, TAILPASARAN_DMGREAC_DEKUNUT), 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 e1e279a38a..e89f3a0edf 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -97,14 +97,14 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit sColChkInfoInit = { 2, 18, 32, MASS_HEAVY }; -typedef enum BariDamageEffect { +typedef enum BariDamageReaction { /* 0x0 */ BARI_DMGREAC_NONE, /* 0x1 */ BARI_DMGREAC_STUN, /* 0x2 */ BARI_DMGREAC_FIRE, /* 0x3 */ BARI_DMGREAC_ICE, /* 0xE */ BARI_DMGREAC_SLINGSHOT = 0xE, /* 0xF */ BARI_DMGREAC_SWORD -} BariDamageEffect; +} BariDamageReaction; static DamageTable sDamageTable = { /* Deku nut */ DMG_ENTRY(0, BARI_DMGREAC_STUN), 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 18ee9e70dd..d07928d236 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -162,14 +162,14 @@ static ColliderCylinderInit sTailCylinderInit = { { 15, 20, -15, { 0, 0, 0 } }, }; -typedef enum EnWfDamageEffect { +typedef enum EnWfDamageReaction { /* 0 */ ENWF_DMGREAC_NONE, /* 1 */ ENWF_DMGREAC_STUN, /* 6 */ ENWF_DMGREAC_ICE_MAGIC = 6, /* 13 */ ENWF_DMGREAC_LIGHT_MAGIC = 13, /* 14 */ ENWF_DMGREAC_FIRE, /* 15 */ ENWF_DMGREAC_UNDEF // used like STUN in the code, but not in the table -} EnWfDamageEffect; +} EnWfDamageReaction; static DamageTable sDamageTable = { /* Deku nut */ DMG_ENTRY(0, ENWF_DMGREAC_STUN), 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 604ff41f70..335026ce01 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -169,13 +169,13 @@ static ColliderQuadInit sSwordQuadInit = { { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; -typedef enum EnZfDamageEffect { +typedef enum EnZfDamageReaction { /* 0x0 */ ENZF_DMGREAC_NONE, /* 0x1 */ ENZF_DMGREAC_STUN, /* 0x6 */ ENZF_DMGREAC_IMMUNE = 6, // Skips damage code, but also skips the top half of Update /* 0xD */ ENZF_DMGREAC_PROJECTILE = 0xD, // Projectiles that don't have another damageeffect /* 0xF */ ENZF_DMGREAC_ICE = 0xF -} EnZfDamageEffect; +} EnZfDamageReaction; static DamageTable sDamageTable = { /* Deku nut */ DMG_ENTRY(0, ENZF_DMGREAC_STUN),