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/object/objectA2.c | |
| parent | a1ae3b229bf3767349849e3da29fe4fd2043eda3 (diff) | |
| parent | 85aaada18f7eace3284937c4da8db05f047d316b (diff) | |
Merge remote-tracking branch 'upstream/master' into coord
Diffstat (limited to 'src/object/objectA2.c')
| -rw-r--r-- | src/object/objectA2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/object/objectA2.c b/src/object/objectA2.c index cc0e350a..e529794c 100644 --- a/src/object/objectA2.c +++ b/src/object/objectA2.c @@ -25,14 +25,16 @@ void ObjectA2(Entity* this) { GetNextFrame(this); } +#define fp(n) ((n) << 8) + void sub_0809F318(Entity* this) { InitializeAnimation(this, 0); if (Random() & 0x10) { this->spriteSettings.flipX = 1; } - this->x.HALF.HI = 0x28; - this->y.HALF.HI = 0x48; - this->z.HALF.HI = 0xFFB0; + this->x.HALF.HI = Q_8_8(0.16); + this->y.HALF.HI = Q_8_8(0.285); + this->z.HALF.HI = Q_8_8(-0.315); this->spriteOrientation.flipY = 2; this->action = 1; ChangeObjPalette(this, gUnk_08124704[this->type]); |