diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2025-06-04 00:45:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-03 18:45:32 -0400 |
| commit | 31f8c32ed947dfcbfb2c73e4e6aff6ef3dbbb4d5 (patch) | |
| tree | b4342b1e6b861ec1ed73f0ff8d1b875a5d2bb450 /include | |
| parent | 0c1b1231d3f77a758e1fce7c0e18dcb4465f5269 (diff) | |
Rename `damageEffect` -> `damageReaction` (#2554)
* CollisionCheckInfo.damageEffect -> damageReaction
* damageEffect -> damageReaction in other structs/temps
* DMGEFF -> DMGREAC
* EnSkb.lastDamageEffect -> lastDamageReaction
* EnTest.lastDamageEffect -> lastDamageReaction
* enums: DamageEffect -> DamageReaction
* cleanup: EnGeldBDamageReactions -> EnGeldBDamageReaction
* DMG_ENTRY effect -> reaction
* cleanup: GELDB_DMG_ -> GELDB_DMGREAC_
* PEAHAT_DMG_EFF -> PEAHAT_DMGREAC
* cleanup: RR_DMG_ -> RR_DMGREAC_
* cleanup: EnWallmas DAMAGE_EFFECT_ -> WALLMAS_DMGREAC_
* cleanup: EnPeehat's DamageReaction -> EnPeehatDamageReaction
* format
* review
* _DMGREAC_ -> _DMG_REAC_
* _DMG_REAC_ -> _DMG_REACT_
* format
Diffstat (limited to 'include')
| -rw-r--r-- | include/z64collision_check.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/z64collision_check.h b/include/z64collision_check.h index 2c2756376..4a15431ac 100644 --- a/include/z64collision_check.h +++ b/include/z64collision_check.h @@ -391,7 +391,7 @@ typedef struct CollisionCheckContext { #define OCLINE_NONE 0 // Did not have an OcLine collision #define OCLINE_HIT (1 << 0) // Had an OcLine collision -#define DMG_ENTRY(damage, effect) ((damage) | ((effect) << 4)) +#define DMG_ENTRY(damage, reaction) ((damage) | ((reaction) << 4)) #define DMG_DEKU_NUT (1 << 0) #define DMG_DEKU_STICK (1 << 1) @@ -464,7 +464,7 @@ typedef struct CollisionCheckInfo { /* 0x16 */ u8 mass; // Used to compute displacement for OC collisions /* 0x17 */ u8 health; // Note: some actors may use their own health variable instead of this one /* 0x18 */ u8 damage; // Amount to decrement health by - /* 0x19 */ u8 damageEffect; // Stores what effect should occur when hit by a weapon + /* 0x19 */ u8 damageReaction; // Stores what reaction should occur after being hit /* 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 } CollisionCheckInfo; // size = 0x1C |