diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s
index ead4750e1..a63267e48 100755
--- a/asm/battle_frontier_2.s
+++ b/asm/battle_frontier_2.s
@@ -29290,7 +29290,7 @@ sub_81A9B04: @ 81A9B04
 	cmp r0, 0
 	beq _081A9B2E
 	movs r0, 0x1
-	bl sub_80B47E0
+	bl GetChosenApproachingTrainerMapObjectId
 	ldr r1, =gSelectedMapObject
 	strb r0, [r1]
 	ldr r0, =gTrainerBattleOpponent_B
diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s
index f7a33e508..3cf009175 100644
--- a/asm/map_obj_lock.s
+++ b/asm/map_obj_lock.s
@@ -345,7 +345,7 @@ sub_8098630: @ 8098630
 	mov r6, r8
 	push {r6,r7}
 	movs r0, 0
-	bl sub_80B47E0
+	bl GetChosenApproachingTrainerMapObjectId
 	lsls r0, 24
 	lsrs r4, r0, 24
 	ldr r0, =gNoOfApproachingTrainers
@@ -353,7 +353,7 @@ sub_8098630: @ 8098630
 	cmp r0, 0x2
 	bne _080986E0
 	movs r0, 0x1
-	bl sub_80B47E0
+	bl GetChosenApproachingTrainerMapObjectId
 	lsls r0, 24
 	lsrs r0, 24
 	adds r5, r0, 0
