Support functions for GoRandomDirections

2017-09-13 10:59:25 -04:00
parent 28b272bf52
commit e26501f130
4 changed files with 82 additions and 175 deletions
@@ -5,180 +5,6 @@

 	.text

-	thumb_func_start sub_808F44C
-sub_808F44C: @ 808F44C
-	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_808F44C
-
-	thumb_func_start sub_808F460
-sub_808F460: @ 808F460
-	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_808F460
-
-	thumb_func_start sub_808F48C
-sub_808F48C: @ 808F48C
-	push {r4-r6,lr}
-	adds r6, r1, 0
-	bl FieldObjectExecRegularAnim
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808F4C0
-	ldr r5, =gUnknown_0850D6DC
-	bl Random
-	movs r4, 0x3
-	adds r1, r4, 0
-	ands r1, r0
-	lsls r1, 1
-	adds r1, r5
-	movs r0, 0
-	ldrsh r1, [r1, r0]
-	adds r0, r6, 0
-	bl sub_8097978
-	strh r4, [r6, 0x30]
-	movs r0, 0x1
-	b _0808F4C2
-	.pool
-_0808F4C0:
-	movs r0, 0
-_0808F4C2:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_808F48C
-
-	thumb_func_start sub_808F4C8
-sub_808F4C8: @ 808F4C8
-	push {r4,lr}
-	adds r4, r1, 0
-	adds r0, r4, 0
-	bl sub_809797C
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808F4DC
-	movs r0, 0
-	b _0808F4E2
-_0808F4DC:
-	movs r0, 0x4
-	strh r0, [r4, 0x30]
-	movs r0, 0x1
-_0808F4E2:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_808F4C8
-
-	thumb_func_start sub_808F4E8
-sub_808F4E8: @ 808F4E8
-	push {r4-r6,lr}
-	sub sp, 0x4
-	adds r5, r0, 0
-	adds r6, r1, 0
-	ldr r1, =gUnknown_0850D710
-	mov r0, sp
-	movs r2, 0x4
-	bl memcpy
-	bl Random
-	movs r1, 0x3
-	ands r1, r0
-	mov r2, sp
-	adds r0, r2, r1
-	ldrb r4, [r0]
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl FieldObjectSetDirection
-	movs r0, 0x5
-	strh r0, [r6, 0x30]
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl sub_8092B88
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808F526
-	movs r0, 0x1
-	strh r0, [r6, 0x30]
-_0808F526:
-	movs r0, 0x1
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_808F4E8
-
-	thumb_func_start sub_808F534
-sub_808F534: @ 808F534
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4, 0x18]
-	lsrs r0, 4
-	bl GetGoSpeed0AnimId
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetRegularAnim
-	ldrb r0, [r4]
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r4]
-	movs r0, 0x6
-	strh r0, [r5, 0x30]
-	movs r0, 0x1
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_808F534
-
-	thumb_func_start sub_808F564
-sub_808F564: @ 808F564
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl FieldObjectExecRegularAnim
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808F582
-	ldrb r0, [r4]
-	movs r1, 0x3
-	negs r1, r1
-	ands r1, r0
-	strb r1, [r4]
-	movs r0, 0x1
-	strh r0, [r5, 0x30]
-_0808F582:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_808F564
-
 	thumb_func_start FieldObjectIsTrainerAndCloseToPlayer
@ bool8 FieldObjectIsTrainerAndCloseToPlayer(struct npc_state *fieldObject)
 FieldObjectIsTrainerAndCloseToPlayer: @ 808F58C