diff options
| author | Tal Hayon <talhayon1@gmail.com> | 2022-01-23 17:24:55 +0200 |
|---|---|---|
| committer | Tal Hayon <talhayon1@gmail.com> | 2022-01-23 17:24:55 +0200 |
| commit | 70e2ef587740bfa159528bc0b160bb89869ad925 (patch) | |
| tree | 766b21f8ce110a96d673e52e8cd7ac05072e5495 /src/enemy/vaatiTransfigured.c | |
| parent | a1ae3b229bf3767349849e3da29fe4fd2043eda3 (diff) | |
| parent | 85aaada18f7eace3284937c4da8db05f047d316b (diff) | |
Merge remote-tracking branch 'upstream/master' into coord
Diffstat (limited to 'src/enemy/vaatiTransfigured.c')
| -rw-r--r-- | src/enemy/vaatiTransfigured.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/enemy/vaatiTransfigured.c b/src/enemy/vaatiTransfigured.c index 2dd541ac..bf2ef39c 100644 --- a/src/enemy/vaatiTransfigured.c +++ b/src/enemy/vaatiTransfigured.c @@ -314,7 +314,7 @@ void VaatiTransfiguredType0Action3(Entity* this) { if (this->actionDelay != 0) { if (--this->actionDelay == 0) { COLLISION_OFF(this); - this->zVelocity = 0x38000; + this->zVelocity = Q_16_16(3.5); this->field_0xf = 0x10; } break; @@ -380,12 +380,12 @@ void VaatiTransfiguredType0Action4(Entity* this) { this->field_0x74.HALF.LO = 0; this->actionDelay = 0x80; this->field_0xf = 0; - this->zVelocity = 0x24000; + this->zVelocity = Q_16_16(2.25); SoundReq(SFX_12B); } break; case 1: - if (GravityUpdate(this, 0x2800) != 0) + if (GravityUpdate(this, Q_8_8(40)) != 0) break; this->field_0x80.HALF.LO += 1; switch (this->cutsceneBeh.HALF.LO) { @@ -1062,7 +1062,7 @@ void sub_080409B0(Entity* this) { this->field_0x80.HALF.HI = 3; COLLISION_OFF(this); this->hitType = 0x36; - this->zVelocity = 0x18000; + this->zVelocity = Q_16_16(1.5); SoundReq(SFX_164); } } |