import function names from pokeemerald

1 files changed, 27 insertions, 27 deletions

diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s
index 8d1d027ff..b461e6339 100644
--- a/asm/map_obj_lock.s
+++ b/asm/map_obj_lock.s
@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_8069554
-sub_8069554: @ 8069554
+	thumb_func_start walkrun_is_standing_still
+walkrun_is_standing_still: @ 8069554
 	push {lr}
 	ldr r0, _08069564 @ =gUnknown_2037078
 	ldrb r0, [r0, 0x3]
@@ -21,20 +21,20 @@ _08069568:
 _0806956A:
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8069554
+	thumb_func_end walkrun_is_standing_still
 
 	thumb_func_start sub_8069570
 sub_8069570: @ 8069570
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8069554
+	bl walkrun_is_standing_still
 	lsls r0, 24
 	cmp r0, 0
 	beq _0806958A
 	bl sub_805C270
 	adds r0, r4, 0
-	bl sub_8077508
+	bl DestroyTask
 _0806958A:
 	pop {r4}
 	pop {r0}
@@ -45,7 +45,7 @@ _0806958A:
 sub_8069590: @ 8069590
 	push {lr}
 	ldr r0, _080695A8 @ =sub_8069570
-	bl sub_8077650
+	bl FuncIsActiveTask
 	lsls r0, 24
 	cmp r0, 0
 	bne _080695AC
@@ -61,18 +61,18 @@ _080695AE:
 	bx r1
 	thumb_func_end sub_8069590
 
-	thumb_func_start sub_80695B4
-sub_80695B4: @ 80695B4
+	thumb_func_start ScriptFreezeMapObjects
+ScriptFreezeMapObjects: @ 80695B4
 	push {lr}
-	bl sub_8068974
+	bl player_bitmagic
 	ldr r0, _080695C8 @ =sub_8069570
 	movs r1, 0x50
-	bl sub_807741C
+	bl CreateTask
 	pop {r0}
 	bx r0
 	.align 2, 0
 _080695C8: .4byte sub_8069570
-	thumb_func_end sub_80695B4
+	thumb_func_end ScriptFreezeMapObjects
 
 	thumb_func_start sub_80695CC
 sub_80695CC: @ 80695CC
@@ -88,7 +88,7 @@ sub_80695CC: @ 80695CC
 	ldrsh r0, [r5, r1]
 	cmp r0, 0
 	bne _080695F6
-	bl sub_8069554
+	bl walkrun_is_standing_still
 	lsls r0, 24
 	lsrs r4, r0, 24
 	cmp r4, 0x1
@@ -125,7 +125,7 @@ _0806961E:
 	cmp r0, 0
 	beq _08069634
 	adds r0, r6, 0
-	bl sub_8077508
+	bl DestroyTask
 _08069634:
 	pop {r4-r6}
 	pop {r0}
@@ -140,7 +140,7 @@ _08069644: .4byte gUnknown_3005074
 sub_8069648: @ 8069648
 	push {lr}
 	ldr r0, _08069660 @ =sub_80695CC
-	bl sub_8077650
+	bl FuncIsActiveTask
 	lsls r0, 24
 	cmp r0, 0
 	bne _08069664
@@ -156,15 +156,15 @@ _08069666:
 	bx r1
 	thumb_func_end sub_8069648
 
-	thumb_func_start sub_806966C
-sub_806966C: @ 806966C
+	thumb_func_start LockSelectedMapObject
+LockSelectedMapObject: @ 806966C
 	push {r4,r5,lr}
 	ldr r4, _080696B0 @ =gUnknown_3005074
 	ldrb r0, [r4]
 	bl sub_80689B0
 	ldr r0, _080696B4 @ =sub_80695CC
 	movs r1, 0x50
-	bl sub_807741C
+	bl CreateTask
 	lsls r0, 24
 	lsrs r5, r0, 24
 	ldr r2, _080696B8 @ =gUnknown_2036E38
@@ -195,7 +195,7 @@ _080696B0: .4byte gUnknown_3005074
 _080696B4: .4byte sub_80695CC
 _080696B8: .4byte gUnknown_2036E38
 _080696BC: .4byte gUnknown_3005090
-	thumb_func_end sub_806966C
+	thumb_func_end LockSelectedMapObject
 
 	thumb_func_start sub_80696C0
 sub_80696C0: @ 80696C0
@@ -203,7 +203,7 @@ sub_80696C0: @ 80696C0
 	movs r0, 0xFF
 	movs r1, 0
 	movs r2, 0
-	bl sub_805DF60
+	bl GetFieldObjectIdByLocalIdAndMap
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -212,9 +212,9 @@ sub_80696C0: @ 80696C0
 	lsls r0, 2
 	ldr r1, _080696EC @ =gUnknown_2036E38
 	adds r0, r1
-	bl sub_8063D7C
+	bl FieldObjectClearAnimIfSpecialAnimFinished
 	bl sub_80974D8
-	bl sub_8068A5C
+	bl UnfreezeMapObjects
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -236,12 +236,12 @@ sub_80696F0: @ 80696F0
 	cmp r0, 0
 	beq _0806970E
 	adds r0, r1, 0
-	bl sub_8063D7C
+	bl FieldObjectClearAnimIfSpecialAnimFinished
 _0806970E:
 	movs r0, 0xFF
 	movs r1, 0
 	movs r2, 0
-	bl sub_805DF60
+	bl GetFieldObjectIdByLocalIdAndMap
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -249,9 +249,9 @@ _0806970E:
 	adds r0, r1
 	lsls r0, 2
 	adds r0, r4
-	bl sub_8063D7C
+	bl FieldObjectClearAnimIfSpecialAnimFinished
 	bl sub_80974D8
-	bl sub_8068A5C
+	bl UnfreezeMapObjects
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -272,7 +272,7 @@ sub_8069740: @ 8069740
 	adds r0, r1
 	ldr r1, _08069764 @ =gUnknown_20370D4
 	ldrb r1, [r1]
-	bl sub_80642C8
+	bl FieldObjectFaceOppositeDirection
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -291,7 +291,7 @@ sub_8069768: @ 8069768
 	lsls r0, 2
 	ldr r1, _08069784 @ =gUnknown_2036E38
 	adds r0, r1
-	bl sub_8063D1C
+	bl FieldObjectClearAnimIfSpecialAnimActive
 	pop {r0}
 	bx r0
 	.align 2, 0