diff --git a/asm/trainer_see.s b/asm/trainer_see.s
deleted file mode 100644
index 82e5f89cb..000000000
--- a/asm/trainer_see.s
+++ /dev/null
@@ -1,1401 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start GetTrainerApproachDistance
-@ u8 GetTrainerApproachDistance(struct npc_state *trainerFieldObject)
-GetTrainerApproachDistance: @ 80B3DF0
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	adds r7, r0, 0
-	mov r4, sp
-	adds r4, 0x2
-	mov r0, sp
-	adds r1, r4, 0
-	bl PlayerGetDestCoords
-	ldrb r0, [r7, 0x7]
-	mov r8, r4
-	cmp r0, 0x1
-	bne _080B3E50
-	ldr r1, =sDirectionalApproachDistanceFuncs
-	ldrb r0, [r7, 0x18]
-	lsls r0, 28
-	lsrs r0, 26
-	subs r0, 0x4
-	adds r0, r1
-	ldrb r1, [r7, 0x1D]
-	mov r2, sp
-	movs r3, 0
-	ldrsh r2, [r2, r3]
-	movs r5, 0
-	ldrsh r3, [r4, r5]
-	ldr r4, [r0]
-	adds r0, r7, 0
-	bl _call_via_r4
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldrb r2, [r7, 0x18]
-	lsls r2, 28
-	lsrs r2, 28
-	adds r0, r7, 0
-	adds r1, r6, 0
-	bl CheckPathBetweenTrainerAndPlayer
-	lsls r0, 24
-	lsrs r0, 24
-	b _080B3E90
-	.pool
-_080B3E4C:
-	adds r0, r6, 0
-	b _080B3E90
-_080B3E50:
-	movs r5, 0
-_080B3E52:
-	ldr r0, =sDirectionalApproachDistanceFuncs
-	lsls r4, r5, 2
-	adds r4, r0
-	ldrb r1, [r7, 0x1D]
-	mov r0, sp
-	movs r6, 0
-	ldrsh r2, [r0, r6]
-	mov r0, r8
-	movs r6, 0
-	ldrsh r3, [r0, r6]
-	ldr r4, [r4]
-	adds r0, r7, 0
-	bl _call_via_r4
-	lsls r0, 24
-	lsrs r6, r0, 24
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r0, r7, 0
-	adds r1, r6, 0
-	adds r2, r4, 0
-	bl CheckPathBetweenTrainerAndPlayer
-	lsls r0, 24
-	cmp r0, 0
-	bne _080B3E4C
-	adds r5, r4, 0
-	cmp r5, 0x3
-	bls _080B3E52
-	movs r0, 0
-_080B3E90:
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end GetTrainerApproachDistance
-
-	thumb_func_start GetTrainerApproachDistanceSouth
-@ u8 GetTrainerApproachDistanceSouth(struct npc_state *trainerFieldObject, u16 sightRange, u16 playerX, u16 playerY)
-GetTrainerApproachDistanceSouth: @ 80B3EA0
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	lsls r1, 16
-	lsrs r6, r1, 16
-	lsls r3, 16
-	lsrs r5, r3, 16
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	lsls r2, 16
-	asrs r2, 16
-	cmp r0, r2
-	bne _080B3EDA
-	lsls r0, r5, 16
-	asrs r2, r0, 16
-	ldrh r3, [r4, 0x12]
-	movs r1, 0x12
-	ldrsh r0, [r4, r1]
-	cmp r2, r0
-	ble _080B3EDA
-	adds r1, r0, 0
-	lsls r0, r6, 16
-	asrs r0, 16
-	adds r1, r0
-	cmp r2, r1
-	bgt _080B3EDA
-	subs r0, r5, r3
-	lsls r0, 24
-	lsrs r0, 24
-	b _080B3EDC
-_080B3EDA:
-	movs r0, 0
-_080B3EDC:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end GetTrainerApproachDistanceSouth
-
-	thumb_func_start GetTrainerApproachDistanceNorth
-@ u8 GetTrainerApproachDistanceNorth(struct npc_state *trainerFieldObject, u16 sightRange, u16 playerX, u16 playerY)
-GetTrainerApproachDistanceNorth: @ 80B3EE4
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	lsls r1, 16
-	lsrs r6, r1, 16
-	lsls r3, 16
-	lsrs r5, r3, 16
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	lsls r2, 16
-	asrs r2, 16
-	cmp r0, r2
-	bne _080B3F1E
-	lsls r0, r5, 16
-	asrs r2, r0, 16
-	ldrh r3, [r4, 0x12]
-	movs r1, 0x12
-	ldrsh r0, [r4, r1]
-	cmp r2, r0
-	bge _080B3F1E
-	adds r1, r0, 0
-	lsls r0, r6, 16
-	asrs r0, 16
-	subs r1, r0
-	cmp r2, r1
-	blt _080B3F1E
-	subs r0, r3, r5
-	lsls r0, 24
-	lsrs r0, 24
-	b _080B3F20
-_080B3F1E:
-	movs r0, 0
-_080B3F20:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end GetTrainerApproachDistanceNorth
-
-	thumb_func_start GetTrainerApproachDistanceWest
-@ u8 GetTrainerApproachDistanceWest(struct npc_state *trainerFieldObject, u16 sightRange, u16 playerX, u16 playerY)
-GetTrainerApproachDistanceWest: @ 80B3F28
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	lsls r1, 16
-	lsrs r6, r1, 16
-	lsls r2, 16
-	lsrs r5, r2, 16
-	movs r1, 0x12
-	ldrsh r0, [r4, r1]
-	lsls r3, 16
-	asrs r3, 16
-	cmp r0, r3
-	bne _080B3F62
-	lsls r0, r5, 16
-	asrs r3, r0, 16
-	ldrh r2, [r4, 0x10]
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	cmp r3, r0
-	bge _080B3F62
-	adds r1, r0, 0
-	lsls r0, r6, 16
-	asrs r0, 16
-	subs r1, r0
-	cmp r3, r1
-	blt _080B3F62
-	subs r0, r2, r5
-	lsls r0, 24
-	lsrs r0, 24
-	b _080B3F64
-_080B3F62:
-	movs r0, 0
-_080B3F64:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end GetTrainerApproachDistanceWest
-
-	thumb_func_start GetTrainerApproachDistanceEast
-@ u8 GetTrainerApproachDistanceEast(struct npc_state *trainerFieldObject, u16 sightRange, u16 playerX, u16 playerY)
-GetTrainerApproachDistanceEast: @ 80B3F6C
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	lsls r1, 16
-	lsrs r6, r1, 16
-	lsls r2, 16
-	lsrs r5, r2, 16
-	movs r1, 0x12
-	ldrsh r0, [r4, r1]
-	lsls r3, 16
-	asrs r3, 16
-	cmp r0, r3
-	bne _080B3FA6
-	lsls r0, r5, 16
-	asrs r3, r0, 16
-	ldrh r2, [r4, 0x10]
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	cmp r3, r0
-	ble _080B3FA6
-	adds r1, r0, 0
-	lsls r0, r6, 16
-	asrs r0, 16
-	adds r1, r0
-	cmp r3, r1
-	bgt _080B3FA6
-	subs r0, r5, r2
-	lsls r0, 24
-	lsrs r0, 24
-	b _080B3FA8
-_080B3FA6:
-	movs r0, 0
-_080B3FA8:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end GetTrainerApproachDistanceEast
-
-	thumb_func_start CheckPathBetweenTrainerAndPlayer
-@ u8 CheckPathBetweenTrainerAndPlayer(struct npc_state *fieldObject, u8 a2, u8 direction)
-CheckPathBetweenTrainerAndPlayer: @ 80B3FB0
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x4
-	adds r6, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	mov r9, r1
-	lsls r2, 24
-	lsrs r7, r2, 24
-	cmp r1, 0
-	beq _080B4056
-	ldrh r1, [r6, 0x10]
-	mov r0, sp
-	strh r1, [r0]
-	ldrh r0, [r6, 0x12]
-	mov r4, sp
-	adds r4, 0x2
-	strh r0, [r4]
-	adds r0, r7, 0
-	mov r1, sp
-	adds r2, r4, 0
-	bl MoveCoords
-	movs r5, 0
-	mov r8, r4
-	mov r4, r9
-	subs r4, 0x1
-	cmp r5, r4
-	bge _080B4028
-_080B3FEE:
-	mov r0, sp
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	mov r3, r8
-	movs r0, 0
-	ldrsh r2, [r3, r0]
-	adds r0, r6, 0
-	adds r3, r7, 0
-	bl sub_8092C8C
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	beq _080B4014
-	movs r0, 0x2
-	negs r0, r0
-	ands r1, r0
-	cmp r1, 0
-	bne _080B4056
-_080B4014:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r0, r7, 0
-	mov r1, sp
-	mov r2, r8
-	bl MoveCoords
-	cmp r5, r4
-	blt _080B3FEE
-_080B4028:
-	ldrb r4, [r6, 0x19]
-	lsls r5, r4, 28
-	lsrs r5, 28
-	lsrs r4, 4
-	movs r0, 0
-	strb r0, [r6, 0x19]
-	mov r0, sp
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	mov r3, r8
-	movs r0, 0
-	ldrsh r2, [r3, r0]
-	adds r0, r6, 0
-	adds r3, r7, 0
-	bl npc_block_way
-	lsls r0, 24
-	lsrs r1, r0, 24
-	lsls r4, 4
-	orrs r5, r4
-	strb r5, [r6, 0x19]
-	cmp r1, 0x4
-	beq _080B405A
-_080B4056:
-	movs r0, 0
-	b _080B405C
-_080B405A:
-	mov r0, r9
-_080B405C:
-	add sp, 0x4
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end CheckPathBetweenTrainerAndPlayer
-
-	thumb_func_start TrainerApproachPlayer
-@ void TrainerApproachPlayer(struct npc_state *trainerFieldObject, u8 distance)
-TrainerApproachPlayer: @ 80B406C
-	push {r4,r5,lr}
-	lsls r5, r1, 24
-	lsrs r5, 24
-	ldr r0, =c3_8081EDC
-	movs r1, 0x50
-	bl CreateTask
-	ldr r4, =gApproachingTrainers
-	ldr r3, =gNoOfApproachingTrainers
-	ldrb r2, [r3]
-	lsls r1, r2, 1
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r4
-	strb r0, [r1, 0x8]
-	ldrb r1, [r3]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldrb r0, [r0, 0x8]
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, =gTasks
-	adds r1, r0
-	strh r5, [r1, 0xE]
-	ldrb r2, [r3]
-	lsls r0, r2, 1
-	adds r0, r2
-	lsls r0, 2
-	adds r0, r4
-	ldrb r0, [r0]
-	strh r0, [r1, 0x16]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end TrainerApproachPlayer
-
-	thumb_func_start sub_80B40C8
-sub_80B40C8: @ 80B40C8
-	push {r4,r5,lr}
-	adds r2, r0, 0
-	ldr r0, =gApproachingTrainerId
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080B40E4
-	ldr r0, =gApproachingTrainers
-	ldrb r5, [r0, 0x8]
-	b _080B40E8
-	.pool
-_080B40E4:
-	ldr r0, =gApproachingTrainers
-	ldrb r5, [r0, 0x14]
-_080B40E8:
-	ldr r4, =c3_8081EDC
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl SetTaskFuncWithFollowupFunc
-	ldr r1, =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r0, r1
-	movs r1, 0x1
-	strh r1, [r0, 0x8]
-	adds r0, r5, 0
-	bl _call_via_r4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80B40C8
-
-	thumb_func_start c3_8081EDC
-c3_8081EDC: @ 80B4118
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	ldr r1, =gTasks
-	adds r4, r0, r1
-	movs r0, 0x16
-	ldrsh r1, [r4, r0]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gMapObjects
-	adds r5, r0, r1
-	ldrb r0, [r5]
-	lsls r0, 31
-	cmp r0, 0
-	bne _080B4150
-	adds r0, r6, 0
-	bl SwitchTaskToFollowupFunc
-	b _080B416C
-	.pool
-_080B4150:
-	ldr r7, =gTrainerSeeFuncList
-_080B4152:
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	lsls r0, 2
-	adds r0, r7
-	ldr r3, [r0]
-	adds r0, r6, 0
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl _call_via_r3
-	lsls r0, 24
-	cmp r0, 0
-	bne _080B4152
-_080B416C:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end c3_8081EDC
-
-	thumb_func_start sub_80B4178
-sub_80B4178: @ 80B4178
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_80B4178
-
-	thumb_func_start sub_80B417C
-sub_80B417C: @ 80B417C
-	push {r4,r5,lr}
-	adds r5, r1, 0
-	adds r4, r2, 0
-	ldr r1, =gFieldEffectArguments
-	adds r2, r1, 0x4
-	adds r3, r1, 0
-	adds r3, 0x8
-	adds r0, r4, 0
-	bl FieldObjectGetLocalIdAndMap
-	movs r0, 0
-	bl FieldEffectStart
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetFaceDirectionAnimId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-	movs r0, 0x1
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80B417C
-
-	thumb_func_start sub_80B41C0
-sub_80B41C0: @ 80B41C0
-	push {r4,r5,lr}
-	adds r4, r1, 0
-	adds r5, r2, 0
-	movs r0, 0
-	bl FieldEffectActiveListContains
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B41D6
-	movs r0, 0
-	b _080B41F8
-_080B41D6:
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	ldrb r0, [r5, 0x6]
-	subs r0, 0x39
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bhi _080B41EC
-	movs r0, 0x6
-	strh r0, [r4, 0x8]
-_080B41EC:
-	ldrb r0, [r5, 0x6]
-	cmp r0, 0x3F
-	bne _080B41F6
-	movs r0, 0x8
-	strh r0, [r4, 0x8]
-_080B41F6:
-	movs r0, 0x1
-_080B41F8:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80B41C0
-
-	thumb_func_start sub_80B4200
-sub_80B4200: @ 80B4200
-	push {r4,r5,lr}
-	adds r5, r1, 0
-	adds r4, r2, 0
-	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B421E
-	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B4252
-_080B421E:
-	movs r1, 0xE
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	beq _080B4244
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetGoSpeed0AnimId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
-	ldrh r0, [r5, 0xE]
-	subs r0, 0x1
-	strh r0, [r5, 0xE]
-	b _080B4252
-_080B4244:
-	adds r0, r4, 0
-	movs r1, 0x3E
-	bl FieldObjectSetSpecialAnim
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-_080B4252:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80B4200
-
-	thumb_func_start sub_80B425C
-sub_80B425C: @ 80B425C
-	push {r4-r6,lr}
-	adds r6, r1, 0
-	adds r5, r2, 0
-	adds r0, r5, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B427A
-	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B4308
-_080B427A:
-	ldrb r0, [r5, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl npc_running_behaviour_by_direction
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	bl npc_set_running_behaviour_etc
-	ldrb r0, [r5, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl npc_running_behaviour_by_direction
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	bl sub_808F23C
-	adds r0, r5, 0
-	bl sub_808F208
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gMapObjects
-	adds r4, r0, r1
-	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B42D2
-	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B4308
-_080B42D2:
-	bl sub_808BCE8
-	ldr r0, =gPlayerAvatar
-	ldrb r0, [r0, 0x5]
-	lsls r4, r0, 3
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gMapObjects
-	adds r4, r0
-	ldrb r0, [r5, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetOppositeDirection
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetFaceDirectionAnimId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
-	ldrh r0, [r6, 0x8]
-	adds r0, 0x1
-	strh r0, [r6, 0x8]
-_080B4308:
-	movs r0, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80B425C
-
-	thumb_func_start sub_80B4318
-sub_80B4318: @ 80B4318
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gMapObjects
-	adds r4, r0, r1
-	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B4344
-	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B434A
-_080B4344:
-	adds r0, r5, 0
-	bl SwitchTaskToFollowupFunc
-_080B434A:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80B4318
-
-	thumb_func_start sub_80B435C
-sub_80B435C: @ 80B435C
-	push {r4,r5,lr}
-	adds r5, r1, 0
-	adds r4, r2, 0
-	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B437A
-	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B4388
-_080B437A:
-	adds r0, r4, 0
-	movs r1, 0x59
-	bl FieldObjectSetSpecialAnim
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-_080B4388:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80B435C
-
-	thumb_func_start sub_80B4390
-sub_80B4390: @ 80B4390
-	push {r4,lr}
-	adds r4, r1, 0
-	adds r0, r2, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B43A4
-	movs r0, 0x3
-	strh r0, [r4, 0x8]
-_080B43A4:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80B4390
-
-	thumb_func_start sub_80B43AC
-sub_80B43AC: @ 80B43AC
-	push {r4,r5,lr}
-	adds r5, r1, 0
-	adds r4, r2, 0
-	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B43CA
-	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B43D8
-_080B43CA:
-	adds r0, r4, 0
-	movs r1, 0x3E
-	bl FieldObjectSetSpecialAnim
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-_080B43D8:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80B43AC
-
-	thumb_func_start sub_80B43E0
-sub_80B43E0: @ 80B43E0
-	push {r4,r5,lr}
-	adds r5, r1, 0
-	adds r4, r2, 0
-	adds r0, r4, 0
-	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B4426
-	ldr r2, =gFieldEffectArguments
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	str r0, [r2]
-	movs r1, 0x12
-	ldrsh r0, [r4, r1]
-	str r0, [r2, 0x4]
-	ldr r3, =gSprites
-	ldrb r1, [r4, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x43
-	ldrb r0, [r0]
-	subs r0, 0x1
-	str r0, [r2, 0x8]
-	movs r0, 0x2
-	str r0, [r2, 0xC]
-	movs r0, 0x31
-	bl FieldEffectStart
-	strh r0, [r5, 0x10]
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-_080B4426:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80B43E0
-
-	thumb_func_start sub_80B4438
-sub_80B4438: @ 80B4438
-	push {r4,r5,lr}
-	adds r5, r1, 0
-	adds r4, r2, 0
-	ldr r2, =gSprites
-	movs r1, 0x10
-	ldrsh r0, [r5, r1]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	adds r1, 0x2B
-	ldrb r0, [r1]
-	cmp r0, 0x2
-	bne _080B44A0
-	ldrb r1, [r4, 0x3]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r4, 0x3]
-	ldrb r0, [r4]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r4]
-	ldrb r1, [r4, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r2, [r0, 0x5]
-	movs r1, 0xD
-	negs r1, r1
-	ands r1, r2
-	movs r2, 0x8
-	orrs r1, r2
-	strb r1, [r0, 0x5]
-	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl sub_80934BC
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-_080B44A0:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80B4438
-
-	thumb_func_start sub_80B44AC
-sub_80B44AC: @ 80B44AC
-	push {r4,lr}
-	adds r4, r1, 0
-	movs r0, 0x31
-	bl FieldEffectActiveListContains
-	lsls r0, 24
-	cmp r0, 0
-	bne _080B44C0
-	movs r0, 0x3
-	strh r0, [r4, 0x8]
-_080B44C0:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80B44AC
-
-	thumb_func_start sub_80B44C8
-sub_80B44C8: @ 80B44C8
-	push {r4,r5,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	adds r5, r0, 0
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	ldr r1, =gTasks
-	adds r4, r0, r1
-	adds r0, r4, 0
-	adds r0, 0xA
-	mov r1, sp
-	bl LoadWordFromTwoHalfwords
-	movs r1, 0x16
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080B44FA
-	ldr r0, [sp]
-	bl FieldObjectClearAnim
-	ldrh r0, [r4, 0x16]
-	adds r0, 0x1
-	strh r0, [r4, 0x16]
-_080B44FA:
-	ldr r1, =gTrainerSeeFuncList2
-	movs r2, 0x8
-	ldrsh r0, [r4, r2]
-	lsls r0, 2
-	adds r0, r1
-	ldr r2, [sp]
-	ldr r3, [r0]
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl _call_via_r3
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x3
-	bne _080B4564
-	movs r0, 0x31
-	bl FieldEffectActiveListContains
-	lsls r0, 24
-	cmp r0, 0
-	bne _080B4564
-	ldr r4, [sp]
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl npc_running_behaviour_by_direction
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl npc_set_running_behaviour_etc
-	ldr r4, [sp]
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl npc_running_behaviour_by_direction
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl sub_808F23C
-	adds r0, r5, 0
-	bl DestroyTask
-	b _080B456E
-	.pool
-_080B4564:
-	ldr r2, [sp]
-	ldrb r1, [r2]
-	movs r0, 0x7F
-	ands r0, r1
-	strb r0, [r2]
-_080B456E:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80B44C8
-
-	thumb_func_start sub_80B4578
-sub_80B4578: @ 80B4578
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, =sub_80B44C8
-	movs r1, 0
-	bl CreateTask
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	ldr r1, =gTasks + 0x8
-	adds r0, r1
-	adds r0, 0x2
-	adds r1, r4, 0
-	bl StoreWordInTwoHalfwords
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80B4578
-
-	thumb_func_start sub_80B45AC
-sub_80B45AC: @ 80B45AC
-	push {lr}
-	ldr r0, =sub_80B45BC
-	bl sub_80B40C8
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80B45AC
-
-	thumb_func_start sub_80B45BC
-sub_80B45BC: @ 80B45BC
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-	bl EnableBothScriptContexts
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80B45BC
-
-	thumb_func_start sub_80B45D0
-sub_80B45D0: @ 80B45D0
-	push {lr}
-	ldr r0, =gNoOfApproachingTrainers
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	bne _080B4610
-	ldr r1, =gApproachingTrainerId
-	ldrb r0, [r1]
-	cmp r0, 0
-	bne _080B460C
-	adds r0, 0x1
-	strb r0, [r1]
-	ldr r1, =gSpecialVar_Result
-	movs r0, 0x1
-	strh r0, [r1]
-	bl UnfreezeMapObjects
-	ldr r0, =gApproachingTrainers
-	ldrb r0, [r0, 0xC]
-	bl sub_80974D0
-	b _080B4616
-	.pool
-_080B460C:
-	movs r0, 0
-	strb r0, [r1]
-_080B4610:
-	ldr r1, =gSpecialVar_Result
-	movs r0, 0
-	strh r0, [r1]
-_080B4616:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80B45D0
-
-	thumb_func_start oei_exclamation_mark
-oei_exclamation_mark: @ 80B4620
-	push {lr}
-	ldr r0, =gSpriteTemplate_85507B4
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x53
-	bl CreateSpriteAtEnd
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0x40
-	beq _080B4648
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r0, r1
-	movs r1, 0
-	movs r2, 0
-	bl sub_80B46D8
-_080B4648:
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end oei_exclamation_mark
-
-	thumb_func_start sub_80B4658
-sub_80B4658: @ 80B4658
-	push {lr}
-	ldr r0, =gSpriteTemplate_85507B4
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x52
-	bl CreateSpriteAtEnd
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0x40
-	beq _080B4680
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r0, r1
-	movs r1, 0x21
-	movs r2, 0x1
-	bl sub_80B46D8
-_080B4680:
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80B4658
-
-	thumb_func_start sub_80B4690
-sub_80B4690: @ 80B4690
-	push {r4,lr}
-	ldr r0, =gSpriteTemplate_85507CC
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x52
-	bl CreateSpriteAtEnd
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x40
-	beq _080B46C6
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gSprites
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0x2E
-	movs r2, 0
-	bl sub_80B46D8
-	ldrb r1, [r4, 0x5]
-	movs r0, 0xF
-	ands r0, r1
-	movs r1, 0x20
-	orrs r0, r1
-	strb r0, [r4, 0x5]
-_080B46C6:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80B4690
-
-	thumb_func_start sub_80B46D8
-@ void sub_80B46D8(struct obj *object, s16 a2, u8 a3)
-sub_80B46D8: @ 80B46D8
-	push {r4,lr}
-	lsls r2, 24
-	lsrs r2, 24
-	ldrb r4, [r0, 0x5]
-	movs r3, 0xD
-	negs r3, r3
-	ands r3, r4
-	movs r4, 0x4
-	orrs r3, r4
-	strb r3, [r0, 0x5]
-	movs r3, 0x3E
-	adds r3, r0
-	mov r12, r3
-	ldrb r3, [r3]
-	movs r4, 0x2
-	orrs r3, r4
-	mov r4, r12
-	strb r3, [r4]
-	ldr r4, =gFieldEffectArguments
-	ldr r3, [r4]
-	strh r3, [r0, 0x2E]
-	ldr r3, [r4, 0x4]
-	strh r3, [r0, 0x30]
-	ldr r3, [r4, 0x8]
-	strh r3, [r0, 0x32]
-	ldr r3, =0x0000fffb
-	strh r3, [r0, 0x34]
-	strh r1, [r0, 0x3C]
-	adds r1, r2, 0
-	bl StartSpriteAnim
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80B46D8
-
-	thumb_func_start objc_exclamation_mark_probably
-objc_exclamation_mark_probably: @ 80B4724
-	push {r4,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x2E]
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r4, 0x30]
-	lsls r1, 24
-	lsrs r1, 24
-	ldrh r2, [r4, 0x32]
-	lsls r2, 24
-	lsrs r2, 24
-	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
-	lsls r0, 24
-	cmp r0, 0
-	bne _080B4756
-	adds r0, r4, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _080B4764
-_080B4756:
-	ldrh r1, [r4, 0x3C]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl FieldEffectStop
-	b _080B47B2
-_080B4764:
-	ldr r2, =gMapObjects
-	mov r0, sp
-	ldrb r1, [r0]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x4]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	ldr r0, =gSprites
-	adds r1, r0
-	ldrh r3, [r4, 0x34]
-	ldrh r0, [r4, 0x36]
-	adds r2, r3, r0
-	strh r2, [r4, 0x36]
-	ldrh r0, [r1, 0x20]
-	strh r0, [r4, 0x20]
-	ldrh r0, [r1, 0x22]
-	subs r0, 0x10
-	strh r0, [r4, 0x22]
-	ldrh r0, [r1, 0x24]
-	strh r0, [r4, 0x24]
-	ldrh r0, [r1, 0x26]
-	adds r0, r2
-	strh r0, [r4, 0x26]
-	lsls r2, 16
-	asrs r2, 16
-	cmp r2, 0
-	beq _080B47B0
-	adds r0, r3, 0x1
-	strh r0, [r4, 0x34]
-	b _080B47B2
-	.pool
-_080B47B0:
-	strh r2, [r4, 0x34]
-_080B47B2:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end objc_exclamation_mark_probably
-
-	thumb_func_start sub_80B47BC
-sub_80B47BC: @ 80B47BC
-	push {lr}
-	ldr r0, =gApproachingTrainerId
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _080B47D4
-	ldr r0, =gApproachingTrainers
-	ldrb r0, [r0, 0xC]
-	b _080B47D8
-	.pool
-_080B47D4:
-	ldr r0, =gApproachingTrainers
-	ldrb r0, [r0]
-_080B47D8:
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80B47BC
-
-	thumb_func_start sub_80B47E0
-sub_80B47E0: @ 80B47E0
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bls _080B47EE
-	movs r0, 0
-	b _080B4800
-_080B47EE:
-	cmp r0, 0
-	beq _080B47FC
-	ldr r0, =gApproachingTrainers
-	ldrb r0, [r0, 0xC]
-	b _080B4800
-	.pool
-_080B47FC:
-	ldr r0, =gApproachingTrainers
-	ldrb r0, [r0]
-_080B4800:
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80B47E0
-
-	thumb_func_start sub_80B4808
-sub_80B4808: @ 80B4808
-	push {lr}
-	ldr r0, =gUnknown_030060AC
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _080B4870
-	ldr r2, =gApproachingTrainers
-	ldr r0, =gUnknown_03006080
-	ldrh r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r0]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gMapObjects
-	adds r0, r1
-	ldrb r0, [r0, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetOppositeDirection
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetFaceDirectionAnimId
-	ldr r3, =gUnknown_03006084
-	strb r0, [r3]
-	movs r0, 0xFE
-	strb r0, [r3, 0x1]
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldrb r1, [r0, 0x5]
-	ldrb r2, [r0, 0x4]
-	movs r0, 0xFF
-	bl ScriptMovement_StartObjectMovementScript
-	b _080B489E
-	.pool
-_080B4870:
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gMapObjects
-	adds r0, r1
-	ldrb r0, [r0, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetFaceDirectionAnimId
-	ldr r3, =gUnknown_03006084
-	strb r0, [r3]
-	movs r0, 0xFE
-	strb r0, [r3, 0x1]
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldrb r1, [r0, 0x5]
-	ldrb r2, [r0, 0x4]
-	movs r0, 0xFF
-	bl ScriptMovement_StartObjectMovementScript
-_080B489E:
-	movs r0, 0xFF
-	bl sub_809BE48
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80B4808
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 8bd35d0d1..d87040701 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -844,7 +844,7 @@ EventScript_271354:: @ 8271354
 
 EventScript_271356:: @ 8271356
 	special SetUpTrainerEncounterMusic
-	special sub_80B45AC
+	special EndTrainerApproach
 	waitstate
 	goto EventScript_ShowTrainerIntroMsg
 
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index ceb327084..9457094f9 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -74,7 +74,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4
 	.4byte gFieldEffectScript_Unknown66
 
 gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0
-	field_eff_callnative oei_exclamation_mark
+	field_eff_callnative FldEff_ExclamationMarkIcon1
 	field_eff_end
 
 gFieldEffectScript_UseCutOnTallGrass:: @ 82DBAE6
@@ -207,7 +207,7 @@ gFieldEffectScript_FlyIn:: @ 82DBBE9
 	field_eff_end
 
 gFieldEffectScript_ExclamationMarkIcon2:: @ 82DBBEF
-	field_eff_callnative sub_80B4658
+	field_eff_callnative FldEff_ExclamationMarkIcon2
 	field_eff_end
 
 gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5
@@ -260,7 +260,7 @@ gFieldEffectScript_Unknown45:: @ 82DBC4B
 	field_eff_end
 
 gFieldEffectScript_HeartIcon:: @ 82DBC56
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_80B4690
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_HeartIcon
 	field_eff_end
 
 gFieldEffectScript_Unknown47:: @ 82DBC60
diff --git a/data/specials.inc b/data/specials.inc
index d159df31f..bdd99f414 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -65,7 +65,7 @@ gSpecials:: @ 81DBA64
 	def_special ShowTrainerIntroSpeech
 	def_special ShowTrainerCantBattleSpeech
 	def_special GetTrainerFlag
-	def_special sub_80B45AC
+	def_special EndTrainerApproach
 	def_special SetUpTrainerEncounterMusic
 	def_special ShouldTryRematchBattle
 	def_special IsTrainerReadyForRematch
diff --git a/include/field_effect.h b/include/field_effect.h
index 629ae07c7..772b20d37 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -71,8 +71,9 @@ enum FieldEffectScriptIdx
 
 extern u32 gFieldEffectArguments[8];
 
-u8 FieldEffectStart(u8);
+u32 FieldEffectStart(u8);
 bool8 FieldEffectActiveListContains(u8 id);
 void sub_80B69DC(void);
+void FieldEffectStop(struct Sprite *sprite, u8 id);
 
 #endif //GUARD_FIELD_EFFECTS_H
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 56ff1dba1..198dd9759 100755
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -60,7 +60,7 @@ void sub_808E82C(u8, u8, u8, s16, s16);
 void sub_808E7E4(u8, u8, u8);
 void sub_808E78C(u8, u8, u8, u8);
 void sub_808E75C(s16, s16);
-void FieldObjectGetLocalIdAndMap(struct MapObject *, u8 *, u8 *, u8 *);
+void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, void *localId, void *mapNum, void *mapGroup);
 void npc_coords_shift(struct MapObject *, s16, s16);
 void sub_808EB08(struct MapObject *, s16, s16);
 void sub_808F254(u8, u8, u8);
@@ -79,6 +79,15 @@ u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z);
 void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 animPattern);
 u8 npc_running_behaviour_by_direction(u8 direction);
 const u8 *GetFieldObjectScriptPointerByFieldObjectId(u8 mapObjectId);
