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/object/whirlwind.c | |
| parent | 48fdf9d8277d2bd2e071cb30fc6284c58645e343 (diff) | |
| parent | dcc596ed8763efd9f71ce9a669cb67a1849d7c2b (diff) | |
Merge pull request #685 from notyourav/col
define collisions
Diffstat (limited to 'src/object/whirlwind.c')
| -rw-r--r-- | src/object/whirlwind.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object/whirlwind.c b/src/object/whirlwind.c index 979a62a3..add24319 100644 --- a/src/object/whirlwind.c +++ b/src/object/whirlwind.c @@ -33,7 +33,7 @@ void Whirlwind_Init(Entity* this) { this->hitType = 1; this->collisionFlags = 0x47; this->hurtType = 0x44; - this->flags2 = 0x80; + this->collisionMask = 0x80; this->spriteOrientation.flipY = 1; this->spriteRendering.b3 = 1; this->animationState = this->type; @@ -58,7 +58,7 @@ void Whirlwind_Action1(Entity* this) { } if (this->spriteSettings.draw != 0) { GetNextFrame(this); - if ((((((gPlayerState.flags & PL_MINISH) == 0)) && (gPlayerState.field_0x3c == 0)) && + if ((((((gPlayerState.flags & PL_MINISH) == 0)) && (gPlayerState.killed == 0)) && ((gPlayerEntity.base.action == PLAYER_JUMP || ((gPlayerEntity.base.flags & ENT_COLLIDE) != 0)))) && ((gPlayerEntity.base.action != PLAYER_BOUNCE && (sub_0800419C(this, &gPlayerEntity.base, 0xc, 0xc) != 0)))) { |