diff options
| author | scnorton <scnorton@biociphers.org> | 2017-09-10 15:14:46 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-09-10 15:14:46 -0400 |
| commit | 5bb58867748b91de2c20860d73b1a36896f11dd1 (patch) | |
| tree | 4b81da13a2c18738108f1d54e0adab237f74ebcd | |
| parent | 1ed1fbab1ca140edebb7ec1ebfabaaaf04f9c054 (diff) | |
npc_coords_shift_still
| -rw-r--r-- | asm/field_map_obj.s | 13 | ||||
| -rw-r--r-- | src/field_map_obj.c | 5 |
2 files changed, 5 insertions, 13 deletions
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index bb7c95ef4..c15cd3320 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -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 diff --git a/src/field_map_obj.c b/src/field_map_obj.c index 7465370b9..1a4ab1a74 100644 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -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); +} + |