Create and propagate field map object callback declaration macro

1 files changed, 0 insertions, 143 deletions

diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index c3b867525..3db00279d 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -6,149 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_805E278
-sub_805E278: @ 805E278
-	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, _0805E294 @ =gMapObjects
-	adds r0, r2
-	ldr r2, _0805E298 @ =sub_805E29C
-	bl meta_step
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805E294: .4byte gMapObjects
-_0805E298: .4byte sub_805E29C
-	thumb_func_end sub_805E278
-
-	thumb_func_start sub_805E29C
-sub_805E29C: @ 805E29C
-	push {r4,lr}
-	ldr r3, _0805E2B8 @ =gUnknown_083753E4
-	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
-_0805E2B8: .4byte gUnknown_083753E4
-	thumb_func_end sub_805E29C
-
-	thumb_func_start sub_805E2BC
-sub_805E2BC: @ 805E2BC
-	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
-	movs r0, 0x1
-	strh r0, [r5, 0x30]
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805E2BC
-
-	thumb_func_start sub_805E2E8
-sub_805E2E8: @ 805E2E8
-	push {r4,lr}
-	adds r4, r1, 0
-	bl FieldObjectExecRegularAnim
-	lsls r0, 24
-	cmp r0, 0
-	beq _0805E302
-	adds r0, r4, 0
-	movs r1, 0x30
-	bl sub_8064820
-	movs r0, 0x2
-	strh r0, [r4, 0x30]
-_0805E302:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805E2E8
-
-	thumb_func_start sub_805E30C
-sub_805E30C: @ 805E30C
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r0, r5, 0
-	bl sub_8064824
-	lsls r0, 24
-	cmp r0, 0
-	bne _0805E32A
-	adds r0, r4, 0
-	bl FieldObjectIsTrainerAndCloseToPlayer
-	lsls r0, 24
-	cmp r0, 0
-	beq _0805E32E
-_0805E32A:
-	movs r0, 0x3
-	strh r0, [r5, 0x30]
-_0805E32E:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805E30C
-
-	thumb_func_start sub_805E338
-sub_805E338: @ 805E338
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldr r1, _0805E378 @ =gUnknown_083753F4
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_805CD60
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	bne _0805E364
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	add r0, sp
-	ldrb r1, [r0]
-_0805E364:
-	adds r0, r4, 0
-	bl FieldObjectSetDirection
-	movs r0, 0
-	strh r0, [r5, 0x30]
-	movs r0, 0x1
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805E378: .4byte gUnknown_083753F4
-	thumb_func_end sub_805E338
-
 	thumb_func_start sub_805E37C
 sub_805E37C: @ 805E37C
 	push {lr}