Finish field map object callbacks (except functions known or predicted not to match)

1 files changed, 0 insertions, 287 deletions

diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index d5d41a5e2..61eb3c7fe 100644..100755
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -626,293 +626,6 @@ _0805F8C0:
 	.align 2, 0
 _0805F8DC: .4byte gUnknown_0836DC09
 	thumb_func_end oac_hopping
-
-.section .text_fmocb2_asm
-
-	thumb_func_start sub_805FB20
-sub_805FB20: @ 805FB20
-	push {lr}
-	adds r1, r0, 0
-	movs r0, 0x2E
-	ldrsh r2, [r1, r0]
-	lsls r0, r2, 3
-	adds r0, r2
-	lsls r0, 2
-	ldr r2, _0805FB3C @ =gMapObjects
-	adds r0, r2
-	ldr r2, _0805FB40 @ =sub_805FB44
-	bl meta_step
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805FB3C: .4byte gMapObjects
-_0805FB40: .4byte sub_805FB44
-	thumb_func_end sub_805FB20
-
-	thumb_func_start sub_805FB44
-sub_805FB44: @ 805FB44
-	push {r4,lr}
-	ldr r3, _0805FB60 @ =gUnknown_083755D0
-	movs r4, 0x30
-	ldrsh r2, [r1, r4]
-	lsls r2, 2
-	adds r2, r3
-	ldr r2, [r2]
-	bl _call_via_r2
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805FB60: .4byte gUnknown_083755D0
-	thumb_func_end sub_805FB44
-
-	thumb_func_start sub_805FB64
-sub_805FB64: @ 805FB64
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl npc_reset
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetStepInPlaceDelay16AnimId
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetRegularAnim
-	movs r0, 0x1
-	strh r0, [r5, 0x30]
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805FB64
-
-	thumb_func_start sub_805FB90
-sub_805FB90: @ 805FB90
-	push {lr}
-	adds r1, r0, 0
-	movs r0, 0x2E
-	ldrsh r2, [r1, r0]
-	lsls r0, r2, 3
-	adds r0, r2
-	lsls r0, 2
-	ldr r2, _0805FBAC @ =gMapObjects
-	adds r0, r2
-	ldr r2, _0805FBB0 @ =sub_805FBB4
-	bl meta_step
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805FBAC: .4byte gMapObjects
-_0805FBB0: .4byte sub_805FBB4
-	thumb_func_end sub_805FB90
-
-	thumb_func_start sub_805FBB4
-sub_805FBB4: @ 805FBB4
-	push {r4,lr}
-	ldr r3, _0805FBD0 @ =gUnknown_083755D8
-	movs r4, 0x30
-	ldrsh r2, [r1, r4]
-	lsls r2, 2
-	adds r2, r3
-	ldr r2, [r2]
-	bl _call_via_r2
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805FBD0: .4byte gUnknown_083755D8
-	thumb_func_end sub_805FBB4
-
-	thumb_func_start sub_805FBD4
-sub_805FBD4: @ 805FBD4
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl npc_reset
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetStepInPlaceDelay8AnimId
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetRegularAnim
-	movs r0, 0x1
-	strh r0, [r5, 0x30]
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805FBD4
-
-	thumb_func_start sub_805FC00
-sub_805FC00: @ 805FC00
-	push {lr}
-	adds r1, r0, 0
-	movs r0, 0x2E
-	ldrsh r2, [r1, r0]
-	lsls r0, r2, 3
-	adds r0, r2
-	lsls r0, 2
-	ldr r2, _0805FC1C @ =gMapObjects
-	adds r0, r2
-	ldr r2, _0805FC20 @ =sub_805FC24
-	bl meta_step
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805FC1C: .4byte gMapObjects
-_0805FC20: .4byte sub_805FC24
-	thumb_func_end sub_805FC00
-
-	thumb_func_start sub_805FC24
-sub_805FC24: @ 805FC24
-	push {r4,lr}
-	ldr r3, _0805FC40 @ =gUnknown_083755E0
-	movs r4, 0x30
-	ldrsh r2, [r1, r4]
-	lsls r2, 2
-	adds r2, r3
-	ldr r2, [r2]
-	bl _call_via_r2
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805FC40: .4byte gUnknown_083755E0
-	thumb_func_end sub_805FC24
-
-	thumb_func_start sub_805FC44
-sub_805FC44: @ 805FC44
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl npc_reset
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetStepInPlaceDelay4AnimId
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetRegularAnim
-	movs r0, 0x1
-	strh r0, [r5, 0x30]
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805FC44
-
-	thumb_func_start sub_805FC70
-sub_805FC70: @ 805FC70
-	push {lr}
-	adds r1, r0, 0
-	movs r0, 0x2E
-	ldrsh r2, [r1, r0]
-	lsls r0, r2, 3
-	adds r0, r2
-	lsls r0, 2
-	ldr r2, _0805FC8C @ =gMapObjects
-	adds r0, r2
-	ldr r2, _0805FC90 @ =sub_805FC94
-	bl meta_step
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805FC8C: .4byte gMapObjects
-_0805FC90: .4byte sub_805FC94
-	thumb_func_end sub_805FC70
-
-	thumb_func_start sub_805FC94
-sub_805FC94: @ 805FC94
-	push {r4,lr}
-	ldr r3, _0805FCB0 @ =gUnknown_083755E8
-	movs r4, 0x30
-	ldrsh r2, [r1, r4]
-	lsls r2, 2
-	adds r2, r3
-	ldr r2, [r2]
-	bl _call_via_r2
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805FCB0: .4byte gUnknown_083755E8
-	thumb_func_end sub_805FC94
-
-	thumb_func_start sub_805FCB4
-sub_805FCB4: @ 805FCB4
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl npc_reset
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetFaceDirectionAnimId
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetRegularAnim
-	ldrb r0, [r4, 0x1]
-	movs r1, 0x20
-	orrs r0, r1
-	strb r0, [r4, 0x1]
-	movs r0, 0x1
-	strh r0, [r5, 0x30]
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805FCB4
-
-	thumb_func_start sub_805FCE8
-sub_805FCE8: @ 805FCE8
-	push {r4,lr}
-	adds r4, r1, 0
-	bl FieldObjectExecRegularAnim
-	lsls r0, 24
-	cmp r0, 0
-	bne _0805FCFA
-	movs r0, 0
-	b _0805FD00
-_0805FCFA:
-	movs r0, 0x2
-	strh r0, [r4, 0x30]
-	movs r0, 0x1
-_0805FD00:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805FCE8
-
-	thumb_func_start sub_805FD08
-sub_805FD08: @ 805FD08
-	ldrb r2, [r0]
-	movs r1, 0x3
-	negs r1, r1
-	ands r1, r2
-	strb r1, [r0]
-	movs r0, 0
-	bx lr
-	.align 2, 0
-	thumb_func_end sub_805FD08
-
 	.section .text_805fd18
 
 	thumb_func_start sub_80615CC