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

npc_coords_shift_still

Browse source
This commit is contained in:
scnorton 2017-09-10 15:14:46 -04:00
parent 1ed1fbab1c
commit 5bb5886774
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
asm/field_map_obj.s
View file

@ -5,19 +5,6 @@
.text
thumb_func_start npc_coords_shift_still
@ void npc_coords_shift_still(struct npc_state *fieldObject)
npc_coords_shift_still: @ 808EBFC
push {lr}
movs r2, 0x10
ldrsh r1, [r0, r2]
movs r3, 0x12
ldrsh r2, [r0, r3]
bl npc_coords_shift
pop {r0}
bx r0
thumb_func_end npc_coords_shift_still
thumb_func_start UpdateFieldObjectCoordsForCameraUpdate
@ void UpdateFieldObjectCoordsForCameraUpdate()
UpdateFieldObjectCoordsForCameraUpdate: @ 808EC10

5
src/field_map_obj.c
View file

@ -1274,3 +1274,8 @@ void sub_808EBA8(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
}
}
void npc_coords_shift_still(struct MapObject *mapObject)
{
npc_coords_shift(mapObject, mapObject->coords2.x, mapObject->coords2.y);
}