diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2025-06-28 23:06:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-28 18:06:42 -0400 |
| commit | d45353ee332248b82c3138d81e620b07cd10ffda (patch) | |
| tree | 6588a3b1e80380a5b340c785d9a77af83de4cc9f /src/code | |
| parent | b5f980570cf2c621a254be69d046f97c99a580d9 (diff) | |
Cleanup extracted colliders 3: Use `HIT_SPECIAL_EFFECT_`, `HIT_BACKLASH_` names (#2646)
* Cleanup extracted colliders 3: Use `HIT_SPECIAL_EFFECT_`, `HIT_BACKLASH_` names
* revert removing FLARE_DANCER_BODY_DMG (oops)
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_en_a_keep.c | 4 | ||||
| -rw-r--r-- | src/code/z_en_item00.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 12d31b4f0..7b84c9bd3 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -50,8 +50,8 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK2, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 }, ATELEM_NONE, ACELEM_ON, OCELEM_ON, diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 1f5d4a5c0..0a92bc66c 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -64,9 +64,9 @@ static ColliderCylinderInit sCylinderInit = { }, { ELEM_MATERIAL_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000010, 0x00, 0x00 }, - ATELEM_NONE | ATELEM_SFX_NORMAL, + { 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 }, + { 0x00000010, HIT_BACKLASH_NONE, 0x00 }, + ATELEM_NONE, ACELEM_ON, OCELEM_NONE, }, |