diff options
| author | Theo <65437533+notyourav@users.noreply.github.com> | 2023-12-31 21:28:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-31 21:28:46 -0800 |
| commit | 983412cc77d81692ad9431c0bd55f8d24e5554f8 (patch) | |
| tree | 108145ce0ee3172e48ac6529d9d49da53e9719b9 /src/enemy/rupeeLike.c | |
| parent | 48fdf9d8277d2bd2e071cb30fc6284c58645e343 (diff) | |
| parent | dcc596ed8763efd9f71ce9a669cb67a1849d7c2b (diff) | |
Merge pull request #685 from notyourav/col
define collisions
Diffstat (limited to 'src/enemy/rupeeLike.c')
| -rw-r--r-- | src/enemy/rupeeLike.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c index 7ebff811..ada5434e 100644 --- a/src/enemy/rupeeLike.c +++ b/src/enemy/rupeeLike.c @@ -75,7 +75,7 @@ void RupeeLike_OnCollision(RupeeLikeEntity* this) { super->timer = 60; super->subtimer = 0; this->unk_83 = 0x41; - super->flags2 &= 0xfc; + super->collisionMask &= 0xfc; this->unk_80 = gPlayerEntity.base.spritePriority.b1; EnqueueSFX(SFX_PLACE_OBJ); } else { @@ -255,7 +255,7 @@ void sub_080296D8(RupeeLikeEntity* this) { gPlayerEntity.base.speed = 0x140; super->action = 5; super->subtimer = 60; - super->flags2 |= 3; + super->collisionMask |= 3; if ((s8)super->iframes == 0) { super->iframes = 0xf4; } |
