summaryrefslogtreecommitdiff
path: root/src/enemy/likeLike.c
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2023-12-31 21:24:07 -0800
committertheo3 <arisstephenson2@gmail.com>2023-12-31 21:26:12 -0800
commitdcc596ed8763efd9f71ce9a669cb67a1849d7c2b (patch)
tree108145ce0ee3172e48ac6529d9d49da53e9719b9 /src/enemy/likeLike.c
parent48fdf9d8277d2bd2e071cb30fc6284c58645e343 (diff)
define collisions
Diffstat (limited to 'src/enemy/likeLike.c')
-rw-r--r--src/enemy/likeLike.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c
index 373953f6..0a124fe5 100644
--- a/src/enemy/likeLike.c
+++ b/src/enemy/likeLike.c
@@ -46,13 +46,13 @@ void LikeLike_OnCollision(LikeLikeEntity* this) {
} else {
if (super->action == 7) {
LikeLike_ReleasePlayer(this);
- } else if (super->contactFlags & CONTACT_TAKE_DAMAGE) {
- u8 tmp = super->contactFlags & ~CONTACT_TAKE_DAMAGE;
+ } else if (super->contactFlags & CONTACT_NOW) {
+ u8 tmp = super->contactFlags & ~CONTACT_NOW;
if (tmp == 0) {
super->action = 7;
super->timer = 95;
super->subtimer = tmp;
- super->flags2 &= 0xfc;
+ super->collisionMask &= 0xfc;
this->prevSpritePriority = gPlayerEntity.base.spritePriority.b1;
}
}
@@ -153,7 +153,7 @@ void sub_08027FB4(LikeLikeEntity* this) {
if (--super->timer == 0) {
super->action = 1;
super->timer = 1;
- super->flags2 |= 1;
+ super->collisionMask |= 1;
}
GetNextFrame(super);
}
@@ -236,7 +236,7 @@ void LikeLike_ReleasePlayer(LikeLikeEntity* this) {
super->action = 4;
super->timer = 80;
super->subtimer = tmp;
- super->flags2 |= 2;
+ super->collisionMask |= 2;
if (super->iframes == 0) {
super->iframes = -18;
}