+u8 sub_8092C8C(struct MapObject *mapObject, s16 x, s16 y, u8 direction);
+u8 GetFaceDirectionAnimId(u32);
+u8 GetGoSpeed0AnimId(u32);
+u8 sub_80934BC(u32);
+bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId);
+bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *mapObject);
+u8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject);
+void sub_808F23C(const struct MapObject *mapObject, u8 movementType);
+void sub_808F208(const struct MapObject *mapObject);
 
 // Exported data declarations
 
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 25b7f2d71..a3c40bc42 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -9,6 +9,7 @@ void PlayerGetDestCoords(s16 *, s16 *);
 u8 player_get_direction_lower_nybble(void);
 u8 player_get_direction_upper_nybble(void);
 u8 player_get_x22(void);
+void sub_808BCE8(void);
 
 void sub_808D074(u8);
 void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index ed5054b7d..bb0837e1d 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -224,7 +224,7 @@ struct MapObject
     /*0x0C*/ struct Coords16 coords1;
     /*0x10*/ struct Coords16 coords2;
     /*0x14*/ struct Coords16 coords3;
-    /*0x18*/ u8 mapobj_unk_18:4;  //current direction?
+    /*0x18*/ u8 mapobj_unk_18:4;  // current direction?
     /*0x18*/ u8 placeholder18:4;
     /*0x19*/ union __attribute__((packed)) {
         u8 as_byte;
diff --git a/include/map_obj_8097404.h b/include/map_obj_8097404.h
index 27ffd18cb..0800b15b0 100644
--- a/include/map_obj_8097404.h
+++ b/include/map_obj_8097404.h
@@ -28,5 +28,7 @@ void sub_8097750(struct Sprite *);
 bool8 sub_8097758(struct Sprite *);
 void sub_8097FA4(struct MapObject *);
 void sub_8098044(u8);
+void UnfreezeMapObjects(void);
+void sub_80974D0(u8 mapObjectId);
 
 #endif //GUARD_MAP_OBJ_8097404_H
diff --git a/include/trainer_see.h b/include/trainer_see.h
index 0749e168a..e61b12e2a 100644
--- a/include/trainer_see.h
+++ b/include/trainer_see.h
@@ -8,16 +8,16 @@ struct ApproachingTrainer
     u8 field_2;
     u8 field_3;
     const u8 *trainerScriptPtr;
-    u8 field_8;
+    u8 taskId;
     u8 field_9;
     u8 field_A;
     u8 field_B;
 };
 
