diff options
| author | Tal Hayon <talhayon1@gmail.com> | 2022-01-11 18:40:50 +0200 |
|---|---|---|
| committer | Tal Hayon <talhayon1@gmail.com> | 2022-01-11 18:40:50 +0200 |
| commit | b21576892f0b323e7a80bfc3380f9a540e22fff6 (patch) | |
| tree | f6641d5e862bb94bef29c8b23ec81a913717f453 /src/object | |
| parent | 688508b1afb97606c605f1d91c2b9fc773573ca0 (diff) | |
Match sub_08090E64
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/furniture.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/object/furniture.c b/src/object/furniture.c index 6429e776..c625d1fb 100644 --- a/src/object/furniture.c +++ b/src/object/furniture.c @@ -448,15 +448,12 @@ static void sub_08090E4C(FurnitureEntity* this) { ChangeObjPalette(super, sPalettes[super->field_0xf]); } -static NONMATCH("asm/non_matching/furniture/sub_08090E64.s", void sub_08090E64(FurnitureEntity* this)) { - Entity* e = CreateObject(OBJECT_42, 0, 0); - u32 tmp = 0x10000 - 2; - +void sub_08090E64(FurnitureEntity* this) { + Entity* e = CreateObject(OBJECT_2A, 0, 0); if (e != NULL) { - PositionRelative(super, e, (tmp + super->type2) * 0x10000, 0); + PositionRelative(super, e, (s16)((u16)-2 + super->type2) * 0x10000, 0); e->z.HALF.HI -= 16; e->collisionLayer = 2; UpdateSpriteForCollisionLayer(e); } } -END_NONMATCH |