diff options
| author | theo3 <arisstephenson2@gmail.com> | 2023-12-30 21:07:06 -0800 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2023-12-30 21:07:06 -0800 |
| commit | 5049daabc59d113152143d123aea2798d9487a0c (patch) | |
| tree | b502c841b46f25267be35f3986bd90ef45cba9da /src/enemy/peahat.c | |
| parent | bd1be092aa85e4eb1d368bef05c88eaae2a0ae84 (diff) | |
label contact flags
Diffstat (limited to 'src/enemy/peahat.c')
| -rw-r--r-- | src/enemy/peahat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/enemy/peahat.c b/src/enemy/peahat.c index d4c0e3d8..c3250c60 100644 --- a/src/enemy/peahat.c +++ b/src/enemy/peahat.c @@ -61,7 +61,7 @@ void Peahat_OnTick(PeahatEntity* this) { void Peahat_OnCollision(PeahatEntity* this) { if (this->unk_82) { - if (super->contactFlags == 0x94) { + if (super->contactFlags == (CONTACT_TAKE_DAMAGE | 0x14)) { Entity* entity = CreateEnemy(PEAHAT, PeahatForm_Propeller); if (entity != NULL) { CopyPosition(super, entity); @@ -74,14 +74,14 @@ void Peahat_OnCollision(PeahatEntity* this) { super->iframes = -30; this->unk_81 = 0; InitializeAnimation(super, super->animationState); - } else if (super->contactFlags == 0x9b) { + } else if (super->contactFlags == (CONTACT_TAKE_DAMAGE | 0x1b)) { super->animationState = PeahatAnimation_BrokenPropeller; super->action = 5; super->speed = 0x80; super->iframes = -30; this->unk_81 = 0; InitializeAnimation(super, super->animationState); - } else if (super->contactFlags == 0x80) { + } else if (super->contactFlags == CONTACT_TAKE_DAMAGE) { if (super->animationState == PeahatAnimation_Flying) { super->action = 1; super->timer = 30; |
