yet more an_walk_any_2_macro functions

2017-09-17 10:29:57 -04:00
parent f8b08d3ee7
commit 384ca4658b
2 changed files with 34 additions and 180 deletions
@@ -5,156 +5,6 @@

 	.text

-	thumb_func_start do_run_south_anim
-@ bool8 do_run_south_anim(struct npc_state *fieldObject, struct obj *object)
-do_run_south_anim: @ 8094C80
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r2, 0x1
-	bl do_run_anim
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8094CA0
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end do_run_south_anim
-
-	thumb_func_start sub_8094CA0
-@ bool8 sub_8094CA0(struct npc_state *fieldObject, struct obj *object)
-sub_8094CA0: @ 8094CA0
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_obj_ministep_stop_on_arrival
-	lsls r0, 24
-	cmp r0, 0
-	bne _08094CB2
-	movs r0, 0
-	b _08094CB8
-_08094CB2:
-	movs r0, 0x2
-	strh r0, [r4, 0x32]
-	movs r0, 0x1
-_08094CB8:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094CA0
-
-	thumb_func_start do_run_north_anim
-do_run_north_anim: @ 8094CC0
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r2, 0x2
-	bl do_run_anim
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8094CE0
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end do_run_north_anim
-
-	thumb_func_start sub_8094CE0
-sub_8094CE0: @ 8094CE0
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_obj_ministep_stop_on_arrival
-	lsls r0, 24
-	cmp r0, 0
-	bne _08094CF2
-	movs r0, 0
-	b _08094CF8
-_08094CF2:
-	movs r0, 0x2
-	strh r0, [r4, 0x32]
-	movs r0, 0x1
-_08094CF8:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094CE0
-
-	thumb_func_start do_run_west_anim
-do_run_west_anim: @ 8094D00
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r2, 0x3
-	bl do_run_anim
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8094D20
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end do_run_west_anim
-
-	thumb_func_start sub_8094D20
-sub_8094D20: @ 8094D20
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_obj_ministep_stop_on_arrival
-	lsls r0, 24
-	cmp r0, 0
-	bne _08094D32
-	movs r0, 0
-	b _08094D38
-_08094D32:
-	movs r0, 0x2
-	strh r0, [r4, 0x32]
-	movs r0, 0x1
-_08094D38:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094D20
-
-	thumb_func_start do_run_east_anim
-do_run_east_anim: @ 8094D40
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	movs r2, 0x4
-	bl do_run_anim
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_8094D60
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end do_run_east_anim
-
-	thumb_func_start sub_8094D60
-sub_8094D60: @ 8094D60
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_obj_ministep_stop_on_arrival
-	lsls r0, 24
-	cmp r0, 0
-	bne _08094D72
-	movs r0, 0
-	b _08094D78
-_08094D72:
-	movs r0, 0x2
-	strh r0, [r4, 0x32]
-	movs r0, 0x1
-_08094D78:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8094D60
-
 	thumb_func_start npc_set_direction_and_anim__an_proceed
 npc_set_direction_and_anim__an_proceed: @ 8094D80
 	push {r4-r6,lr}