diff options
| author | Theo <65437533+notyourav@users.noreply.github.com> | 2023-12-31 17:36:15 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-31 17:36:15 -0800 |
| commit | 48fdf9d8277d2bd2e071cb30fc6284c58645e343 (patch) | |
| tree | f5364bb3cdb41fe41512d767c1de44f73963e498 /src/enemy/enemy50.c | |
| parent | 72c27b5393372081f558a4c610bab7d5c88d3e89 (diff) | |
| parent | 37ac9cb0fb2d9ccb64286bab2cdf648e6f2541c5 (diff) | |
Merge pull request #684 from notyourav/tiles
Tiles documentation
Diffstat (limited to 'src/enemy/enemy50.c')
| -rw-r--r-- | src/enemy/enemy50.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/enemy/enemy50.c b/src/enemy/enemy50.c index 3839aabf..9987ee88 100644 --- a/src/enemy/enemy50.c +++ b/src/enemy/enemy50.c @@ -79,15 +79,15 @@ void Enemy50_OnCollision(Enemy50Entity* this) { sub_08041134(this); sub_0803F6EC(this); } - if (super->hitType == 0x25 && super->contactFlags == 0x80) { + if (super->hitType == 0x25 && super->contactFlags == CONTACT_TAKE_DAMAGE) { super->action = 8; InitializeAnimation(super, 3); } else { - if (super->contactFlags == 0x80) { + if (super->contactFlags == CONTACT_TAKE_DAMAGE) { this->unk_7c = 0x78; sub_08041128(this); } - if (super->contactFlags == 0x9d) { + if (super->contactFlags == (CONTACT_TAKE_DAMAGE | 0x1d)) { super->zVelocity = Q_16_16(1.5); } if (super->confusedTime != 0) { @@ -422,7 +422,7 @@ void sub_0804122C(Enemy50Entity* this) { #ifndef EU bool32 sub_08041300(Enemy50Entity* this) { - if ((super->hitType == 0x25) && (super->contactFlags == 0x80)) { + if ((super->hitType == 0x25) && (super->contactFlags == CONTACT_TAKE_DAMAGE)) { return TRUE; } else { return super->action == 8 || super->action == 9; |