diff options
| author | Theo <65437533+notyourav@users.noreply.github.com> | 2023-12-30 14:35:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-30 14:35:18 -0800 |
| commit | 9c87bcca8ea4b52199ed908c0ea28ab08b1d0747 (patch) | |
| tree | 8df9fe68628826c949bf4ec0de9f74db40a9914d /src/object/objectOnPillar.c | |
| parent | 3c0c1ba5a0653e0acb1c433c3619cda0e3223ddd (diff) | |
| parent | 8b69eadaef0e0d9f1a4071d1cfad00e93183590b (diff) | |
Merge pull request #679 from octorock/enemies
Use new entity structs for enemies and player
Diffstat (limited to 'src/object/objectOnPillar.c')
| -rw-r--r-- | src/object/objectOnPillar.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/object/objectOnPillar.c b/src/object/objectOnPillar.c index 6f3381dc..7815dd74 100644 --- a/src/object/objectOnPillar.c +++ b/src/object/objectOnPillar.c @@ -4,7 +4,6 @@ * * @brief Object on Pillar object */ -#define NENT_DEPRECATED #include "functions.h" #include "hitbox.h" #include "object.h" @@ -122,17 +121,17 @@ void ObjectOnPillar_SubAction0(ObjectOnPillarEntity* this) { const s8* ptr; if (this->unk_72 == 0) { this->unk_72 = 1; - ptr = &gUnk_08123274[gPlayerEntity.animationState]; - PositionRelative(super, &gPlayerEntity, ptr[0] << 0x10, ptr[1] << 0x10); + ptr = &gUnk_08123274[gPlayerEntity.base.animationState]; + PositionRelative(super, &gPlayerEntity.base, ptr[0] << 0x10, ptr[1] << 0x10); } sub_08097008(this); if (sub_080896B0()) { gPlayerState.queued_action = PLAYER_PULL; gPlayerState.field_0x38 = 0x20; gPlayerState.flags |= PL_BUSY; - gPlayerEntity.x.HALF.LO = 0; - gPlayerEntity.y.HALF.LO = 0; - super->direction = ((gPlayerEntity.animationState ^ 4) << 2); + gPlayerEntity.base.x.HALF.LO = 0; + gPlayerEntity.base.y.HALF.LO = 0; + super->direction = ((gPlayerEntity.base.animationState ^ 4) << 2); sub_08097098(this); } } |