-extern struct ApproachingTrainer gApproachingTrainers[];
+extern struct ApproachingTrainer gApproachingTrainers[2];
 
 void sub_80B4578(struct MapObject *);
-u8 sub_80B47BC(void);
+u8 GetCurrentApproachingTrainerMapObjectId(void);
 void sub_8155D78(struct MapObject *);
 
-#endif //GUARD_TRAINER_SEE_H
+#endif // GUARD_TRAINER_SEE_H
diff --git a/ld_script.txt b/ld_script.txt
index 07bce16a2..17a959bd0 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -122,7 +122,6 @@ SECTIONS {
         src/battle_setup.o(.text);
         asm/cable_club.o(.text);
         src/trainer_see.o(.text);
-        asm/trainer_see.o(.text);
         src/wild_encounter.o(.text);
         asm/field_effect.o(.text);
         asm/unknown_task.o(.text);
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 6a99890a4..fc23a6e37 100755
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -1174,11 +1174,11 @@ void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGr
     }
 }
 
-void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, u8 *localId, u8 *mapNum, u8 *mapGroup)
+void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, void *localId, void *mapNum, void *mapGroup)
 {
-    *localId = mapObject->localId;
-    *mapNum = mapObject->mapNum;
-    *mapGroup = mapObject->mapGroup;
+    *(u8*)(localId) = mapObject->localId;
+    *(u8*)(mapNum) = mapObject->mapNum;
+    *(u8*)(mapGroup) = mapObject->mapGroup;
 }
 
 void sub_808E75C(s16 x, s16 y)
