1 files changed, 0 insertions, 167 deletions
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 5de921af9..ee5aa61c0 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -3517,173 +3517,6 @@ sub_805FD08: @ 805FD08
 
 	.section .text_805fd18
 
-	thumb_func_start sub_8060024
-sub_8060024: @ 8060024
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	adds r7, r0, 0
-	lsls r1, 16
-	lsls r2, 16
-	lsls r3, 24
-	lsrs r3, 24
-	mov r8, r3
-	lsrs r0, r1, 16
-	mov r9, r0
-	asrs r6, r1, 16
-	lsrs r0, r2, 16
-	mov r10, r0
-	asrs r5, r2, 16
-	adds r0, r7, 0
-	adds r1, r6, 0
-	adds r2, r5, 0
-	bl IsCoordOutsideFieldObjectMovementRect
-	lsls r0, 24
-	lsrs r0, 24
-	negs r1, r0
-	orrs r1, r0
-	lsrs r4, r1, 31
-	adds r0, r6, 0
-	adds r1, r5, 0
-	bl MapGridIsImpassableAt
-	lsls r0, 24
-	cmp r0, 0
-	bne _0806009C
-	adds r0, r6, 0
-	adds r1, r5, 0
-	bl GetMapBorderIdAt
-	movs r1, 0x1
-	negs r1, r1
-	cmp r0, r1
-	beq _0806009C
-	adds r0, r7, 0
-	adds r1, r6, 0
-	adds r2, r5, 0
-	mov r3, r8
-	bl IsMetatileDirectionallyImpassable
-	lsls r0, 24
-	cmp r0, 0
-	bne _0806009C
-	ldrb r0, [r7, 0x1]
-	lsrs r0, 7
-	cmp r0, 0
-	beq _080600A0
-	mov r0, r8
-	bl CanCameraMoveInDirection
-	cmp r0, 0
-	bne _080600A0
-_0806009C:
-	movs r0, 0x2
-	orrs r4, r0
-_080600A0:
-	ldrb r0, [r7, 0xB]
-	lsls r0, 28
-	lsrs r0, 28
-	mov r2, r9
-	lsls r1, r2, 16
-	asrs r6, r1, 16
-	mov r2, r10
-	lsls r1, r2, 16
-	asrs r5, r1, 16
-	adds r1, r6, 0
-	adds r2, r5, 0
-	bl IsZCoordMismatchAt
-	lsls r0, 24
-	cmp r0, 0
-	beq _080600C8
-	movs r0, 0x4
-	orrs r4, r0
-	lsls r0, r4, 24
-	lsrs r4, r0, 24
-_080600C8:
-	adds r0, r7, 0
-	adds r1, r6, 0
-	adds r2, r5, 0
-	bl CheckForCollisionBetweenFieldObjects
-	lsls r0, 24
-	cmp r0, 0
-	beq _080600E0
-	movs r0, 0x8
-	orrs r4, r0
-	lsls r0, r4, 24
-	lsrs r4, r0, 24
-_080600E0:
-	adds r0, r4, 0
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8060024
-
-	thumb_func_start IsCoordOutsideFieldObjectMovementRect
-IsCoordOutsideFieldObjectMovementRect: @ 80600F0
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	lsls r1, 16
-	lsrs r3, r1, 16
-	lsls r2, 16
-	lsrs r5, r2, 16
-	ldrb r1, [r4, 0x19]
-	movs r0, 0xF
-	ands r0, r1
-	cmp r0, 0
-	beq _08060128
-	lsls r1, 28
-	lsrs r2, r1, 28
-	ldrh r0, [r4, 0xC]
-	subs r2, r0, r2
-	lsrs r1, 28
-	adds r0, r1
-	lsls r0, 16
-	lsrs r1, r0, 16
-	lsls r2, 16
-	lsls r0, r3, 16
-	asrs r3, r0, 16
-	cmp r2, r0
-	bgt _08060154
-	lsls r0, r1, 16
-	asrs r0, 16
-	cmp r0, r3
-	blt _08060154
-_08060128:
-	ldrb r1, [r4, 0x19]
-	movs r0, 0xF0
-	ands r0, r1
-	cmp r0, 0
-	beq _08060158
-	lsls r1, 24
-	lsrs r2, r1, 28
-	ldrh r0, [r4, 0xE]
-	subs r2, r0, r2
-	lsrs r1, 28
-	adds r0, r1
-	lsls r0, 16
-	lsrs r1, r0, 16
-	lsls r2, 16
-	lsls r0, r5, 16
-	asrs r3, r0, 16
-	cmp r2, r0
-	bgt _08060154
-	lsls r0, r1, 16
-	asrs r0, 16
-	cmp r0, r3
-	bge _08060158
-_08060154:
-	movs r0, 0x1
-	b _0806015A
-_08060158:
-	movs r0, 0
-_0806015A:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end IsCoordOutsideFieldObjectMovementRect
-
 	thumb_func_start IsMetatileDirectionallyImpassable
 IsMetatileDirectionallyImpassable: @ 8060160
 	push {r4-r7,lr}