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

---
 asm/field_map_obj.s | 40 ----------------------------------------
 src/field_map_obj.c | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 941c3e7f55..79786b2080 100755
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -5,46 +5,6 @@
 
 	.text
 
-	thumb_func_start GetFieldObjectMovingCameraOffset
-@ void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y)
-GetFieldObjectMovingCameraOffset: @ 809312C
-	push {lr}
-	adds r2, r0, 0
-	movs r0, 0
-	strh r0, [r2]
-	strh r0, [r1]
-	ldr r3, =gUnknown_03005DD0
-	ldr r0, [r3, 0x10]
-	cmp r0, 0
-	ble _08093142
-	movs r0, 0x1
-	strh r0, [r2]
-_08093142:
-	ldr r0, [r3, 0x10]
-	cmp r0, 0
-	bge _0809314E
-	ldrh r0, [r2]
-	subs r0, 0x1
-	strh r0, [r2]
-_0809314E:
-	ldr r2, [r3, 0x14]
-	cmp r2, 0
-	ble _0809315A
-	ldrh r0, [r1]
-	adds r0, 0x1
-	strh r0, [r1]
-_0809315A:
-	cmp r2, 0
-	bge _08093164
-	ldrh r0, [r1]
-	subs r0, 0x1
-	strh r0, [r1]
-_08093164:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end GetFieldObjectMovingCameraOffset
-
 	thumb_func_start FieldObjectMoveDestCoords
 @ void FieldObjectMoveDestCoords(struct npc_state *fieldObject, u8 direction)
 FieldObjectMoveDestCoords: @ 809316C
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index eb9ed21296..de72478cf2 100755
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -3870,6 +3870,28 @@ void sub_80930E0(s16 *x, s16 *y, s16 dx, s16 dy)
     *y += dy;
 }
 
+void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y)
+{
+    *x = 0;
+    *y = 0;
+    if (gUnknown_03005DD0.x > 0)
+    {
+        (*x) ++;
+    }
+    if (gUnknown_03005DD0.x < 0)
+    {
+        (*x) --;
+    }
+    if (gUnknown_03005DD0.y > 0)
+    {
+        (*y) ++;
+    }
+    if (gUnknown_03005DD0.y < 0)
+    {
+        (*y) --;
+    }
+}
+
 asm(".section .text.get_face_direction_anim_id");
 
 void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *);