Merge pull request #286 from hatal175/sub_08090E64

Match sub_08090E64
This commit is contained in:
notyourav
2022-01-11 19:55:54 -08:00
committed by GitHub
2 changed files with 3 additions and 39 deletions
+3 -6
View File
@@ -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