@@ -3426,7 +3426,7 @@ void FieldObjectCB_TreeDisguise(struct Sprite *sprite)
     mapObject = &gMapObjects[sprite->data[0]];
     if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && !sprite->data[7]))
     {
-        FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+        FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
         mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_TREE_DISGUISE);
         mapObject->mapobj_unk_21 = 1;
         sprite->data[7] ++;
@@ -3447,7 +3447,7 @@ void FieldObjectCB_MountainDisguise(struct Sprite *sprite)
     mapObject = &gMapObjects[sprite->data[0]];
     if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && !sprite->data[7]))
     {
-        FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+        FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
         mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE);
         mapObject->mapobj_unk_21 = 1;
         sprite->data[7] ++;
@@ -4694,7 +4694,7 @@ bool8 sub_80954CC(struct MapObject *mapObject, struct Sprite *sprite)
 
 bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
     sprite->data[2] = 1;
     return TRUE;
@@ -4702,7 +4702,7 @@ bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *s
 
 bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_2);
     sprite->data[2] = 1;
     return TRUE;
@@ -4710,7 +4710,7 @@ bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *s
 
 bool8 do_heart_bubble(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_HEART_ICON);
     sprite->data[2] = 1;
     return TRUE;
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 1b10501fc..412f8acd1 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -2332,7 +2332,7 @@ bool8 ScrCmd_mossdeepgym4(struct ScriptContext *ctx)
 
 bool8 ScrCmd_cmdD8(struct ScriptContext *ctx)
 {
-    gSelectedMapObject = sub_80B47BC();
+    gSelectedMapObject = GetCurrentApproachingTrainerMapObjectId();
     return FALSE;
 }
 
