falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match sub_08090E64

This commit is contained in:
Tal Hayon 2022-01-11 18:40:50 +02:00
parent 688508b1af
commit b21576892f
2 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
asm/non_matching/furniture/sub_08090E64.s
View File

@ -1,33 +0,0 @@
.syntax unified
push {r4, r5, lr}
adds r5, r0, #0
movs r0, #0x2a
movs r1, #0
movs r2, #0
bl CreateObject
adds r4, r0, #0
cmp r4, #0
beq _08090EA0
ldr r0, _08090EA4 @ =0x0000FFFE
adds r2, r0, #0
ldrb r0, [r5, #0xb]
adds r2, r2, r0
lsls r2, r2, #0x10
adds r0, r5, #0
adds r1, r4, #0
movs r3, #0
bl PositionRelative
ldrh r0, [r4, #0x36]
subs r0, #0x10
strh r0, [r4, #0x36]
adds r1, r4, #0
adds r1, #0x38
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
_08090EA0:
pop {r4, r5, pc}
.align 2, 0
_08090EA4: .4byte 0x0000FFFE
.syntax divided

9
src/object/furniture.c
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