diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 3fcc3dfbf..d1d4596eb 100755
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -5,462 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8094980
-sub_8094980: @ 8094980
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r2, 0x1
-	movs r3, 0x2
-	bl do_go_anim
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_80949A0
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094980
-
-	thumb_func_start sub_80949A0
-sub_80949A0: @ 80949A0
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_obj_ministep_stop_on_arrival
-	lsls r0, 24
-	cmp r0, 0
-	bne _080949B2
-	movs r0, 0
-	b _080949B8
-_080949B2:
-	movs r0, 0x2
-	strh r0, [r4, 0x32]
-	movs r0, 0x1
-_080949B8:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80949A0
-
-	thumb_func_start sub_80949C0
-sub_80949C0: @ 80949C0
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r2, 0x2
-	movs r3, 0x2
-	bl do_go_anim
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_80949E0
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80949C0
-
-	thumb_func_start sub_80949E0
-sub_80949E0: @ 80949E0
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_obj_ministep_stop_on_arrival
-	lsls r0, 24
-	cmp r0, 0
-	bne _080949F2
-	movs r0, 0
-	b _080949F8
-_080949F2:
-	movs r0, 0x2
-	strh r0, [r4, 0x32]
-	movs r0, 0x1
-_080949F8:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80949E0
-
-	thumb_func_start sub_8094A00
-sub_8094A00: @ 8094A00
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r2, 0x3
-	movs r3, 0x2
-	bl do_go_anim
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8094A20
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094A00
-
-	thumb_func_start sub_8094A20
-sub_8094A20: @ 8094A20
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_obj_ministep_stop_on_arrival
-	lsls r0, 24
-	cmp r0, 0
-	bne _08094A32
-	movs r0, 0
-	b _08094A38
-_08094A32:
-	movs r0, 0x2
-	strh r0, [r4, 0x32]
-	movs r0, 0x1
-_08094A38:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094A20
-
-	thumb_func_start sub_8094A40
-sub_8094A40: @ 8094A40
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r2, 0x4
-	movs r3, 0x2
-	bl do_go_anim
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8094A60
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094A40
-
-	thumb_func_start sub_8094A60
-sub_8094A60: @ 8094A60
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_obj_ministep_stop_on_arrival
-	lsls r0, 24
-	cmp r0, 0
-	bne _08094A72
-	movs r0, 0
-	b _08094A78
-_08094A72:
-	movs r0, 0x2
-	strh r0, [r4, 0x32]
-	movs r0, 0x1
-_08094A78:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094A60
-
-	thumb_func_start sub_8094A80
-sub_8094A80: @ 8094A80
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r2, 0x1
-	movs r3, 0x3
-	bl do_go_anim
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8094AA0
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094A80
-
-	thumb_func_start sub_8094AA0
-sub_8094AA0: @ 8094AA0
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_obj_ministep_stop_on_arrival
-	lsls r0, 24
-	cmp r0, 0
-	bne _08094AB2
-	movs r0, 0
-	b _08094AB8
-_08094AB2:
-	movs r0, 0x2
-	strh r0, [r4, 0x32]
-	movs r0, 0x1
-_08094AB8:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094AA0
-
-	thumb_func_start sub_8094AC0
-sub_8094AC0: @ 8094AC0
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r2, 0x2
-	movs r3, 0x3
-	bl do_go_anim
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8094AE0
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094AC0
-
-	thumb_func_start sub_8094AE0
-sub_8094AE0: @ 8094AE0
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_obj_ministep_stop_on_arrival
-	lsls r0, 24
-	cmp r0, 0
-	bne _08094AF2
-	movs r0, 0
-	b _08094AF8
-_08094AF2:
-	movs r0, 0x2
-	strh r0, [r4, 0x32]
-	movs r0, 0x1
-_08094AF8:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094AE0
-
-	thumb_func_start sub_8094B00
-sub_8094B00: @ 8094B00
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r2, 0x3
-	movs r3, 0x3
-	bl do_go_anim
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8094B20
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094B00
-
-	thumb_func_start sub_8094B20
-sub_8094B20: @ 8094B20
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_obj_ministep_stop_on_arrival
-	lsls r0, 24
-	cmp r0, 0
-	bne _08094B32
-	movs r0, 0
-	b _08094B38
-_08094B32:
-	movs r0, 0x2
-	strh r0, [r4, 0x32]
-	movs r0, 0x1
-_08094B38:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094B20
-
-	thumb_func_start sub_8094B40
-sub_8094B40: @ 8094B40
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r2, 0x4
-	movs r3, 0x3
-	bl do_go_anim
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8094B60
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094B40
-
-	thumb_func_start sub_8094B60
-sub_8094B60: @ 8094B60
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_obj_ministep_stop_on_arrival
-	lsls r0, 24
-	cmp r0, 0
-	bne _08094B72
-	movs r0, 0
-	b _08094B78
-_08094B72:
-	movs r0, 0x2
-	strh r0, [r4, 0x32]
-	movs r0, 0x1
-_08094B78:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094B60
-
-	thumb_func_start sub_8094B80
-sub_8094B80: @ 8094B80
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r2, 0x1
-	movs r3, 0x4
-	bl do_go_anim
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8094BA0
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094B80
-
-	thumb_func_start sub_8094BA0
-sub_8094BA0: @ 8094BA0
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_obj_ministep_stop_on_arrival
-	lsls r0, 24
-	cmp r0, 0
-	bne _08094BB2
-	movs r0, 0
-	b _08094BB8
-_08094BB2:
-	movs r0, 0x2
-	strh r0, [r4, 0x32]
-	movs r0, 0x1
-_08094BB8:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094BA0
-
-	thumb_func_start sub_8094BC0
-sub_8094BC0: @ 8094BC0
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r2, 0x2
-	movs r3, 0x4
-	bl do_go_anim
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8094BE0
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094BC0
-
-	thumb_func_start sub_8094BE0
-sub_8094BE0: @ 8094BE0
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_obj_ministep_stop_on_arrival
-	lsls r0, 24
-	cmp r0, 0
-	bne _08094BF2
-	movs r0, 0
-	b _08094BF8
-_08094BF2:
-	movs r0, 0x2
-	strh r0, [r4, 0x32]
-	movs r0, 0x1
-_08094BF8:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094BE0
-
-	thumb_func_start sub_8094C00
-sub_8094C00: @ 8094C00
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r2, 0x3
-	movs r3, 0x4
-	bl do_go_anim
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8094C20
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094C00
-
-	thumb_func_start sub_8094C20
-sub_8094C20: @ 8094C20
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_obj_ministep_stop_on_arrival
-	lsls r0, 24
-	cmp r0, 0
-	bne _08094C32
-	movs r0, 0
-	b _08094C38
-_08094C32:
-	movs r0, 0x2
-	strh r0, [r4, 0x32]
-	movs r0, 0x1
-_08094C38:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094C20
-
-	thumb_func_start sub_8094C40
-sub_8094C40: @ 8094C40
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r2, 0x4
-	movs r3, 0x4
-	bl do_go_anim
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8094C60
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094C40
-
-	thumb_func_start sub_8094C60
-sub_8094C60: @ 8094C60
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_obj_ministep_stop_on_arrival
-	lsls r0, 24
-	cmp r0, 0
-	bne _08094C72
-	movs r0, 0
-	b _08094C78
-_08094C72:
-	movs r0, 0x2
-	strh r0, [r4, 0x32]
-	movs r0, 0x1
-_08094C78:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094C60
-
 	thumb_func_start do_run_south_anim
 @ bool8 do_run_south_anim(struct npc_state *fieldObject, struct obj *object)
 do_run_south_anim: @ 8094C80
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index e6a4c4181..c4847ae4f 100755
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -4470,3 +4470,16 @@ special_anim_with_timer_2(sub_80948A0, DIR_SOUTH, go_faster,  4, sub_809459C)
 special_anim_with_timer_2(sub_80948D8, DIR_NORTH, go_faster,  4, sub_809459C)
 special_anim_with_timer_2(sub_8094910, DIR_WEST,  go_faster,  4, sub_809459C)
 special_anim_with_timer_2(sub_8094948, DIR_EAST,  go_faster,  4, sub_809459C)