diff --git a/src/trainer_see.c b/src/trainer_see.c
index b396d26e7..26d00192e 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -3,24 +3,37 @@
 #include "battle_setup.h"
 #include "pokemon.h"
 #include "sprite.h"
+#include "field_effect.h"
 #include "field_map_obj.h"
+#include "field_player_avatar.h"
+#include "map_obj_8097404.h"
 #include "pokenav.h"
 #include "task.h"
+#include "util.h"
+#include "script.h"
+#include "event_data.h"
+#include "script_movement.h"
 
 extern u8 gApproachingTrainerId;
 extern u8 gNoOfApproachingTrainers;
 extern u8 gUnknown_030060AC;
 extern u16 gUnknown_03006080;
+extern u8 gUnknown_03006084[];
 
 extern bool8 InBattlePyramid(void);
 extern bool32 InTrainerHill(void);
 extern bool8 GetBattlePyramidTrainerFlag(u8 mapObjectId);
 extern bool8 GetTrainerHillTrainerFlag(u8 mapObjectId);
+extern void sub_809BE48(u16 npcId);
 
 // this file's functions
-static u8 CheckTrainer(u8 mapObjectId);
+u8 CheckTrainer(u8 mapObjectId);
 u8 GetTrainerApproachDistance(struct MapObject *trainerObj);
-void TrainerApproachPlayer(struct MapObject *trainerObj, u8 radius);
+void TrainerApproachPlayer(struct MapObject *trainerObj, u8 range);
+u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction);
+void Task_RunTrainerSeeFuncList(u8 taskId);
+void Task_DestroyTrainerApproachTask(u8 taskId);
+void sub_80B46D8(struct Sprite *sprite, u16 a2, u8 a3);
 
 u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
 u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
@@ -210,7 +223,7 @@ bool8 CheckForTrainersWantingBattle(void)
     }
 }
 
-static u8 CheckTrainer(u8 mapObjectId)
+u8 CheckTrainer(u8 mapObjectId)
 {
     const u8 *scriptPtr;
     u8 ret = 1;
@@ -263,7 +276,6 @@ static u8 CheckTrainer(u8 mapObjectId)
     return 0;
 }
 
