Another block of functions for getting anim ids given direction

2 files changed, 11 insertions, 240 deletions

diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 681bb1707..5a7c4061b 100755
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -5,246 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8093648
-sub_8093648: @ 8093648
-	push {r4,lr}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r1, =gUnknown_0850DBF5
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	cmp r4, 0x4
-	bls _08093660
-	movs r4, 0
-_08093660:
-	mov r1, sp
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	add sp, 0x8
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8093648
-
-	thumb_func_start sub_8093674
-sub_8093674: @ 8093674
-	push {r4,lr}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r1, =gUnknown_0850DBFA
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	cmp r4, 0x4
-	bls _0809368C
-	movs r4, 0
-_0809368C:
-	mov r1, sp
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	add sp, 0x8
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8093674
-
-	thumb_func_start sub_80936A0
-sub_80936A0: @ 80936A0
-	push {r4,lr}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r1, =gUnknown_0850DBFF
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	cmp r4, 0x4
-	bls _080936B8
-	movs r4, 0
-_080936B8:
-	mov r1, sp
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	add sp, 0x8
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80936A0
-
-	thumb_func_start sub_80936CC
-sub_80936CC: @ 80936CC
-	push {r4,lr}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r1, =gUnknown_0850DC04
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	cmp r4, 0x4
-	bls _080936E4
-	movs r4, 0
-_080936E4:
-	mov r1, sp
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	add sp, 0x8
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80936CC
-
-	thumb_func_start sub_80936F8
-sub_80936F8: @ 80936F8
-	push {r4,lr}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r1, =gUnknown_0850DC09
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	cmp r4, 0x4
-	bls _08093710
-	movs r4, 0
-_08093710:
-	mov r1, sp
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	add sp, 0x8
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80936F8
-
-	thumb_func_start sub_8093724
-sub_8093724: @ 8093724
-	push {r4,lr}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r1, =gUnknown_0850DC0E
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	cmp r4, 0x4
-	bls _0809373C
-	movs r4, 0
-_0809373C:
-	mov r1, sp
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	add sp, 0x8
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8093724
-
-	thumb_func_start sub_8093750
-sub_8093750: @ 8093750
-	push {r4,lr}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r1, =gUnknown_0850DC13
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	cmp r4, 0x4
-	bls _08093768
-	movs r4, 0
-_08093768:
-	mov r1, sp
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	add sp, 0x8
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8093750
-
-	thumb_func_start sub_809377C
-sub_809377C: @ 809377C
-	push {r4,lr}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r1, =gUnknown_0850DC18
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	cmp r4, 0x4
-	bls _08093794
-	movs r4, 0
-_08093794:
-	mov r1, sp
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	add sp, 0x8
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_809377C
-
-	thumb_func_start sub_80937A8
-sub_80937A8: @ 80937A8
-	push {r4,lr}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r1, =gUnknown_0850DC1D
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	cmp r4, 0x4
-	bls _080937C0
-	movs r4, 0
-_080937C0:
-	mov r1, sp
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	add sp, 0x8
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80937A8
-
-	thumb_func_start d2s_08064034
-d2s_08064034: @ 80937D4
-	push {r4,lr}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r1, =gUnknown_0850DC22
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	cmp r4, 0x4
-	bls _080937EC
-	movs r4, 0
-_080937EC:
-	mov r1, sp
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	add sp, 0x8
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end d2s_08064034
-
 	thumb_func_start GetOppositeDirection
 @ u8 GetOppositeDirection(u8 direction)
 GetOppositeDirection: @ 8093800
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 6e2512000..d0673fdbe 100755
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -4047,3 +4047,14 @@ bool8 FieldObjectFaceOppositeDirection(struct MapObject *mapObject, u8 direction
 {
     return FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(GetOppositeDirection(direction)));
 }
+
+dirn2anim_2(sub_8093648, gUnknown_0850DBF5);
+dirn2anim_2(sub_8093674, gUnknown_0850DBFA);
+dirn2anim_2(sub_80936A0, gUnknown_0850DBFF);
+dirn2anim_2(sub_80936CC, gUnknown_0850DC04);
+dirn2anim_2(sub_80936F8, gUnknown_0850DC09);
+dirn2anim_2(sub_8093724, gUnknown_0850DC0E);
+dirn2anim_2(sub_8093750, gUnknown_0850DC13);
+dirn2anim_2(sub_809377C, gUnknown_0850DC18);
+dirn2anim_2(sub_80937A8, gUnknown_0850DC1D);
+dirn2anim_2(d2s_08064034, gUnknown_0850DC22);