diff options
| author | Tal Hayon <talhayon1@gmail.com> | 2022-01-29 16:21:57 +0200 |
|---|---|---|
| committer | Tal Hayon <talhayon1@gmail.com> | 2022-01-30 00:32:10 +0200 |
| commit | b4f8429a2c951dbf6b92edd865f6a63c166301cb (patch) | |
| tree | 898ba9d60e688da0ba432f7d70e421c898ea34da /src/enemy | |
| parent | d34aa9166f5d9f7958e586ae1daee3224eb11fa5 (diff) | |
Use PlayerFlags where possible
Diffstat (limited to 'src/enemy')
| -rw-r--r-- | src/enemy/flyingSkull.c | 2 | ||||
| -rw-r--r-- | src/enemy/likeLike.c | 2 | ||||
| -rw-r--r-- | src/enemy/moldworm.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/enemy/flyingSkull.c b/src/enemy/flyingSkull.c index adf57523..5c0fa3b0 100644 --- a/src/enemy/flyingSkull.c +++ b/src/enemy/flyingSkull.c @@ -133,7 +133,7 @@ void sub_08039DD8(FlyingSkullEntity* this) { sub_08078930(super); } else { - if ((gPlayerState.flags & 0x80) == 0) { + if ((gPlayerState.flags & PL_MINISH) == 0) { Entity* ent = &gPlayerEntity; if (EntityWithinDistance(super, ent->x.HALF.HI, ent->y.HALF.HI, 0x30)) { if (super->type == 1) { diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c index 20c5f188..8c39b720 100644 --- a/src/enemy/likeLike.c +++ b/src/enemy/likeLike.c @@ -213,7 +213,7 @@ void sub_0802805C(Entity* this) { NONMATCH("asm/non_matching/likeLike/sub_0802810C.inc", void sub_0802810C(Entity* this)) { gPlayerState.jump_status = 0x41; gPlayerState.field_0xa = 0; - gPlayerState.flags &= 0xffffffef; + gPlayerState.flags &= PL_CAPTURED; gPlayerEntity.flags |= ENT_COLLIDE; gPlayerEntity.zVelocity = Q_16_16(1.5); gPlayerEntity.iframes = -60; diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c index 695271ae..652f0136 100644 --- a/src/enemy/moldworm.c +++ b/src/enemy/moldworm.c @@ -91,7 +91,7 @@ void sub_080230E4(Entity* this) { gPlayerEntity.direction = 0xff; gPlayerEntity.iframes = -0x14; gPlayerState.jump_status = 0x41; - gPlayerState.flags &= 0xfff7ffff; + gPlayerState.flags &= ~PL_MOLDWORM_CAPTURED; } sub_0804AA30(this, gUnk_080CBC38); |