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/sluggula.c | |
| parent | 755571834d4fc0e21fdd45b065728c87574a3a07 (diff) | |
name remaining entity fields
Diffstat (limited to 'src/enemy/sluggula.c')
| -rw-r--r-- | src/enemy/sluggula.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/enemy/sluggula.c b/src/enemy/sluggula.c index 759a3c5c..5dc003ef 100644 --- a/src/enemy/sluggula.c +++ b/src/enemy/sluggula.c @@ -65,7 +65,7 @@ void Sluggula_OnGrabbed(Entity* this) { void sub_08023C5C(Entity* this) { sub_0804A720(this); this->action = 1; - this->actionDelay = (Random() & 0x30) + 0xb4; + this->timer = (Random() & 0x30) + 0xb4; this->direction = DirectionRound(Random()); this->animationState = this->direction >> 3; InitializeAnimation(this, this->animationState); @@ -75,11 +75,11 @@ void sub_08023C8C(Entity* this) { ProcessMovement0(this); GetNextFrame(this); sub_08023E54(this); - if (--this->actionDelay == 0) { + if (--this->timer == 0) { if (this->frame != 1) { - this->actionDelay = 8; + this->timer = 8; } else { - this->actionDelay = (Random() & 0x30) + 0xb4; + this->timer = (Random() & 0x30) + 0xb4; sub_08023E9C(this); this->animationState = this->direction >> 3; InitializeAnimation(this, this->animationState); @@ -93,8 +93,8 @@ void sub_08023CE0(Entity* this) { sub_0804A720(this); if (this->type2 == 1) { this->action = 2; - if (this->actionDelay == 0) { - this->actionDelay = 1; + if (this->timer == 0) { + this->timer = 1; } this->spriteSettings.draw = 3; } else { @@ -108,15 +108,15 @@ void sub_08023CE0(Entity* this) { case 1: if (PlayerInRange(this, 1, 0x20)) { this->action = 2; - if (this->actionDelay == 0) { - this->actionDelay = 8; + if (this->timer == 0) { + this->timer = 8; } this->spriteSettings.draw = 3; } break; case 2: - if (this->actionDelay != 0) { - if (--this->actionDelay == 0) { + if (this->timer != 0) { + if (--this->timer == 0) { EnqueueSFX(SFX_12D); InitializeAnimation(this, 4); } @@ -160,8 +160,8 @@ void sub_08023E10(Entity* this) { void sub_08023E54(Entity* this) { Entity* ent; - if (this->field_0xf++ > 27) { - this->field_0xf = 0; + if (this->subtimer++ > 27) { + this->subtimer = 0; ent = CreateEnemy(SLUGGULA, 2); if (ent != NULL) { const s8* ptr = &gUnk_080CBDF7[this->animationState * 2]; |