-/*
 u8 GetTrainerApproachDistance(struct MapObject *trainerObj)
 {
     s16 x, y;
@@ -274,17 +286,477 @@ u8 GetTrainerApproachDistance(struct MapObject *trainerObj)
     if (trainerObj->trainerType == 1)  // can only see in one direction
     {
         approachDistance = sDirectionalApproachDistanceFuncs[trainerObj->mapobj_unk_18 - 1](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
-        return CheckPathBetweenTrainerAndPlayer((struct MapObject2 *)trainerObj, approachDistance, trainerObj->mapobj_unk_18);
+        return CheckPathBetweenTrainerAndPlayer(trainerObj, approachDistance, trainerObj->mapobj_unk_18);
     }
     else  // can see in all directions
     {
         for (i = 0; i < 4; i++)
         {
             approachDistance = sDirectionalApproachDistanceFuncs[i](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
-            if (CheckPathBetweenTrainerAndPlayer((struct MapObject2 *)trainerObj, approachDistance, i + 1)) // directions are 1-4 instead of 0-3. south north west east
+            if (CheckPathBetweenTrainerAndPlayer(trainerObj, approachDistance, i + 1)) // directions are 1-4 instead of 0-3. south north west east
                 return approachDistance;
         }
     }
+
     return 0;
 }
-*/
+
+// Returns how far south the player is from trainer. 0 if out of trainer's sight.
+u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+{
+    if (trainerObj->coords2.x == x
+     && y > trainerObj->coords2.y
+     && y <= trainerObj->coords2.y + range)
+        return (y - trainerObj->coords2.y);
+    else
+        return 0;
+}
+
+// Returns how far north the player is from trainer. 0 if out of trainer's sight.
+u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+{
+    if (trainerObj->coords2.x == x
+     && y < trainerObj->coords2.y
+     && y >= trainerObj->coords2.y - range)
+        return (trainerObj->coords2.y - y);
+    else
+        return 0;
+}
+
+// Returns how far west the player is from trainer. 0 if out of trainer's sight.
+u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+{
+    if (trainerObj->coords2.y == y
+     && x < trainerObj->coords2.x
+     && x >= trainerObj->coords2.x - range)
+        return (trainerObj->coords2.x - x);
+    else
+        return 0;
+}
+
+// Returns how far east the player is from trainer. 0 if out of trainer's sight.
+u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+{
+    if (trainerObj->coords2.y == y
+     && x > trainerObj->coords2.x
+     && x <= trainerObj->coords2.x + range)
+        return (x - trainerObj->coords2.x);
+    else
+        return 0;
+}
+
+#define COLLISION_MASK (~1)
+
+u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction)
+{
+    s16 x, y;
+    u8 unk19_temp;
+    u8 unk19b_temp;
+    u8 i;
+    u8 collision;
+
+    if (approachDistance == 0)
+        return 0;
+
+    x = trainerObj->coords2.x;
+    y = trainerObj->coords2.y;
+
+    MoveCoords(direction, &x, &y);
+    for (i = 0; i < approachDistance - 1; i++, MoveCoords(direction, &x, &y))
+    {
+        collision = sub_8092C8C(trainerObj, x, y, direction);
+        if (collision != 0 && (collision & COLLISION_MASK))
+            return 0;
+    }
+
+    // preserve mapobj_unk_19 before clearing.
+    unk19_temp = trainerObj->range.as_nybbles.x;
+    unk19b_temp = trainerObj->range.as_nybbles.y;
+    trainerObj->range.as_nybbles.x = 0;
+    trainerObj->range.as_nybbles.y = 0;
+
+    collision = npc_block_way(trainerObj, x, y, direction);
+
+    trainerObj->range.as_nybbles.x = unk19_temp;
+    trainerObj->range.as_nybbles.y = unk19b_temp;
+    if (collision == 4)
+        return approachDistance;
+
+    return 0;
+}
+
+#define tFuncId             data[0]
+#define tTrainerRange       data[3]
+#define tTrainerMapObjectId data[7]
+
+void TrainerApproachPlayer(struct MapObject *trainerObj, u8 range)
+{
+    struct Task *task;
+
+    gApproachingTrainers[gNoOfApproachingTrainers].taskId = CreateTask(Task_RunTrainerSeeFuncList, 0x50);
+    task = &gTasks[gApproachingTrainers[gNoOfApproachingTrainers].taskId];
+    task->tTrainerRange = range;
+    task->tTrainerMapObjectId = gApproachingTrainers[gNoOfApproachingTrainers].mapObjectId;
+}
+
+void sub_80B40C8(TaskFunc followupFunc)
+{
+    u8 taskId;
+    TaskFunc taskFunc;
+
+    if (gApproachingTrainerId == 0)
+        taskId = gApproachingTrainers[0].taskId;
+    else
+        taskId = gApproachingTrainers[1].taskId;
+
+    taskFunc = Task_RunTrainerSeeFuncList;
+    SetTaskFuncWithFollowupFunc(taskId, taskFunc, followupFunc);
+    gTasks[taskId].tFuncId = 1;
+    taskFunc(taskId);
+}
+
+void Task_RunTrainerSeeFuncList(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+    struct MapObject *trainerObj = &gMapObjects[task->tTrainerMapObjectId];
+
+    if (!trainerObj->active)
+    {
+        SwitchTaskToFollowupFunc(taskId);
+    }
+    else
+    {
+        while (gTrainerSeeFuncList[task->tFuncId](taskId, task, trainerObj));
+    }
+}
+
+bool8 sub_80B4178(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    return FALSE;
+}
+
+bool8 sub_80B417C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    u8 direction;
+
+    FieldObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
+    direction = GetFaceDirectionAnimId(trainerObj->mapobj_unk_18);
+    FieldObjectSetSpecialAnim(trainerObj, direction);
+    task->tFuncId++;
+    return TRUE;
+}
+
+bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (FieldEffectActiveListContains(0))
+    {
+        return FALSE;
+    }
+    else
+    {
+        task->data[0]++;
+        if (trainerObj->animPattern == 57 || trainerObj->animPattern == 58)
+            task->data[0] = 6;
+        if (trainerObj->animPattern == 63)
+            task->data[0] = 8;
+        return TRUE;
+    }
+}
+
+bool8 sub_80B4200(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (!(FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)) || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    {
+        if (task->data[3])
+        {
+            FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->mapobj_unk_18));
+            task->data[3]--;
+        }
+        else
+        {
+            FieldObjectSetSpecialAnim(trainerObj, 0x3E);
+            task->data[0]++;
+        }
+    }
+    return FALSE;
+}
+
+bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    struct MapObject *playerObj;
+
+    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+        return FALSE;
+
+    npc_set_running_behaviour_etc(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18));
+    sub_808F23C(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18));
+    sub_808F208(trainerObj);
+
+    playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(playerObj))
+        return FALSE;
+
+    sub_808BCE8();
+    FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->mapobj_unk_18)));
+    task->data[0]++;
+    return FALSE;
+}
+
+bool8 sub_80B4318(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj)
+     || FieldObjectClearAnimIfSpecialAnimFinished(playerObj))
+        SwitchTaskToFollowupFunc(taskId);
+    return FALSE;
+}
+
+bool8 sub_80B435C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
+     || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    {
+        FieldObjectSetSpecialAnim(trainerObj, 0x59);
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+bool8 sub_80B4390(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+        task->data[0] = 3;
+
+    return FALSE;
+}
+
+bool8 sub_80B43AC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
+     || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    {
+        FieldObjectSetSpecialAnim(trainerObj, 0x3E);
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj))
+    {
+        gFieldEffectArguments[0] = trainerObj->coords2.x;
+        gFieldEffectArguments[1] = trainerObj->coords2.y;
+        gFieldEffectArguments[2] = gSprites[trainerObj->spriteId].subpriority - 1;
+        gFieldEffectArguments[3] = 2;
+        task->data[4] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    struct Sprite *sprite;
+
+    if (gSprites[task->data[4]].animCmdIndex == 2)
+    {
+        trainerObj->mapobj_bit_26 = 0;
+        trainerObj->mapobj_bit_2 = 1;
+
+        sprite = &gSprites[trainerObj->spriteId];
+        sprite->oam.priority = 2;
+        FieldObjectClearAnimIfSpecialAnimFinished(trainerObj);
+        FieldObjectSetSpecialAnim(trainerObj, sub_80934BC(trainerObj->mapobj_unk_18));
+        task->data[0]++;
+    }
+
+    return FALSE;
+}
+
+bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (!FieldEffectActiveListContains(49))
+        task->data[0] = 3;
+
+    return FALSE;
+}
+
+void sub_80B44C8(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+    struct MapObject *mapObj;
+
+    // another mapObj loaded into by loadword?
+    LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&mapObj);
+    if (!task->data[7])
+    {
+        FieldObjectClearAnim(mapObj);
+        task->data[7]++;
+    }
+    gTrainerSeeFuncList2[task->data[0]](taskId, task, mapObj);
+    if (task->data[0] == 3 && !FieldEffectActiveListContains(49))
+    {
+        npc_set_running_behaviour_etc(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18));
+        sub_808F23C(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18));
+        DestroyTask(taskId);
+    }
+    else
+    {
+        mapObj->mapobj_bit_7 = 0;
+    }
+}
+
+void sub_80B4578(struct MapObject *var)
+{
+    StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var);
+}
+
+void EndTrainerApproach(void)
+{
+    sub_80B40C8(Task_DestroyTrainerApproachTask);
+}
+
+void Task_DestroyTrainerApproachTask(u8 taskId)
+{
+    DestroyTask(taskId);
+    EnableBothScriptContexts();
+}
+
+void sub_80B45D0(void)
+{
+    if (gNoOfApproachingTrainers == 2)
+    {
+        if (gApproachingTrainerId == 0)
+        {
+            gApproachingTrainerId++;
+            gSpecialVar_Result = 1;
+            UnfreezeMapObjects();
+            sub_80974D0(gApproachingTrainers[1].mapObjectId);
+        }
+        else
+        {
+            gApproachingTrainerId = 0;
+            gSpecialVar_Result = 0;
+        }
+    }
+    else
+    {
+        gSpecialVar_Result = 0;
+    }
+}
+
+u8 FldEff_ExclamationMarkIcon1(void)
+{
+    u8 spriteId = CreateSpriteAtEnd(&gSpriteTemplate_85507B4, 0, 0, 0x53);
+
+    if (spriteId != MAX_SPRITES)
+        sub_80B46D8(&gSprites[spriteId], 0, 0);
+
+    return 0;
+}
+
+u8 FldEff_ExclamationMarkIcon2(void)
+{
+    u8 spriteId = CreateSpriteAtEnd(&gSpriteTemplate_85507B4, 0, 0, 0x52);
+
+    if (spriteId != MAX_SPRITES)
+        sub_80B46D8(&gSprites[spriteId], 33, 1);
+
+    return 0;
+}
+
+u8 FldEff_HeartIcon(void)
+{
+    u8 spriteId = CreateSpriteAtEnd(&gSpriteTemplate_85507CC, 0, 0, 0x52);
+
+    if (spriteId != MAX_SPRITES)
+    {
+        struct Sprite *sprite = &gSprites[spriteId];
+
+        sub_80B46D8(sprite, 46, 0);
+        sprite->oam.paletteNum = 2;
+    }
+
+    return 0;
+}
+
+void sub_80B46D8(struct Sprite *sprite, u16 a2, u8 a3)
+{
+    sprite->oam.priority = 1;
+    sprite->coordOffsetEnabled = 1;
+
+    sprite->data[0] = gFieldEffectArguments[0];
+    sprite->data[1] = gFieldEffectArguments[1];
+    sprite->data[2] = gFieldEffectArguments[2];
+    sprite->data[3] = -5;
+    sprite->data[7] = a2;
+
+    StartSpriteAnim(sprite, a3);
+}
+
+void objc_exclamation_mark_probably(struct Sprite *sprite)
+{
+    u8 mapObjId;
+
+    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjId)
+     || sprite->animEnded)
+    {
+        FieldEffectStop(sprite, sprite->data[7]);
+    }
+    else
+    {
+        struct Sprite *mapObjSprite = &gSprites[gMapObjects[mapObjId].spriteId];
+        sprite->data[4] += sprite->data[3];
+        sprite->pos1.x = mapObjSprite->pos1.x;
+        sprite->pos1.y = mapObjSprite->pos1.y - 16;
+        sprite->pos2.x = mapObjSprite->pos2.x;
+        sprite->pos2.y = mapObjSprite->pos2.y + sprite->data[4];
+        if (sprite->data[4])
+            sprite->data[3]++;
+        else
+            sprite->data[3] = 0;
+    }
+}
+
+u8 GetCurrentApproachingTrainerMapObjectId(void)
+{
+    if (gApproachingTrainerId == 0)
+        return gApproachingTrainers[0].mapObjectId;
+    else
+        return gApproachingTrainers[1].mapObjectId;
+}
+
+u8 GetChosenApproachingTrainerMapObjectId(u8 arrayId)
+{
+    if (arrayId >= ARRAY_COUNT(gApproachingTrainers))
+        return 0;
+    else if (arrayId == 0)
+        return gApproachingTrainers[0].mapObjectId;
+    else
+        return gApproachingTrainers[1].mapObjectId;
+}
+
+void sub_80B4808(void)
+{
+    struct MapObject *trainerObj;
+
+    if (gUnknown_030060AC == 1)
+    {
+        trainerObj = &gMapObjects[gApproachingTrainers[gUnknown_03006080].mapObjectId];
+        gUnknown_03006084[0] = GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->mapobj_unk_18));
+        gUnknown_03006084[1] = 0xFE;
+        ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084);
+    }
+    else
+    {
+        trainerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+        gUnknown_03006084[0] = GetFaceDirectionAnimId(trainerObj->mapobj_unk_18);
+        gUnknown_03006084[1] = 0xFE;
+        ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084);
+    }
+
+    sub_809BE48(0xFF);
+}