atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MoveCoordsPixel

Browse source
This commit is contained in:
PikalaxALT 2017-09-16 21:45:18 -04:00
parent f03c0dc3b4
commit 76b68e039d
2 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
asm/field_map_obj.s
View file

@ -5,29 +5,6 @@
.text
thumb_func_start sub_8092F60
sub_8092F60: @ 8092F60
push {r4,lr}
lsls r0, 24
ldr r3, =gUnknown_0850DB7C
lsrs r0, 22
adds r0, r3
ldrh r3, [r0]
lsls r3, 4
ldrh r4, [r1]
adds r3, r4
strh r3, [r1]
ldrh r0, [r0, 0x2]
lsls r0, 4
ldrh r1, [r2]
adds r0, r1
strh r0, [r2]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8092F60
thumb_func_start sub_8092F88
sub_8092F88: @ 8092F88
push {r4-r7,lr}

6
src/field_map_obj.c
View file

@ -3790,6 +3790,12 @@ void MoveCoords(u8 direction, s16 *x, s16 *y)
*y += gUnknown_0850DB7C[direction].y;
}
void sub_8092F60(u8 direction, s16 *x, s16 *y)
{
*x += gUnknown_0850DB7C[direction].x << 4;
*y += gUnknown_0850DB7C[direction].y << 4;
}
asm(".section .text.get_face_direction_anim_id");
void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *);