UpdateFieldObjectsForCameraUpdate

2 files changed, 7 insertions, 24 deletions

diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 895607305..400fec15a 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -5,30 +5,6 @@
 
 	.text
 
-	thumb_func_start UpdateFieldObjectsForCameraUpdate
-@ void UpdateFieldObjectsForCameraUpdate(u16 movingCameraOffsetX, u16 movingCameraOffsetY)
-UpdateFieldObjectsForCameraUpdate: @ 808ED08
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r5, 16
-	lsrs r5, 16
-	bl UpdateFieldObjectCoordsForCameraUpdate
-	lsls r4, 16
-	asrs r4, 16
-	lsls r5, 16
-	asrs r5, 16
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl SpawnFieldObjectsInView
-	bl RemoveFieldObjectsOutsideView
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end UpdateFieldObjectsForCameraUpdate
-
 	thumb_func_start AddCameraObject
 @ u8 AddCameraObject(u8 followedObjectId)
 AddCameraObject: @ 808ED34
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index a48a2506e..8214c5efa 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -1329,3 +1329,10 @@ static bool8 FieldObjectDoesZCoordMatch(struct MapObject *mapObject, u8 z)
     }
     return TRUE;
 }
+
+void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y)
+{
+    UpdateFieldObjectCoordsForCameraUpdate();
+    SpawnFieldObjectsInView(x, y);
+    RemoveFieldObjectsOutsideView();
+}