+
+an_walk_any_2_macro(sub_8094980, do_go_anim, npc_obj_ministep_stop_on_arrival, 1, 2)
+an_walk_any_2_macro(sub_80949C0, do_go_anim, npc_obj_ministep_stop_on_arrival, 2, 2)
+an_walk_any_2_macro(sub_8094A00, do_go_anim, npc_obj_ministep_stop_on_arrival, 3, 2)
+an_walk_any_2_macro(sub_8094A40, do_go_anim, npc_obj_ministep_stop_on_arrival, 4, 2)
+an_walk_any_2_macro(sub_8094A80, do_go_anim, npc_obj_ministep_stop_on_arrival, 1, 3)
+an_walk_any_2_macro(sub_8094AC0, do_go_anim, npc_obj_ministep_stop_on_arrival, 2, 3)
+an_walk_any_2_macro(sub_8094B00, do_go_anim, npc_obj_ministep_stop_on_arrival, 3, 3)
+an_walk_any_2_macro(sub_8094B40, do_go_anim, npc_obj_ministep_stop_on_arrival, 4, 3)
+an_walk_any_2_macro(sub_8094B80, do_go_anim, npc_obj_ministep_stop_on_arrival, 1, 4)
+an_walk_any_2_macro(sub_8094BC0, do_go_anim, npc_obj_ministep_stop_on_arrival, 2, 4)
+an_walk_any_2_macro(sub_8094C00, do_go_anim, npc_obj_ministep_stop_on_arrival, 3, 4)
+an_walk_any_2_macro(sub_8094C40, do_go_anim, npc_obj_ministep_stop_on_arrival, 4, 4)