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

npc_coords_set

Browse source
This commit is contained in:
PikalaxALT 2017-09-08 21:28:22 -04:00
parent 70e982d1fa
commit 019935fb73
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
asm/field_map_obj.s
View file

@ -5,20 +5,6 @@
.text .text
thumb_func_start npc_coords_set
@ void npc_coords_set(struct npc_state *fieldObject, u16 x, u16 y)
npc_coords_set: @ 808EAF4
lsls r1, 16
lsrs r1, 16
lsls r2, 16
lsrs r2, 16
strh r1, [r0, 0x14]
strh r2, [r0, 0x16]
strh r1, [r0, 0x10]
strh r2, [r0, 0x12]
bx lr
thumb_func_end npc_coords_set
thumb_func_start sub_808EB08 thumb_func_start sub_808EB08
sub_808EB08: @ 808EB08 sub_808EB08: @ 808EB08
push {r4-r7,lr} push {r4-r7,lr}

8
src/field_map_obj.c
View file

@ -1234,3 +1234,11 @@ void npc_coords_shift(struct MapObject *mapObject, s16 x, s16 y)
mapObject->coords2.y = y; mapObject->coords2.y = y;
} }
/*static*/ void npc_coords_set(struct MapObject *mapObject, s16 x, s16 y)
{
mapObject->coords3.x = x;
mapObject->coords3.y = y;
mapObject->coords2.x = x;
mapObject->coords2.y = y;
}