summaryrefslogtreecommitdiff
path: root/src/enemy/vaatiTransfigured.c
diff options
context:
space:
mode:
authorElliptic Ellipsis <elliptic.ellipsis@gmail.com>2022-06-22 00:00:57 +0100
committerElliptic Ellipsis <elliptic.ellipsis@gmail.com>2022-06-22 00:00:57 +0100
commit69568e03b0e717ec0e451cf753ebfde88c48e010 (patch)
tree522a315a27038d377d66338863abac1e6ba3fe26 /src/enemy/vaatiTransfigured.c
parent66fb42033db0e282339dd0bdb485dde0d1d4c26a (diff)
Should be the rest of them
Diffstat (limited to 'src/enemy/vaatiTransfigured.c')
-rw-r--r--src/enemy/vaatiTransfigured.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/enemy/vaatiTransfigured.c b/src/enemy/vaatiTransfigured.c
index d1dd3abb..23c820bf 100644
--- a/src/enemy/vaatiTransfigured.c
+++ b/src/enemy/vaatiTransfigured.c
@@ -188,7 +188,7 @@ void VaatiTransfiguredType0Action1(Entity* this) {
if (--this->timer == 0) {
this->field_0x80.HALF.LO += 1;
this->speed = 0x180;
- this->timer = 0x14;
+ this->timer = 20;
}
break;
case 1:
@@ -203,7 +203,7 @@ void VaatiTransfiguredType0Action1(Entity* this) {
this->field_0x80.HALF.LO += 1;
this->speed = 0;
if (this->animationState < 2) {
- this->timer = (Random() & 0x7f) + 0x40;
+ this->timer = (Random() & 0x7f) + 64;
} else {
this->timer = 8;
}
@@ -269,7 +269,7 @@ void VaatiTransfiguredType0Action3(Entity* this) {
if (uVar4 != 1)
break;
this->field_0x80.HALF.LO = 1;
- this->timer = 0xc0;
+ this->timer = 192;
COLLISION_ON(this);
SoundReq(SFX_14C);
InitScreenShake(20, 4);
@@ -293,7 +293,7 @@ void VaatiTransfiguredType0Action3(Entity* this) {
this->animationState++;
if (this->animationState > 2) {
this->action = 7;
- this->timer = 0xe0;
+ this->timer = 224;
DeleteClones();
SoundReq(SFX_BOSS_HIT);
return;
@@ -307,7 +307,7 @@ void VaatiTransfiguredType0Action3(Entity* this) {
this->timer = 64;
} else {
this->field_0x80.HALF.LO = 4;
- this->timer = 0x50;
+ this->timer = 80;
}
break;
case 3:
@@ -378,7 +378,7 @@ void VaatiTransfiguredType0Action4(Entity* this) {
if (--this->timer == 0) {
this->field_0x80.HALF.LO += 1;
this->field_0x74.HALF.LO = 0;
- this->timer = 0x80;
+ this->timer = 128;
this->subtimer = 0;
this->zVelocity = Q_16_16(2.25);
SoundReq(SFX_12B);
@@ -416,7 +416,7 @@ void VaatiTransfiguredType0Action4(Entity* this) {
CreateProjectileWithParent(this, V2_PROJECTILE, this->subtimer);
}
if (((this->subtimer != 0) && (1 < this->animationState)) && (this->timer < 6)) {
- this->timer = 0x80;
+ this->timer = 128;
this->subtimer = 0;
}
}
@@ -447,7 +447,7 @@ void VaatiTransfiguredType0Action5(Entity* this) {
this->field_0x80.HALF.LO += 1;
this->timer = 64;
if (1 < this->animationState) {
- this->timer = 0x80;
+ this->timer = 128;
this->subtimer = 1;
}
}
@@ -498,7 +498,7 @@ void VaatiTransfiguredType0Action6(Entity* this) {
case 0:
if (--this->timer == 0) {
this->field_0x80.HALF.LO += 1;
- this->timer = 0x80;
+ this->timer = 128;
if (1 < this->animationState) {
this->subtimer = 1;
}
@@ -514,7 +514,7 @@ void VaatiTransfiguredType0Action6(Entity* this) {
CreateProjectileWithParent(this, V2_PROJECTILE, this->subtimer);
}
if (this->timer < 6) {
- this->timer = 0x80;
+ this->timer = 128;
this->subtimer = 0;
}
} else {
@@ -634,7 +634,7 @@ void VaatiTransfiguredType2Action0(Entity* this) {
sub_08040648(this, 2, 2);
this->action = 1;
this->timer = 0;
- this->subtimer = (Random() & 0x7f) + 0x17;
+ this->subtimer = (Random() & 0x7f) + 23;
this->field_0x74.HALF.LO = 0;
InitAnimationForceUpdate(this, 0);
}
@@ -667,7 +667,7 @@ void VaatiTransfiguredType2Action1(Entity* this) {
switch (this->field_0x74.HALF.LO) {
case 0:
if (--this->subtimer == 0) {
- this->subtimer = (Random() & 0x7f) + 0x27;
+ this->subtimer = (Random() & 0x7f) + 39;
if ((this->subtimer & 1) != 0) {
this->field_0x74.HALF.LO = 1;
InitAnimationForceUpdate(this, 8);
@@ -677,14 +677,14 @@ void VaatiTransfiguredType2Action1(Entity* this) {
case 1:
if ((this->frame & ANIM_DONE) != 0) {
this->field_0x74.HALF.LO = 0;
- this->subtimer = (Random() & 0x7f) + 0x17;
+ this->subtimer = (Random() & 0x7f) + 23;
InitAnimationForceUpdate(this, 0);
}
break;
case 0x10:
InitAnimationForceUpdate(this, 7);
this->field_0x74.HALF.LO = 0x11;
- this->subtimer = 0x50;
+ this->subtimer = 80;
break;
case 0x11:
if (--this->subtimer == 0) {