another block of directional anim functions

2 files changed, 20 insertions, 240 deletions

diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 5831f7213..088fd279a 100755
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -5,246 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8095940
-sub_8095940: @ 8095940
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r0, 0x1
-	bl sub_80929BC
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x1
-	bl npc_set_direction_and_anim__an_proceed
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8095940
-
-	thumb_func_start sub_8095964
-sub_8095964: @ 8095964
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r0, 0x2
-	bl sub_80929BC
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x2
-	bl npc_set_direction_and_anim__an_proceed
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8095964
-
-	thumb_func_start sub_8095988
-sub_8095988: @ 8095988
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r0, 0x3
-	bl sub_80929BC
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x3
-	bl npc_set_direction_and_anim__an_proceed
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8095988
-
-	thumb_func_start sub_80959AC
-sub_80959AC: @ 80959AC
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r0, 0x4
-	bl sub_80929BC
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x4
-	bl npc_set_direction_and_anim__an_proceed
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80959AC
-
-	thumb_func_start sub_80959D0
-sub_80959D0: @ 80959D0
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r0, 0x1
-	bl sub_80929DC
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x1
-	bl npc_set_direction_and_anim__an_proceed
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80959D0
-
-	thumb_func_start sub_80959F4
-sub_80959F4: @ 80959F4
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r0, 0x2
-	bl sub_80929DC
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x2
-	bl npc_set_direction_and_anim__an_proceed
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80959F4
-
-	thumb_func_start sub_8095A18
-sub_8095A18: @ 8095A18
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r0, 0x3
-	bl sub_80929DC
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x3
-	bl npc_set_direction_and_anim__an_proceed
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8095A18
-
-	thumb_func_start sub_8095A3C
-sub_8095A3C: @ 8095A3C
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r0, 0x4
-	bl sub_80929DC
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x4
-	bl npc_set_direction_and_anim__an_proceed
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8095A3C
-
-	thumb_func_start sub_8095A60
-sub_8095A60: @ 8095A60
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r0, 0x1
-	bl sub_80929EC
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x1
-	bl npc_set_direction_and_anim__an_proceed
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8095A60
-
-	thumb_func_start sub_8095A84
-sub_8095A84: @ 8095A84
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r0, 0x2
-	bl sub_80929EC
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x2
-	bl npc_set_direction_and_anim__an_proceed
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8095A84
-
-	thumb_func_start sub_8095AA8
-sub_8095AA8: @ 8095AA8
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r0, 0x3
-	bl sub_80929EC
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x3
-	bl npc_set_direction_and_anim__an_proceed
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8095AA8
-
-	thumb_func_start sub_8095ACC
-sub_8095ACC: @ 8095ACC
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r0, 0x4
-	bl sub_80929EC
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x4
-	bl npc_set_direction_and_anim__an_proceed
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8095ACC
-
 	thumb_func_start sub_8095AF0
 sub_8095AF0: @ 8095AF0
 	push {r4,lr}
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index a5c3c013f..3e1e3d19e 100755
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -4856,3 +4856,23 @@ bool8 sub_8095930(struct MapObject *mapObject, struct Sprite *sprite)
     sub_80958C0(mapObject, sprite, DIR_EAST);
     return TRUE;
 }
+
+#define set_dirn_and_anim__an_proceed(name, direction, anims)\
+bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\
+{\
+    npc_set_direction_and_anim__an_proceed(mapObject, sprite, direction, anims(direction));\
+    return FALSE;\
+}
+
+set_dirn_and_anim__an_proceed(sub_8095940, DIR_SOUTH, sub_80929BC)
+set_dirn_and_anim__an_proceed(sub_8095964, DIR_NORTH, sub_80929BC)
+set_dirn_and_anim__an_proceed(sub_8095988, DIR_WEST,  sub_80929BC)
+set_dirn_and_anim__an_proceed(sub_80959AC, DIR_EAST,  sub_80929BC)
+set_dirn_and_anim__an_proceed(sub_80959D0, DIR_SOUTH, sub_80929DC)
+set_dirn_and_anim__an_proceed(sub_80959F4, DIR_NORTH, sub_80929DC)
+set_dirn_and_anim__an_proceed(sub_8095A18, DIR_WEST,  sub_80929DC)
+set_dirn_and_anim__an_proceed(sub_8095A3C, DIR_EAST,  sub_80929DC)
+set_dirn_and_anim__an_proceed(sub_8095A60, DIR_SOUTH, sub_80929EC)
+set_dirn_and_anim__an_proceed(sub_8095A84, DIR_NORTH, sub_80929EC)
+set_dirn_and_anim__an_proceed(sub_8095AA8, DIR_WEST,  sub_80929EC)
+set_dirn_and_anim__an_proceed(sub_8095ACC, DIR_EAST,  sub_80929EC)