LookRandomDirections helpers

2017-09-13 21:11:59 -04:00
parent 2895765964
commit c1c12981fe
2 changed files with 51 additions and 137 deletions
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -5,143 +5,6 @@

 	.text

-	thumb_func_start sub_808F988
-@ bool8 sub_808F988(struct npc_state *fieldObject, struct obj *object)
-sub_808F988: @ 808F988
-	push {r4,lr}
-	adds r4, r1, 0
-	bl npc_reset
-	movs r0, 0x1
-	strh r0, [r4, 0x30]
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_808F988
-
-	thumb_func_start sub_808F99C
-@ bool8 sub_808F99C(struct npc_state *fieldObject, struct obj *object)
-sub_808F99C: @ 808F99C
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	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, 0x2
-	strh r0, [r5, 0x30]
-	movs r0, 0x1
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_808F99C
-
-	thumb_func_start sub_808F9C8
-@ bool8 sub_808F9C8(struct npc_state *fieldObject, struct obj *object)
-sub_808F9C8: @ 808F9C8
-	push {r4-r7,lr}
-	adds r6, r0, 0
-	adds r7, r1, 0
-	bl FieldObjectExecRegularAnim
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808F9FE
-	ldr r4, =gUnknown_0850D6DC
-	bl Random
-	movs r5, 0x3
-	adds r1, r5, 0
-	ands r1, r0
-	lsls r1, 1
-	adds r1, r4
-	movs r0, 0
-	ldrsh r1, [r1, r0]
-	adds r0, r7, 0
-	bl sub_8097978
-	ldrb r1, [r6]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r6]
-	strh r5, [r7, 0x30]
-_0808F9FE:
-	movs r0, 0
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_808F9C8
-
-	thumb_func_start sub_808FA0C
-@ bool8 sub_808FA0C(struct npc_state *fieldObject, struct obj *object)
-sub_808FA0C: @ 808FA0C
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r0, r5, 0
-	bl sub_809797C
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808FA2A
-	adds r0, r4, 0
-	bl FieldObjectIsTrainerAndCloseToPlayer
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808FA32
-_0808FA2A:
-	movs r0, 0x4
-	strh r0, [r5, 0x30]
-	movs r0, 0x1
-	b _0808FA34
-_0808FA32:
-	movs r0, 0
-_0808FA34:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_808FA0C
-
-	thumb_func_start sub_808FA3C
-@ bool8 sub_808FA3C(struct npc_state *fieldObject, struct obj *object)
-sub_808FA3C: @ 808FA3C
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldr r1, =gUnknown_0850D710
-	mov r0, sp
-	movs r2, 0x4
-	bl memcpy
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_808F8BC
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	bne _0808FA6C
-	bl Random
-	movs r1, 0x3
-	ands r1, r0
-	mov r2, sp
-	adds r0, r2, r1
-	ldrb r1, [r0]
-_0808FA6C:
-	adds r0, r4, 0
-	bl FieldObjectSetDirection
-	movs r0, 0x1
-	strh r0, [r5, 0x30]
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_808FA3C
-
 	thumb_func_start FieldObjectCB_RandomlyGoNorthOrSouth
 FieldObjectCB_RandomlyGoNorthOrSouth: @ 808FA84
 	push {lr}