diff options
| author | theo3 <arisstephenson2@gmail.com> | 2022-03-28 19:51:32 -0700 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2022-03-28 20:10:22 -0700 |
| commit | 92240d43147dd36ed879ce1084f7ca6e35f1db96 (patch) | |
| tree | 78a3119e1cd63d4f3333a3cade6cc622cdcb6db1 /src/enemy/enemy4D.c | |
| parent | 755571834d4fc0e21fdd45b065728c87574a3a07 (diff) | |
name remaining entity fields
Diffstat (limited to 'src/enemy/enemy4D.c')
| -rw-r--r-- | src/enemy/enemy4D.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/enemy/enemy4D.c b/src/enemy/enemy4D.c index 9c13ceaf..0fc6ab78 100644 --- a/src/enemy/enemy4D.c +++ b/src/enemy/enemy4D.c @@ -184,7 +184,7 @@ void Enemy4D_Action5(Enemy4DEntity* this) { if ((tmp * 0x1000000) < 1) { this->unk_7e = 0; super->action = 6; - super->actionDelay = 0x0f; + super->timer = 0x0f; InitAnimationForceUpdate(super, super->animationState + 0x20); } } @@ -197,9 +197,9 @@ void Enemy4D_Action6(Enemy4DEntity* this) { 128, 188, }; - if (--super->actionDelay == 0) { + if (--super->timer == 0) { super->action = 7; - super->actionDelay = 1; + super->timer = 1; this->unk_7c = gUnk_080D08C4[super->animationState]; this->unk_7f = 0xf6; EnqueueSFX(SFX_15B); @@ -210,22 +210,22 @@ void Enemy4D_Action7(Enemy4DEntity* this) { if ((super->frame & ANIM_DONE) == 0) { UpdateAnimationSingleFrame(super); } else { - if (--super->actionDelay == 0) { - super->actionDelay = 2; + if (--super->timer == 0) { + super->timer = 2; this->unk_7f++; } if (this->unk_7f != 0) { this->unk_7e += 5; } else { super->action = 8; - super->actionDelay = 0x1e; + super->timer = 0x1e; InitScreenShake(8, 0); } } } void Enemy4D_Action8(Enemy4DEntity* this) { - if (--super->actionDelay == 0) { + if (--super->timer == 0) { super->action = 9; } } @@ -235,7 +235,7 @@ void Enemy4D_Action9(Enemy4DEntity* this) { tmp = this->unk_7e = this->unk_7e - 2; if (tmp < 0xb) { super->action = 0xa; - super->actionDelay = 0x3c; + super->timer = 0x3c; super->direction = super->animationState << 3; this->unk_7c = 0; this->unk_7f = 0xfe; @@ -246,8 +246,8 @@ void Enemy4D_Action9(Enemy4DEntity* this) { } void Enemy4D_Action10(Enemy4DEntity* this) { - if (super->actionDelay != 0) { - if (--super->actionDelay == 0) { + if (super->timer != 0) { + if (--super->timer == 0) { super->child->flags |= ENT_COLLIDE; sub_0803E94C(super, 0); } |
