1 files changed, 9 insertions, 9 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index 9748301f7..39055b8e9 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -936,7 +936,7 @@ _0806CFBC:
 	adds r4, 0x1
 	cmp r4, 0x3
 	ble _0806CFB0
-	ldr r0, _0806CFE8 @ =gUnknown_3005074
+	ldr r0, _0806CFE8 @ =gSelectedEventObject
 	strb r3, [r0]
 	ldr r1, _0806CFEC @ =gSpecialVar_LastTalked
 	adds r0, r2, r3
@@ -954,7 +954,7 @@ _0806CFDE:
 	bx r1
 	.align 2, 0
 _0806CFE4: .4byte gUnknown_2031DEC
-_0806CFE8: .4byte gUnknown_3005074
+_0806CFE8: .4byte gSelectedEventObject
 _0806CFEC: .4byte gSpecialVar_LastTalked
 _0806CFF0: .4byte gSpecialVar_Facing
 	thumb_func_end sub_806CF38
@@ -1044,7 +1044,7 @@ _0806D092:
 _0806D098: .4byte gMapObjects
 _0806D09C: .4byte gUnknown_826D2D8
 _0806D0A0:
-	ldr r0, _0806D0D4 @ =gUnknown_3005074
+	ldr r0, _0806D0D4 @ =gSelectedEventObject
 	strb r5, [r0]
 	ldr r4, _0806D0D8 @ =gSpecialVar_LastTalked
 	ldr r1, _0806D0DC @ =gMapObjects
@@ -1069,7 +1069,7 @@ _0806D0C8:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0806D0D4: .4byte gUnknown_3005074
+_0806D0D4: .4byte gSelectedEventObject
 _0806D0D8: .4byte gSpecialVar_LastTalked
 _0806D0DC: .4byte gMapObjects
 _0806D0E0: .4byte gSpecialVar_Facing
@@ -2195,7 +2195,7 @@ mapheader_run_first_tag2_script_list_match_conditionally: @ 806D964
 	adds r1, r5, 0
 	adds r2, r7, 0
 	bl sub_806DC54
-	bl sub_807E438
+	bl DoWarp
 	movs r0, 0x1
 	b _0806DA02
 	.align 2, 0
@@ -2331,7 +2331,7 @@ _0806DAC4:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0806DAE4
-	bl sub_80559E4
+	bl ResetInitialPlayerAvatarState
 	ldr r0, _0806DAE0 @ =gUnknown_81C1361
 	bl ScriptContext1_SetupScript
 	movs r0, 0x1
@@ -2339,7 +2339,7 @@ _0806DAC4:
 	.align 2, 0
 _0806DAE0: .4byte gUnknown_81C1361
 _0806DAE4:
-	bl sub_807E438
+	bl DoWarp
 	movs r0, 0x1
 	b _0806DAEE
 _0806DAEC:
@@ -2638,7 +2638,7 @@ map_warp_consider_2_to_inside: @ 806DCD0
 	adds r1, r4, 0
 	adds r2, r6, 0
 	bl sub_806DC54
-	bl sub_807E4DC
+	bl DoDoorWarp
 	movs r0, 0x1
 	b _0806DD32
 	.align 2, 0
@@ -2990,7 +2990,7 @@ _0806DF98:
 	cmp r0, 0
 	beq _0806DFB0
 	bl sub_8055A08
-	bl sp13E_warp_to_last_warp
+	bl DoDiveWarp
 	movs r0, 0xE2
 	bl PlaySE
 	movs r0, 0x1