From 812ad017e892ff3d93b3df8310335287a556e871 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 16 Sep 2017 22:19:23 -0400
Subject: [PATCH] sub_80930E0

---
 asm/field_map_obj.s     | 40 ----------------------------------------
 include/field_map_obj.h |  2 +-
 src/field_map_obj.c     |  7 +++++++
 3 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index d01dce512..941c3e7f5 100755
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -5,46 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_80930E0
-sub_80930E0: @ 80930E0
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	adds r6, r0, 0
-	mov r8, r1
-	adds r4, r2, 0
-	adds r5, r3, 0
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r5, 16
-	lsrs r5, 16
-	movs r1, 0
-	ldrsh r0, [r6, r1]
-	mov r2, r8
-	movs r3, 0
-	ldrsh r1, [r2, r3]
-	adds r2, r6, 0
-	mov r3, r8
-	bl sub_8093038
-	lsls r4, 16
-	asrs r4, 16
-	ldrh r0, [r6]
-	adds r4, r0
-	strh r4, [r6]
-	lsls r5, 16
-	asrs r5, 16
-	mov r1, r8
-	ldrh r1, [r1]
-	adds r5, r1
-	mov r2, r8
-	strh r5, [r2]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80930E0
-
 	thumb_func_start GetFieldObjectMovingCameraOffset
 @ void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y)
 GetFieldObjectMovingCameraOffset: @ 809312C
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index a952cfac6..23749c91a 100755
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -37,7 +37,7 @@ void pal_patch_for_npc(u16, u8);
 void sub_808E16C(s16, s16);
 void sub_8092FF0(s16, s16, s16 *, s16 *);
 u8 FieldObjectDirectionToImageAnimId(u8);
-void sub_80930E0(s16 *, s16 *, u8, u8);
+void sub_80930E0(s16 *, s16 *, s16, s16);
 void FieldObjectClearAnim(struct MapObject *);
 void SpawnFieldObjectsInView(s16, s16);
 u8 sprite_new(u8, u8, s16, s16, u8, u8);
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index d4793b0a7..eb9ed2129 100755
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -3863,6 +3863,13 @@ void sub_8093038(s16 x, s16 y, s16 *dest_x, s16 *dest_y)
     *dest_y = ((y - gSaveBlock1Ptr->pos.y) << 4) + dy;
 }
 
+void sub_80930E0(s16 *x, s16 *y, s16 dx, s16 dy)
+{
+    sub_8093038(*x, *y, x, y);
+    *x += dx;
+    *y += dy;
+}
+
 asm(".section .text.get_face_direction_anim_id");
 
 void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *);