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/flyingPot.c | |
| parent | 48fdf9d8277d2bd2e071cb30fc6284c58645e343 (diff) | |
| parent | dcc596ed8763efd9f71ce9a669cb67a1849d7c2b (diff) | |
Merge pull request #685 from notyourav/col
define collisions
Diffstat (limited to 'src/enemy/flyingPot.c')
| -rw-r--r-- | src/enemy/flyingPot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/enemy/flyingPot.c b/src/enemy/flyingPot.c index cc868bc0..0402aac5 100644 --- a/src/enemy/flyingPot.c +++ b/src/enemy/flyingPot.c @@ -93,7 +93,7 @@ void FlyingPot_OnTick(FlyingPotEntity* this) { void FlyingPot_OnCollision(FlyingPotEntity* this) { sub_08037418(this); - if (super->contactFlags == (CONTACT_TAKE_DAMAGE | 0x1d)) { + if (super->contactFlags == (CONTACT_NOW | 0x1d)) { super->action = FLYING_POT_ACTION_6; COLLISION_OFF(super); super->zVelocity = Q_16_16(2.625); @@ -207,7 +207,7 @@ void FlyingPot_Action2(FlyingPotEntity* this) { super->spritePriority.b1 = 1; super->spriteOffsetX = 0; super->hitType = 0xA0; - super->flags2 = 0xF; + super->collisionMask = 0xF; super->hitbox = &gUnk_080FD34C; SetBottomTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); |