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/vaatiBall.c | |
| parent | a1ae3b229bf3767349849e3da29fe4fd2043eda3 (diff) | |
| parent | 85aaada18f7eace3284937c4da8db05f047d316b (diff) | |
Merge remote-tracking branch 'upstream/master' into coord
Diffstat (limited to 'src/enemy/vaatiBall.c')
| -rw-r--r-- | src/enemy/vaatiBall.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/enemy/vaatiBall.c b/src/enemy/vaatiBall.c index 14970d34..82dd8948 100644 --- a/src/enemy/vaatiBall.c +++ b/src/enemy/vaatiBall.c @@ -71,7 +71,7 @@ void sub_0804468C(Entity* this) { this->field_0x82.HALF.HI = 0; this->spriteSettings.draw = 0; off = &gUnk_080D1620[this->field_0x78.HALF.HI & 3]; - PositionRelative(this->parent, this, off->h << 0x10, (off->v - 0x10) * 0x10000); + PositionRelative(this->parent, this, Q_16_16(off->h), Q_16_16(off->v - 0x10)); this->z.HALF.HI = this->parent->z.HALF.HI; InitAnimationForceUpdate(this, 0); break; @@ -397,7 +397,7 @@ void sub_08044B04(Entity* this) { this->field_0x74.HALF.LO = 1; this->actionDelay = 80; COLLISION_OFF(this); - PositionRelative(vaati, this, 0, -0x100000); + PositionRelative(vaati, this, 0, Q_16_16(-16.0)); if (this->field_0xf) this->spriteSettings.draw = 0; break; @@ -463,7 +463,7 @@ void sub_08044DEC(Entity* this) { this->speed = 0x300; off = this->parent->field_0x80.HALF.LO - 1; this->direction = gUnk_080D1628[off][this->field_0x78.HALF.HI]; - PositionRelative(this->parent, this, 0, -0x100000); + PositionRelative(this->parent, this, 0, Q_16_16(-16.0)); } void sub_08044E74(Entity* this, u32 state) { @@ -475,7 +475,7 @@ void sub_08044E74(Entity* this, u32 state) { this->action = 2; this->direction += 0x18; this->direction &= 0x1f; - PositionRelative(this->parent, this, 0, -0x100000); + PositionRelative(this->parent, this, 0, Q_16_16(-16.0)); this->speed = 12288; LinearMoveUpdate(this); this->direction += 0x8; @@ -509,5 +509,5 @@ void sub_08044E74(Entity* this, u32 state) { } this->actionDelay = 1; this->field_0x78.HALF.LO = 0; - this->speed = 1280; + this->speed = Q_8_8(5); } |