Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu

15 files changed, 132 insertions, 3155 deletions

diff --git a/asm/cable_club.s b/asm/cable_club.s
index 64d6088b1..1d2f5d1ff 100644
--- a/asm/cable_club.s
+++ b/asm/cable_club.s
@@ -178,7 +178,7 @@ _080B24C8:
 	b _080B24F2
 _080B24CC:
 	ldr r4, =gStringVar1
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -239,7 +239,7 @@ sub_80B252C: @ 80B252C
 	ands r0, r1
 	cmp r0, 0
 	beq _080B2570
-	bl sub_800B320
+	bl IsLinkConnectionEstablished
 	lsls r0, 24
 	lsrs r1, r0, 24
 	cmp r1, 0
@@ -269,7 +269,7 @@ sub_80B2578: @ 80B2578
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_800B320
+	bl IsLinkConnectionEstablished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B258E
@@ -404,7 +404,7 @@ sub_80B2688: @ 80B2688
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r0, r4, 0
@@ -426,7 +426,7 @@ sub_80B2688: @ 80B2688
 	adds r4, r0, r1
 	movs r0, 0
 	strh r0, [r4, 0xE]
-	bl sub_800ABBC
+	bl IsLinkMaster
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -506,7 +506,7 @@ sub_80B275C: @ 80B275C
 	mov r9, r0
 	mov r7, r8
 	add r7, r9
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r0, r4, 0
@@ -585,7 +585,7 @@ sub_80B2804: @ 80B2804
 	bne _080B2898
 	bl sub_800AA48
 	adds r4, r0, 0
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r4, 24
 	lsls r0, 24
 	cmp r4, r0
@@ -652,7 +652,7 @@ sub_80B28A8: @ 80B28A8
 	lsrs r0, 24
 	cmp r0, 0x1
 	beq _080B290A
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	adds r4, r0, 0
 	bl sub_800AA48
 	lsls r4, 24
@@ -729,13 +729,13 @@ _080B297C:
 	cmp r2, 0x9
 	bne _080B2994
 _080B2984:
-	bl sub_80097E8
+	bl CloseLink
 	bl HideFieldMessageBox
 	ldr r0, =sub_80B2CB0
 	b _080B29E4
 	.pool
 _080B2994:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	ldr r4, =gUnknown_03005DB8
 	strb r0, [r4]
 	bl GetMultiplayerId
@@ -812,7 +812,7 @@ _080B2A42:
 	cmp r0, 0x9
 	bne _080B2A6C
 _080B2A4A:
-	bl sub_80097E8
+	bl CloseLink
 _080B2A4E:
 	bl HideFieldMessageBox
 	ldr r0, =gTasks
@@ -825,7 +825,7 @@ _080B2A4E:
 	b _080B2ACE
 	.pool
 _080B2A6C:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	ldr r4, =gUnknown_03005DB8
 	strb r0, [r4]
 	bl GetMultiplayerId
@@ -1610,7 +1610,7 @@ sub_80B3144: @ 80B3144
 	ldrsh r2, [r4, r3]
 	cmp r2, 0
 	bne _080B3178
-	bl sub_8009734
+	bl OpenLink
 	bl sub_800A2BC
 	ldr r0, =task00_08081A90
 	movs r1, 0x50
@@ -1640,12 +1640,12 @@ sub_80B3194: @ 80B3194
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r5, r4, 0
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
 	bls _080B31DA
-	bl sub_800ABBC
+	bl IsLinkMaster
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1681,7 +1681,7 @@ sub_80B31E8: @ 80B31E8
 	lsrs r5, r0, 24
 	bl sub_800AA48
 	adds r4, r0, 0
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r4, 24
 	lsls r0, 24
 	cmp r4, r0
@@ -2651,7 +2651,7 @@ task00_08081A90: @ 80B3A30
 	lsls r0, 17
 	cmp r1, r0
 	ble _080B3A62
-	bl sub_80097E8
+	bl CloseLink
 	ldr r0, =c2_800ACD4
 	bl SetMainCallback2
 	adds r0, r4, 0
@@ -2669,7 +2669,7 @@ _080B3A62:
 	lsls r0, 24
 	cmp r0, 0
 	bne _080B3A86
-	bl sub_80097E8
+	bl CloseLink
 	ldr r0, =c2_800ACD4
 	bl SetMainCallback2
 _080B3A86:
@@ -2761,7 +2761,7 @@ _080B3B2A:
 	b _080B3BB8
 	.pool
 _080B3B40:
-	bl sub_8009734
+	bl OpenLink
 	ldr r0, =task00_08081A90
 	movs r1, 0x1
 	bl CreateTask
@@ -2779,14 +2779,14 @@ _080B3B54:
 	strh r0, [r5, 0x2]
 	b _080B3B96
 _080B3B68:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	adds r4, r0, 0
 	bl sub_800AA48
 	lsls r4, 24
 	lsls r0, 24
 	cmp r4, r0
 	bcc _080B3BB8
-	bl sub_800ABBC
+	bl IsLinkMaster
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B3B96
diff --git a/asm/coord_event_weather.s b/asm/coord_event_weather.s
deleted file mode 100644
index 7c1188ad6..000000000
--- a/asm/coord_event_weather.s
+++ /dev/null
@@ -1,156 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_809D7BC
-sub_809D7BC: @ 809D7BC
-	push {lr}
-	movs r0, 0x1
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D7BC
-
-	thumb_func_start sub_809D7C8
-sub_809D7C8: @ 809D7C8
-	push {lr}
-	movs r0, 0x2
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D7C8
-
-	thumb_func_start sub_809D7D4
-sub_809D7D4: @ 809D7D4
-	push {lr}
-	movs r0, 0x3
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D7D4
-
-	thumb_func_start sub_809D7E0
-sub_809D7E0: @ 809D7E0
-	push {lr}
-	movs r0, 0x4
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D7E0
-
-	thumb_func_start sub_809D7EC
-sub_809D7EC: @ 809D7EC
-	push {lr}
-	movs r0, 0x5
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D7EC
-
-	thumb_func_start sub_809D7F8
-sub_809D7F8: @ 809D7F8
-	push {lr}
-	movs r0, 0x6
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D7F8
-
-	thumb_func_start sub_809D804
-sub_809D804: @ 809D804
-	push {lr}
-	movs r0, 0x9
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D804
-
-	thumb_func_start sub_809D810
-sub_809D810: @ 809D810
-	push {lr}
-	movs r0, 0x7
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D810
-
-	thumb_func_start sub_809D81C
-sub_809D81C: @ 809D81C
-	push {lr}
-	movs r0, 0x8
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D81C
-
-	thumb_func_start sub_809D828
-sub_809D828: @ 809D828
-	push {lr}
-	movs r0, 0xB
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D828
-
-	thumb_func_start sub_809D834
-sub_809D834: @ 809D834
-	push {lr}
-	movs r0, 0xC
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D834
-
-	thumb_func_start sub_809D840
-sub_809D840: @ 809D840
-	push {lr}
-	movs r0, 0x14
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D840
-
-	thumb_func_start sub_809D84C
-sub_809D84C: @ 809D84C
-	push {lr}
-	movs r0, 0x15
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D84C
-
-	thumb_func_start trigger_activate_weather
-trigger_activate_weather: @ 809D858
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	movs r2, 0
-	ldr r3, =gUnknown_085102E0
-_0809D862:
-	lsls r1, r2, 3
-	adds r0, r1, r3
-	ldrb r0, [r0]
-	cmp r0, r4
-	bne _0809D87C
-	adds r0, r3, 0x4
-	adds r0, r1, r0
-	ldr r0, [r0]
-	bl _call_via_r0
-	b _0809D886
-	.pool
-_0809D87C:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0xC
-	bls _0809D862
-_0809D886:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end trigger_activate_weather
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index e0e7b5efb..89e6efa6a 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -2155,7 +2155,7 @@ trigger_activate: @ 809D04C
 	cmp r1, 0
 	bne _0809D062
 	ldrb r0, [r4, 0x6]
-	bl trigger_activate_weather
+	bl DoCoordEventWeather
 	b _0809D082
 _0809D062:
 	ldrh r0, [r4, 0x6]
diff --git a/asm/field_message_box.s b/asm/field_message_box.s
deleted file mode 100644
index 0c1fae6de..000000000
--- a/asm/field_message_box.s
+++ /dev/null
@@ -1,337 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8098128
-sub_8098128: @ 8098128
-	ldr r1, =gUnknown_020375BC
-	movs r0, 0
-	strb r0, [r1]
-	ldr r2, =gTextFlags
-	ldrb r1, [r2]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x3
-	negs r1, r1
-	ands r0, r1
-	subs r1, 0x2
-	ands r0, r1
-	subs r1, 0x4
-	ands r0, r1
-	strb r0, [r2]
-	bx lr
-	.pool
-	thumb_func_end sub_8098128
-
-	thumb_func_start sub_8098154
-sub_8098154: @ 8098154
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	ldr r1, =gTasks
-	adds r4, r0, r1
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x1
-	beq _08098188
-	cmp r0, 0x1
-	bgt _0809817C
-	cmp r0, 0
-	beq _08098182
-	b _080981B0
-	.pool
-_0809817C:
-	cmp r0, 0x2
-	beq _08098198
-	b _080981B0
-_08098182:
-	bl sub_81973A4
-	b _08098190
-_08098188:
-	movs r0, 0
-	movs r1, 0x1
-	bl sub_81973C4
-_08098190:
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	b _080981B0
-_08098198:
-	bl sub_8197224
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	beq _080981B0
-	ldr r1, =gUnknown_020375BC
-	movs r0, 0
-	strb r0, [r1]
-	adds r0, r5, 0
-	bl DestroyTask
-_080981B0:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8098154
-
-	thumb_func_start task_add_textbox
-task_add_textbox: @ 80981BC
-	push {lr}
-	ldr r0, =sub_8098154
-	movs r1, 0x50
-	bl CreateTask
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end task_add_textbox
-
-	thumb_func_start task_del_textbox
-task_del_textbox: @ 80981D0
-	push {lr}
-	ldr r0, =sub_8098154
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0xFF
-	beq _080981E4
-	bl DestroyTask
-_080981E4:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end task_del_textbox
-
-	thumb_func_start ShowFieldMessage
-ShowFieldMessage: @ 80981EC
-	push {r4,lr}
-	adds r1, r0, 0
-	ldr r4, =gUnknown_020375BC
-	ldrb r0, [r4]
-	cmp r0, 0
-	bne _0809820C
-	adds r0, r1, 0
-	movs r1, 0x1
-	bl textbox_fdecode_auto_and_task_add
-	movs r0, 0x2
-	strb r0, [r4]
-	movs r0, 0x1
-	b _0809820E
-	.pool
-_0809820C:
-	movs r0, 0
-_0809820E:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end ShowFieldMessage
-
-	thumb_func_start sub_8098214
-sub_8098214: @ 8098214
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl sub_8196094
-	adds r1, r0, 0
-	cmp r1, 0
-	bne _0809822E
-	ldr r0, =gUnknown_020375BC
-	strb r1, [r0]
-	adds r0, r4, 0
-	bl DestroyTask
-_0809822E:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8098214
-
-	thumb_func_start sub_8098238
-sub_8098238: @ 8098238
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldr r5, =gUnknown_020375BC
-	ldrb r0, [r5]
-	cmp r0, 0
-	bne _08098270
-	ldr r0, =gStringVar4
-	adds r1, r4, 0
-	bl StringExpandPlaceholders
-	ldr r0, =sub_8098214
-	movs r1, 0
-	bl CreateTask
-	adds r0, r4, 0
-	bl sub_8196080
-	movs r0, 0x2
-	strb r0, [r5]
-	movs r0, 0x1
-	b _08098272
-	.pool
-_08098270:
-	movs r0, 0
-_08098272:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8098238
-
-	thumb_func_start ShowFieldAutoScrollMessage
-ShowFieldAutoScrollMessage: @ 8098278
-	push {lr}
-	adds r1, r0, 0
-	ldr r2, =gUnknown_020375BC
-	ldrb r0, [r2]
-	cmp r0, 0
-	bne _08098298
-	movs r0, 0x3
-	strb r0, [r2]
-	adds r0, r1, 0
-	movs r1, 0
-	bl textbox_fdecode_auto_and_task_add
-	movs r0, 0x1
-	b _0809829A
-	.pool
-_08098298:
-	movs r0, 0
-_0809829A:
-	pop {r1}
-	bx r1
-	thumb_func_end ShowFieldAutoScrollMessage
-
-	thumb_func_start sub_80982A0
-sub_80982A0: @ 80982A0
-	push {lr}
-	ldr r2, =gUnknown_020375BC
-	movs r1, 0x3
-	strb r1, [r2]
-	movs r1, 0x1
-	bl textbox_fdecode_auto_and_task_add
-	movs r0, 0x1
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80982A0
-
-	thumb_func_start sub_80982B8
-sub_80982B8: @ 80982B8
-	push {lr}
-	ldr r1, =gUnknown_020375BC
-	ldrb r0, [r1]
-	cmp r0, 0
-	bne _080982D4
-	movs r0, 0x2
-	strb r0, [r1]
-	bl textbox_auto_and_task_add
-	movs r0, 0x1
-	b _080982D6
-	.pool
-_080982D4:
-	movs r0, 0
-_080982D6:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80982B8
-
-	thumb_func_start textbox_fdecode_auto_and_task_add
-textbox_fdecode_auto_and_task_add: @ 80982DC
-	push {r4,lr}
-	adds r2, r0, 0
-	adds r4, r1, 0
-	ldr r0, =gStringVar4
-	adds r1, r2, 0
-	bl StringExpandPlaceholders
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r4, 0
-	bl AddTextPrinterForMessage
-	bl task_add_textbox
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end textbox_fdecode_auto_and_task_add
-
-	thumb_func_start textbox_auto_and_task_add
-textbox_auto_and_task_add: @ 8098304
-	push {lr}
-	movs r0, 0x1
-	bl AddTextPrinterForMessage
-	bl task_add_textbox
-	pop {r0}
-	bx r0
-	thumb_func_end textbox_auto_and_task_add
-
-	thumb_func_start HideFieldMessageBox
-HideFieldMessageBox: @ 8098314
-	push {lr}
-	bl task_del_textbox
-	movs r0, 0
-	movs r1, 0x1
-	bl sub_8197434
-	ldr r1, =gUnknown_020375BC
-	movs r0, 0
-	strb r0, [r1]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end HideFieldMessageBox
-
-	thumb_func_start textbox_any_visible
-textbox_any_visible: @ 8098330
-	ldr r0, =gUnknown_020375BC
-	ldrb r0, [r0]
-	bx lr
-	.pool
-	thumb_func_end textbox_any_visible
-
-	thumb_func_start IsFieldMessageBoxHidden
-IsFieldMessageBoxHidden: @ 809833C
-	push {lr}
-	ldr r0, =gUnknown_020375BC
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08098350
-	movs r0, 0
-	b _08098352
-	.pool
-_08098350:
-	movs r0, 0x1
-_08098352:
-	pop {r1}
-	bx r1
-	thumb_func_end IsFieldMessageBoxHidden
-
-	thumb_func_start sub_8098358
-sub_8098358: @ 8098358
-	push {lr}
-	bl task_del_textbox
-	movs r0, 0
-	movs r1, 0x1
-	bl sub_81973FC
-	ldr r1, =gUnknown_020375BC
-	movs r0, 0
-	strb r0, [r1]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8098358
-
-	thumb_func_start sub_8098374
-sub_8098374: @ 8098374
-	push {lr}
-	bl task_del_textbox
-	ldr r1, =gUnknown_020375BC
-	movs r0, 0
-	strb r0, [r1]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8098374
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/field_screen.s b/asm/field_screen.s
index 1b6716d3c..d05028cc6 100644
--- a/asm/field_screen.s
+++ b/asm/field_screen.s
@@ -2339,43 +2339,43 @@ _080AC290:
 	.4byte _080AC300
 _080AC2B8:
 	movs r0, 0x1
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC2C0:
 	movs r0, 0x2
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC2C8:
 	movs r0, 0x3
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC2D0:
 	movs r0, 0x4
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC2D8:
 	movs r0, 0x5
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC2E0:
 	movs r0, 0x6
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC2E8:
 	movs r0, 0x9
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC2F0:
 	movs r0, 0x7
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC2F8:
 	movs r0, 0x8
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC300:
 	movs r0, 0xB
-	bl sub_80AEDF0
+	bl SetWeather
 _080AC306:
 	pop {r0}
 	bx r0
@@ -7561,8 +7561,8 @@ SetSav1WeatherFromCurrMapHeader: @ 80AEDBC
 	.pool
 	thumb_func_end SetSav1WeatherFromCurrMapHeader
 
-	thumb_func_start sub_80AEDF0
-sub_80AEDF0: @ 80AEDF0
+	thumb_func_start SetWeather
+SetWeather: @ 80AEDF0
 	push {lr}
 	bl SetSav1Weather
 	bl GetSav1Weather
@@ -7571,7 +7571,7 @@ sub_80AEDF0: @ 80AEDF0
 	bl weather_set
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80AEDF0
+	thumb_func_end SetWeather
 
 	thumb_func_start sub_80AEE08
 sub_80AEE08: @ 80AEE08
diff --git a/asm/link.s b/asm/link.s
index f794ffca3..a3d621601 100644
--- a/asm/link.s
+++ b/asm/link.s
@@ -15,7 +15,7 @@ sub_80093CC: @ 80093CC
 	cmp r0, r1
 	beq _080093F4
 	bl sub_800B4A4
-	bl sub_80097E8
+	bl CloseLink
 	bl RestoreSerialTimer3IntrHandlers
 	movs r0, 0
 	b _080093FE
@@ -29,15 +29,15 @@ _080093FE:
 	bx r1
 	thumb_func_end sub_80093CC
 
-	thumb_func_start sub_8009404
-sub_8009404: @ 8009404
+	thumb_func_start Task_DestroySelf
+Task_DestroySelf: @ 8009404
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
 	bl DestroyTask
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8009404
+	thumb_func_end Task_DestroySelf
 
 	thumb_func_start sub_8009414
 sub_8009414: @ 8009414
@@ -210,7 +210,7 @@ sub_8009570: @ 8009570
 	ldr r2, =0x00001111
 	adds r0, r2, 0
 	strh r0, [r1]
-	bl sub_8009734
+	bl OpenLink
 	ldr r0, =gMain
 	ldrh r0, [r0, 0x24]
 	bl SeedRng
@@ -236,7 +236,7 @@ _080095A0:
 	lsls r1, 5
 	movs r0, 0
 	bl SetGpuReg
-	ldr r0, =sub_8009404
+	ldr r0, =Task_DestroySelf
 	movs r1, 0
 	bl CreateTask
 	bl RunTasks
@@ -384,8 +384,8 @@ _08009726:
 	.pool
 	thumb_func_end task02_080097CC
 
-	thumb_func_start sub_8009734
-sub_8009734: @ 8009734
+	thumb_func_start OpenLink
+OpenLink: @ 8009734
 	push {r4-r6,lr}
 	ldr r0, =gLinkVSyncDisabled
 	ldrb r4, [r0]
@@ -443,10 +443,10 @@ _080097BE:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8009734
+	thumb_func_end OpenLink
 
-	thumb_func_start sub_80097E8
-sub_80097E8: @ 80097E8
+	thumb_func_start CloseLink
+CloseLink: @ 80097E8
 	push {r4,lr}
 	ldr r0, =gReceivedRemoteLinkPlayers
 	movs r4, 0
@@ -464,7 +464,7 @@ _080097FC:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80097E8
+	thumb_func_end CloseLink
 
 	thumb_func_start sub_8009818
 sub_8009818: @ 8009818
@@ -698,7 +698,7 @@ _080099FC:
 	bls _080099FC
 	ldrh r0, [r4]
 	strh r0, [r5]
-	ldr r0, =gUnknown_030030E0
+	ldr r0, =gLinkStatus
 	ldr r0, [r0]
 	movs r1, 0x40
 	ands r0, r1
@@ -717,7 +717,7 @@ _080099FC:
 _08009A34:
 	bl sub_800AEB4
 _08009A38:
-	ldr r0, =gUnknown_030030E0
+	ldr r0, =gLinkStatus
 	ldrh r0, [r0]
 _08009A3C:
 	pop {r4,r5}
@@ -745,7 +745,7 @@ _08009A70:
 	adds r5, r0
 	adds r4, 0x1
 _08009A78:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0
@@ -1378,7 +1378,7 @@ GetLinkPlayerCount: @ 8009FCC
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08009FEC
-	ldr r0, =gUnknown_030030E0
+	ldr r0, =gLinkStatus
 	ldr r0, [r0]
 	movs r1, 0x1C
 	ands r0, r1
@@ -1514,7 +1514,7 @@ sub_800A0AC: @ 800A0AC
 	str r1, [r0]
 	ldr r0, =gUnknown_020229C8
 	strh r1, [r0]
-	bl sub_8009734
+	bl OpenLink
 	pop {r0}
 	bx r0
 	.pool
@@ -1532,7 +1532,7 @@ sub_800A0C8: @ 800A0C8
 	beq _0800A0DA
 	b _0800A214
 _0800A0DA:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
@@ -1552,7 +1552,7 @@ _0800A0FC:
 	bne _0800A10E
 	ldr r0, =gUnknown_0300306C
 	strb r4, [r0]
-	bl sub_80097E8
+	bl CloseLink
 _0800A10E:
 	movs r6, 0
 	ldr r4, =gLinkPlayers
@@ -2211,7 +2211,7 @@ _0800A616:
 	thumb_func_start sub_800A620
 sub_800A620: @ 800A620
 	push {lr}
-	ldr r0, =gUnknown_030030E0
+	ldr r0, =gLinkStatus
 	ldr r1, [r0]
 	movs r0, 0x20
 	ands r0, r1
@@ -2499,7 +2499,7 @@ _0800A81C:
 	thumb_func_start sub_800A824
 sub_800A824: @ 800A824
 	push {lr}
-	ldr r0, =gUnknown_030030E0
+	ldr r0, =gLinkStatus
 	ldr r0, [r0]
 	movs r1, 0x20
 	ands r0, r1
@@ -2534,7 +2534,7 @@ task00_link_test: @ 800A850
 	movs r2, 0x1
 	movs r3, 0x2
 	bl sub_800A6E8
-	ldr r4, =gUnknown_030030E0
+	ldr r4, =gLinkStatus
 	ldr r0, [r4]
 	movs r1, 0xF
 	movs r2, 0x1
@@ -2606,7 +2606,7 @@ task00_link_test: @ 800A850
 	movs r2, 0x6
 	movs r3, 0x1
 	bl sub_800A6E8
-	bl sub_800B320
+	bl IsLinkConnectionEstablished
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x19
@@ -2807,7 +2807,7 @@ _0800AAB4:
 	ldrb r0, [r0]
 	cmp r3, r0
 	bne _0800AAE4
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	mov r1, r9
@@ -2887,7 +2887,7 @@ _0800AB5A:
 	ldr r1, =gUnknown_0300306C
 	movs r0, 0x1
 	strb r0, [r1]
-	bl sub_80097E8
+	bl CloseLink
 	ldr r0, =c2_800ACD4
 	bl SetMainCallback2
 _0800AB6A:
@@ -2918,25 +2918,25 @@ sub_800AB98: @ 800AB98
 	.pool
 	thumb_func_end sub_800AB98
 
-	thumb_func_start sub_800ABAC
-sub_800ABAC: @ 800ABAC
-	ldr r0, =gUnknown_030030E0
+	thumb_func_start GetLinkPlayerCount_2
+GetLinkPlayerCount_2: @ 800ABAC
+	ldr r0, =gLinkStatus
 	ldr r0, [r0]
 	movs r1, 0x1C
 	ands r0, r1
 	lsrs r0, 2
 	bx lr
 	.pool
-	thumb_func_end sub_800ABAC
+	thumb_func_end GetLinkPlayerCount_2
 
-	thumb_func_start sub_800ABBC
-sub_800ABBC: @ 800ABBC
+	thumb_func_start IsLinkMaster
+IsLinkMaster: @ 800ABBC
 	push {lr}
 	ldr r0, =gLinkVSyncDisabled
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0800ABDC
-	ldr r0, =gUnknown_030030E0
+	ldr r0, =gLinkStatus
 	ldr r0, [r0]
 	lsrs r0, 5
 	movs r1, 0x1
@@ -2950,7 +2950,7 @@ _0800ABDC:
 _0800ABE4:
 	pop {r1}
 	bx r1
-	thumb_func_end sub_800ABBC
+	thumb_func_end IsLinkMaster
 
 	thumb_func_start sub_800ABE8
 sub_800ABE8: @ 800ABE8
@@ -3074,7 +3074,7 @@ _0800ACD0:
 	ldr r0, =gUnknown_03002748
 	movs r4, 0x1
 	strb r4, [r0]
-	bl sub_80097E8
+	bl CloseLink
 	ldr r1, =gUnknown_03003140
 	movs r0, 0
 	str r0, [r1]
@@ -3178,7 +3178,7 @@ _0800ADB6:
 	ldr r0, =gUnknown_03002748
 	movs r4, 0x1
 	strb r4, [r0]
-	bl sub_80097E8
+	bl CloseLink
 	ldr r1, =gUnknown_03003140
 	movs r0, 0
 	str r0, [r1]
@@ -3290,7 +3290,7 @@ sub_800AEB4: @ 800AEB4
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0800AEF4
-	ldr r0, =gUnknown_030030E0
+	ldr r0, =gLinkStatus
 	ldr r2, [r0]
 	movs r0, 0xFE
 	lsls r0, 11
@@ -3315,7 +3315,7 @@ _0800AEEA:
 	ldr r1, =gUnknown_0300306C
 	movs r0, 0x1
 	strb r0, [r1]
-	bl sub_80097E8
+	bl CloseLink
 _0800AEF4:
 	pop {r0}
 	bx r0
@@ -3426,7 +3426,7 @@ _0800AF8C:
 	ldr r1, =gSoftResetDisabled
 	movs r0, 0
 	strb r0, [r1]
-	ldr r0, =sub_8009404
+	ldr r0, =Task_DestroySelf
 	movs r1, 0
 	bl CreateTask
 	bl StopMapMusic
@@ -3740,16 +3740,16 @@ _0800B314:
 	.pool
 	thumb_func_end sub_800B2F8
 
-	thumb_func_start sub_800B320
-sub_800B320: @ 800B320
-	ldr r0, =gUnknown_030030E0
+	thumb_func_start IsLinkConnectionEstablished
+IsLinkConnectionEstablished: @ 800B320
+	ldr r0, =gLinkStatus
 	ldr r0, [r0]
 	lsrs r0, 6
 	movs r1, 0x1
 	ands r0, r1
 	bx lr
 	.pool
-	thumb_func_end sub_800B320
+	thumb_func_end IsLinkConnectionEstablished
 
 	thumb_func_start sub_800B330
 sub_800B330: @ 800B330
@@ -3864,7 +3864,7 @@ HandleLinkConnection: @ 800B40C
 	ldr r1, =gSendCmd
 	ldr r2, =gRecvCmds
 	bl sub_800B638
-	ldr r4, =gUnknown_030030E0
+	ldr r4, =gLinkStatus
 	str r0, [r4]
 	ldr r0, =gUnknown_030022EC
 	bl sub_80099E0
@@ -15025,7 +15025,7 @@ _08010E20:
 	ldrb r1, [r0]
 	movs r1, 0x2
 	strb r1, [r0]
-	bl sub_80097E8
+	bl CloseLink
 	b _08010E8E
 	.pool
 _08010E5C:
@@ -16613,7 +16613,7 @@ sub_8011AFC: @ 8011AFC
 	adds r0, r2, 0
 	strh r0, [r1]
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	ldr r0, =gMain
 	ldrh r0, [r0, 0x24]
 	bl SeedRng
@@ -18142,7 +18142,7 @@ _08012848:
 	movs r2, 0
 	bl sub_8010F84
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	ldrb r1, [r4]
 	movs r0, 0xF
 	ands r0, r1
@@ -19650,7 +19650,7 @@ _08013590:
 	movs r2, 0
 	bl sub_8010F84
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	bl sub_8011C5C
 	movs r0, 0x70
 	bl AllocZeroed
@@ -20398,7 +20398,7 @@ _08013CD0:
 	movs r2, 0
 	bl sub_8010F84
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	bl sub_8011C5C
 	movs r0, 0x1
 	bl sub_80111B0
@@ -21897,7 +21897,7 @@ _08014AB0:
 	movs r1, 0
 	bl sub_8010FA0
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	movs r0, 0x2
 	bl sub_8011C10
 	movs r0, 0x1
@@ -22435,7 +22435,7 @@ _08014FA4:
 	movs r2, 0
 	bl sub_8010F84
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	bl sub_8011C5C
 	movs r0, 0x70
 	bl AllocZeroed
@@ -22823,7 +22823,7 @@ _08015358:
 	movs r2, 0
 	bl sub_8010F84
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	bl sub_8011C5C
 	movs r0, 0x70
 	bl AllocZeroed
@@ -23373,7 +23373,7 @@ _08015878:
 	ldrh r2, [r2, 0xC]
 	bl sub_8010FCC
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	bl sub_8011C84
 	ldr r0, [r6, 0x8]
 	movs r1, 0x1
@@ -25223,7 +25223,7 @@ _080169BE:
 	movs r2, 0
 	bl sub_8010F84
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	bl sub_8011C84
 	movs r0, 0x1
 	bl sub_80111B0
@@ -31098,7 +31098,7 @@ _080198FE:
 	b _08019922
 	.pool
 _0801990C:
-	bl sub_80097E8
+	bl CloseLink
 	ldr r0, [r5, 0x10]
 	bl Free
 	adds r0, r4, 0
@@ -31433,7 +31433,7 @@ _08019B84:
 	b _08019B9C
 _08019B96:
 	adds r0, r4, 0
-	bl sub_8097404
+	bl FreezeMapObject
 _08019B9C:
 	movs r0, 0x1
 _08019B9E:
diff --git a/asm/main_menu.s b/asm/main_menu.s
index 9d6cba40f..08e0c3103 100644
--- a/asm/main_menu.s
+++ b/asm/main_menu.s
@@ -1495,7 +1495,7 @@ _08030478:
 	b _0803048A
 	.pool
 _08030480:
-	ldr r0, =sub_8178974
+	ldr r0, =CB2_InitMysteryEventMenu
 	b _0803048A
 	.pool
 _08030488:
diff --git a/asm/map_obj_8097404.s b/asm/map_obj_8097404.s
deleted file mode 100644
index 4a6ae9945..000000000
--- a/asm/map_obj_8097404.s
+++ /dev/null
@@ -1,1861 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8097404
-@ bool8 sub_8097404(struct npc_state *fieldObject)
-sub_8097404: @ 8097404
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldrh r1, [r5]
-	movs r0, 0xA0
-	lsls r0, 1
-	ands r0, r1
-	cmp r0, 0
-	bne _0809748C
-	ldrb r0, [r5, 0x1]
-	movs r4, 0x1
-	orrs r0, r4
-	strb r0, [r5, 0x1]
-	ldr r3, =gSprites
-	ldrb r1, [r5, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x2C
-	ldrb r1, [r0]
-	lsls r1, 25
-	lsrs r1, 31
-	lsls r1, 7
-	ldrb r2, [r5, 0x2]
-	movs r0, 0x7F
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r5, 0x2]
-	ldrb r1, [r5, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x2C
-	ldrb r1, [r0]
-	lsrs r1, 7
-	ands r1, r4
-	ldrb r2, [r5, 0x3]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r5, 0x3]
-	ldrb r1, [r5, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x2C
-	ldrb r1, [r0]
-	movs r2, 0x40
-	orrs r1, r2
-	strb r1, [r0]
-	ldrb r1, [r5, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x2C
-	ldrb r1, [r0]
-	movs r2, 0x80
-	orrs r1, r2
-	strb r1, [r0]
-	movs r0, 0
-	b _0809748E
-	.pool
-_0809748C:
-	movs r0, 0x1
-_0809748E:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8097404
-
-	thumb_func_start FreezeMapObjects
-@ void FreezeMapObjects()
-FreezeMapObjects: @ 8097494
-	push {r4,r5,lr}
-	movs r4, 0
-	ldr r5, =gMapObjects
-_0809749A:
-	lsls r0, r4, 3
-	adds r0, r4
-	lsls r0, 2
-	adds r1, r0, r5
-	ldrb r0, [r1]
-	lsls r0, 31
-	cmp r0, 0
-	beq _080974B8
-	ldr r0, =gPlayerAvatar
-	ldrb r0, [r0, 0x5]
-	cmp r4, r0
-	beq _080974B8
-	adds r0, r1, 0
-	bl sub_8097404
-_080974B8:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0xF
-	bls _0809749A
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end FreezeMapObjects
-
-	thumb_func_start sub_80974D0
-sub_80974D0: @ 80974D0
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r4, 0
-	ldr r6, =gMapObjects
-_080974DA:
-	cmp r4, r5
-	beq _080974FC
-	lsls r0, r4, 3
-	adds r0, r4
-	lsls r0, 2
-	adds r1, r0, r6
-	ldrb r0, [r1]
-	lsls r0, 31
-	cmp r0, 0
-	beq _080974FC
-	ldr r0, =gPlayerAvatar
-	ldrb r0, [r0, 0x5]
-	cmp r4, r0
-	beq _080974FC
-	adds r0, r1, 0
-	bl sub_8097404
-_080974FC:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0xF
-	bls _080974DA
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80974D0
-
-	thumb_func_start npc_sync_anim_pause_bits
-@ void npc_sync_anim_pause_bits(struct npc_state *fieldObject)
-npc_sync_anim_pause_bits: @ 8097514
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldrh r2, [r5]
-	ldr r1, =0x00000101
-	adds r0, r1, 0
-	ands r0, r2
-	cmp r0, r1
-	bne _0809756C
-	ldrb r1, [r5, 0x1]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r5, 0x1]
-	ldr r4, =gSprites
-	ldrb r0, [r5, 0x4]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	ldrb r2, [r5, 0x2]
-	adds r1, 0x2C
-	lsrs r2, 7
-	lsls r2, 6
-	ldrb r3, [r1]
-	movs r0, 0x41
-	negs r0, r0
-	ands r0, r3
-	orrs r0, r2
-	strb r0, [r1]
-	ldrb r0, [r5, 0x4]
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	adds r2, r4
-	ldrb r1, [r5, 0x3]
-	lsls r1, 31
-	lsrs r1, 31
-	adds r2, 0x2C
-	lsls r1, 7
-	ldrb r3, [r2]
-	movs r0, 0x7F
-	ands r0, r3
-	orrs r0, r1
-	strb r0, [r2]
-_0809756C:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end npc_sync_anim_pause_bits
-
-	thumb_func_start UnfreezeMapObjects
-UnfreezeMapObjects: @ 809757C
-	push {r4,r5,lr}
-	movs r4, 0
-	ldr r5, =gMapObjects
-_08097582:
-	lsls r0, r4, 3
-	adds r0, r4
-	lsls r0, 2
-	adds r1, r0, r5
-	ldrb r0, [r1]
-	lsls r0, 31
-	cmp r0, 0
-	beq _08097598
-	adds r0, r1, 0
-	bl npc_sync_anim_pause_bits
-_08097598:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0xF
-	bls _08097582
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end UnfreezeMapObjects
-
-	thumb_func_start little_step
-@ void little_step(struct obj *object, u8 direction)
-little_step: @ 80975AC
-	lsls r1, 24
-	ldr r2, =gUnknown_0850DB7C
-	lsrs r1, 22
-	adds r1, r2
-	ldrh r2, [r1]
-	ldrh r3, [r0, 0x20]
-	adds r2, r3
-	strh r2, [r0, 0x20]
-	ldrh r1, [r1, 0x2]
-	ldrh r2, [r0, 0x22]
-	adds r1, r2
-	strh r1, [r0, 0x22]
-	bx lr
-	.pool
-	thumb_func_end little_step
-
-	thumb_func_start double_little_steps
-double_little_steps: @ 80975CC
-	lsls r1, 24
-	ldr r2, =gUnknown_0850DB7C
-	lsrs r1, 22
-	adds r1, r2
-	ldrh r2, [r1]
-	lsls r2, 1
-	ldrh r3, [r0, 0x20]
-	adds r2, r3
-	strh r2, [r0, 0x20]
-	ldrh r1, [r1, 0x2]
-	lsls r1, 1
-	ldrh r2, [r0, 0x22]
-	adds r1, r2
-	strh r1, [r0, 0x22]
-	bx lr
-	.pool
-	thumb_func_end double_little_steps
-
-	thumb_func_start triple_little_steps
-triple_little_steps: @ 80975F0
-	lsls r1, 24
-	ldr r2, =gUnknown_0850DB7C
-	lsrs r1, 22
-	adds r1, r2
-	ldrh r2, [r1]
-	lsls r3, r2, 1
-	adds r2, r3
-	ldrh r3, [r0, 0x20]
-	adds r2, r3
-	strh r2, [r0, 0x20]
-	ldrh r1, [r1, 0x2]
-	lsls r2, r1, 1
-	adds r1, r2
-	ldrh r2, [r0, 0x22]
-	adds r1, r2
-	strh r1, [r0, 0x22]
-	bx lr
-	.pool
-	thumb_func_end triple_little_steps
-
-	thumb_func_start quad_little_steps
-quad_little_steps: @ 8097618
-	lsls r1, 24
-	ldr r2, =gUnknown_0850DB7C
-	lsrs r1, 22
-	adds r1, r2
-	ldrh r2, [r1]
-	lsls r2, 2
-	ldrh r3, [r0, 0x20]
-	adds r2, r3
-	strh r2, [r0, 0x20]
-	ldrh r1, [r1, 0x2]
-	lsls r1, 2
-	ldrh r2, [r0, 0x22]
-	adds r1, r2
-	strh r1, [r0, 0x22]
-	bx lr
-	.pool
-	thumb_func_end quad_little_steps
-
-	thumb_func_start oct_little_steps
-@ void oct_little_steps(struct obj *object, u8 direction)
-oct_little_steps: @ 809763C
-	lsls r1, 24
-	ldr r2, =gUnknown_0850DB7C
-	lsrs r1, 22
-	adds r1, r2
-	ldrh r2, [r1]
-	lsls r2, 3
-	ldrh r3, [r0, 0x20]
-	adds r2, r3
-	strh r2, [r0, 0x20]
-	ldrh r1, [r1, 0x2]
-	lsls r1, 3
-	ldrh r2, [r0, 0x22]
-	adds r1, r2
-	strh r1, [r0, 0x22]
-	bx lr
-	.pool
-	thumb_func_end oct_little_steps
-
-	thumb_func_start oamt_npc_ministep_reset
-@ void oamt_npc_ministep_reset(struct obj *object, u8 direction, u8 speed)
-oamt_npc_ministep_reset: @ 8097660
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	movs r3, 0
-	strh r1, [r0, 0x34]
-	strh r2, [r0, 0x36]
-	strh r3, [r0, 0x38]
-	bx lr
-	thumb_func_end oamt_npc_ministep_reset
-
-	thumb_func_start obj_npc_ministep
-@ bool8 obj_npc_ministep(struct obj *object)
-obj_npc_ministep: @ 8097674
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldr r5, =gUnknown_0850E768
-	movs r0, 0x36
-	ldrsh r2, [r4, r0]
-	lsls r0, r2, 1
-	adds r0, r5
-	movs r3, 0x38
-	ldrsh r1, [r4, r3]
-	movs r3, 0
-	ldrsh r0, [r0, r3]
-	cmp r1, r0
-	bge _080976D4
-	ldr r1, =gUnknown_0850E754
-	lsls r0, r2, 2
-	adds r0, r1
-	movs r1, 0x38
-	ldrsh r2, [r4, r1]
-	ldr r0, [r0]
-	lsls r2, 2
-	adds r2, r0
-	ldrh r1, [r4, 0x34]
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r2, [r2]
-	adds r0, r4, 0
-	bl _call_via_r2
-	ldrh r0, [r4, 0x38]
-	adds r0, 0x1
-	strh r0, [r4, 0x38]
-	movs r2, 0x36
-	ldrsh r1, [r4, r2]
-	lsls r1, 1
-	adds r1, r5
-	lsls r0, 16
-	asrs r0, 16
-	movs r3, 0
-	ldrsh r1, [r1, r3]
-	cmp r0, r1
-	blt _080976D4
-	movs r0, 0x1
-	b _080976D6
-	.pool
-_080976D4:
-	movs r0, 0
-_080976D6:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end obj_npc_ministep
-
-	thumb_func_start sub_80976DC
-@ void sub_80976DC(struct obj *object, u8 direction)
-sub_80976DC: @ 80976DC
-	lsls r1, 24
-	lsrs r1, 24
-	movs r2, 0
-	strh r1, [r0, 0x34]
-	strh r2, [r0, 0x36]
-	strh r2, [r0, 0x38]
-	bx lr
-	thumb_func_end sub_80976DC
-
-	thumb_func_start sub_80976EC
-@ bool8 sub_80976EC(struct obj *object)
-sub_80976EC: @ 80976EC
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r1, [r4, 0x36]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _0809770C
-	ldrh r1, [r4, 0x34]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl little_step
-	ldrh r0, [r4, 0x38]
-	adds r0, 0x1
-	strh r0, [r4, 0x38]
-_0809770C:
-	ldrh r0, [r4, 0x36]
-	adds r0, 0x1
-	strh r0, [r4, 0x36]
-	movs r1, 0x38
-	ldrsh r0, [r4, r1]
-	cmp r0, 0xF
-	bgt _0809771E
-	movs r0, 0
-	b _08097720
-_0809771E:
-	movs r0, 0x1
-_08097720:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80976EC
-
-	thumb_func_start sub_8097728
-sub_8097728: @ 8097728
-	ldr r1, =gUnknown_0850E7BA
-	lsls r0, 16
-	asrs r0, 16
-	adds r0, r1
-	ldrb r0, [r0]
-	lsls r0, 24
-	asrs r0, 24
-	bx lr
-	.pool
-	thumb_func_end sub_8097728
-
-	thumb_func_start sub_809773C
-sub_809773C: @ 809773C
-	ldr r1, =gUnknown_0850E772
-	lsls r0, 16
-	asrs r0, 16
-	adds r0, r1
-	ldrb r0, [r0]
-	lsls r0, 24
-	asrs r0, 24
-	bx lr
-	.pool
-	thumb_func_end sub_809773C
-
-	thumb_func_start sub_8097750
-sub_8097750: @ 8097750
-	movs r1, 0
-	strh r1, [r0, 0x3A]
-	strh r1, [r0, 0x3C]
-	bx lr
-	thumb_func_end sub_8097750
-
-	thumb_func_start sub_8097758
-sub_8097758: @ 8097758
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	movs r6, 0
-	movs r1, 0x3C
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x1
-	beq _0809778E
-	cmp r0, 0x1
-	bgt _08097770
-	cmp r0, 0
-	beq _0809777A
-	b _080977F2
-_08097770:
-	cmp r0, 0x2
-	beq _080977B6
-	cmp r0, 0x3
-	beq _080977CA
-	b _080977F2
-_0809777A:
-	movs r2, 0x3A
-	ldrsh r0, [r5, r2]
-	bl sub_809773C
-	ldrh r1, [r5, 0x24]
-	adds r0, r1
-	strh r0, [r5, 0x24]
-	movs r2, 0x3A
-	ldrsh r0, [r5, r2]
-	b _080977E8
-_0809778E:
-	ldrh r0, [r5, 0x3A]
-	movs r4, 0x47
-	subs r0, r4, r0
-	lsls r0, 16
-	asrs r0, 16
-	bl sub_809773C
-	ldrh r1, [r5, 0x24]
-	subs r1, r0
-	strh r1, [r5, 0x24]
-	ldrh r0, [r5, 0x3A]
-	subs r4, r0
-	lsls r4, 16
-	asrs r4, 16
-	adds r0, r4, 0
-	bl sub_8097728
-	ldrh r2, [r5, 0x26]
-	adds r0, r2
-	b _080977F0
-_080977B6:
-	movs r1, 0x3A
-	ldrsh r0, [r5, r1]
-	bl sub_809773C
-	ldrh r1, [r5, 0x24]
-	subs r1, r0
-	strh r1, [r5, 0x24]
-	movs r2, 0x3A
-	ldrsh r0, [r5, r2]
-	b _080977E8
-_080977CA:
-	ldrh r0, [r5, 0x3A]
-	movs r4, 0x47
-	subs r0, r4, r0
-	lsls r0, 16
-	asrs r0, 16
-	bl sub_809773C
-	ldrh r2, [r5, 0x24]
-	adds r0, r2
-	strh r0, [r5, 0x24]
-	ldrh r0, [r5, 0x3A]
-	subs r4, r0
-	lsls r4, 16
-	asrs r4, 16
-	adds r0, r4, 0
-_080977E8:
-	bl sub_8097728
-	ldrh r1, [r5, 0x26]
-	adds r0, r1
-_080977F0:
-	strh r0, [r5, 0x26]
-_080977F2:
-	ldrh r0, [r5, 0x3A]
-	adds r0, 0x1
-	movs r1, 0
-	strh r0, [r5, 0x3A]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x48
-	bne _0809780A
-	strh r1, [r5, 0x3A]
-	ldrh r0, [r5, 0x3C]
-	adds r0, 0x1
-	strh r0, [r5, 0x3C]
-_0809780A:
-	movs r2, 0x3C
-	ldrsh r0, [r5, r2]
-	cmp r0, 0x4
-	bne _08097818
-	strh r1, [r5, 0x26]
-	strh r1, [r5, 0x24]
-	movs r6, 0x1
-_08097818:
-	adds r0, r6, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8097758
-
-	thumb_func_start sub_8097820
-sub_8097820: @ 8097820
-	lsls r1, 24
-	ldr r2, =gUnknown_0850E834
-	lsrs r1, 22
-	adds r1, r2
-	lsls r0, 16
-	asrs r0, 16
-	ldr r1, [r1]
-	adds r1, r0
-	movs r0, 0
-	ldrsb r0, [r1, r0]
-	bx lr
-	.pool
-	thumb_func_end sub_8097820
-
-	thumb_func_start sub_809783C
-sub_809783C: @ 809783C
-	push {r4,lr}
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	lsls r3, 24
-	lsrs r3, 24
-	movs r4, 0
-	strh r1, [r0, 0x34]
-	strh r2, [r0, 0x36]
-	strh r3, [r0, 0x38]
-	strh r4, [r0, 0x3A]
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809783C
-
-	thumb_func_start sub_809785C
-sub_809785C: @ 809785C
-	push {r4-r6,lr}
-	sub sp, 0xC
-	adds r4, r0, 0
-	ldr r1, =gUnknown_0850E840
-	mov r0, sp
-	movs r2, 0x6
-	bl memcpy
-	add r5, sp, 0x8
-	ldr r1, =gUnknown_0850E846
-	adds r0, r5, 0
-	movs r2, 0x3
-	bl memcpy
-	movs r6, 0
-	movs r1, 0x36
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _0809788E
-	ldrh r1, [r4, 0x34]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl little_step
-_0809788E:
-	movs r2, 0x3A
-	ldrsh r0, [r4, r2]
-	movs r2, 0x36
-	ldrsh r1, [r4, r2]
-	adds r1, r5, r1
-	ldrb r1, [r1]
-	asrs r0, r1
-	ldrh r1, [r4, 0x38]
-	lsls r1, 24
-	lsrs r1, 24
-	bl sub_8097820
-	strh r0, [r4, 0x26]
-	ldrh r1, [r4, 0x3A]
-	adds r1, 0x1
-	strh r1, [r4, 0x3A]
-	movs r2, 0x36
-	ldrsh r0, [r4, r2]
-	lsls r0, 1
-	add r0, sp
-	ldrh r0, [r0]
-	lsls r0, 16
-	asrs r2, r0, 16
-	lsls r1, 16
-	asrs r1, 16
-	asrs r0, 17
-	cmp r1, r0
-	bne _080978C8
-	movs r6, 0x1
-_080978C8:
-	cmp r1, r2
-	blt _080978D2
-	movs r0, 0
-	strh r0, [r4, 0x26]
-	movs r6, 0xFF
-_080978D2:
-	adds r0, r6, 0
-	add sp, 0xC
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_809785C
-
-	thumb_func_start sub_80978E4
-sub_80978E4: @ 80978E4
-	push {r4-r6,lr}
-	sub sp, 0xC
-	adds r5, r0, 0
-	ldr r1, =gUnknown_0850E84A
-	mov r0, sp
-	movs r2, 0x6
-	bl memcpy
-	add r4, sp, 0x8
-	ldr r1, =gUnknown_0850E850
-	adds r0, r4, 0
-	movs r2, 0x3
-	bl memcpy
-	movs r6, 0
-	movs r1, 0x36
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	beq _08097920
-	ldrh r1, [r5, 0x3A]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _08097920
-	ldrh r1, [r5, 0x34]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	bl little_step
-_08097920:
-	movs r2, 0x3A
-	ldrsh r0, [r5, r2]
-	movs r2, 0x36
-	ldrsh r1, [r5, r2]
-	adds r1, r4, r1
-	ldrb r1, [r1]
-	asrs r0, r1
-	ldrh r1, [r5, 0x38]
-	lsls r1, 24
-	lsrs r1, 24
-	bl sub_8097820
-	strh r0, [r5, 0x26]
-	ldrh r1, [r5, 0x3A]
-	adds r1, 0x1
-	strh r1, [r5, 0x3A]
-	movs r2, 0x36
-	ldrsh r0, [r5, r2]
-	lsls r0, 1
-	add r0, sp
-	ldrh r0, [r0]
-	lsls r0, 16
-	asrs r2, r0, 16
-	lsls r1, 16
-	asrs r1, 16
-	asrs r0, 17
-	cmp r1, r0
-	bne _0809795A
-	movs r6, 0x1
-_0809795A:
-	cmp r1, r2
-	blt _08097964
-	movs r0, 0
-	strh r0, [r5, 0x26]
-	movs r6, 0xFF
-_08097964:
-	adds r0, r6, 0
-	add sp, 0xC
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80978E4
-
-	thumb_func_start SetFieldObjectStepTimer
-@ void SetFieldObjectStepTimer(struct obj *object, u16 a2)
-SetFieldObjectStepTimer: @ 8097978
-	strh r1, [r0, 0x34]
-	bx lr
-	thumb_func_end SetFieldObjectStepTimer
-
-	thumb_func_start RunFieldObjectStepTimer
-@ bool8 RunFieldObjectStepTimer(struct obj *object)
-RunFieldObjectStepTimer: @ 809797C
-	push {lr}
-	ldrh r1, [r0, 0x34]
-	subs r1, 0x1
-	strh r1, [r0, 0x34]
-	lsls r1, 16
-	cmp r1, 0
-	beq _0809798E
-	movs r0, 0
-	b _08097990
-_0809798E:
-	movs r0, 0x1
-_08097990:
-	pop {r1}
-	bx r1
-	thumb_func_end RunFieldObjectStepTimer
-
-	thumb_func_start obj_anim_image_set_and_seek
-obj_anim_image_set_and_seek: @ 8097994
-	push {r4,lr}
-	lsls r2, 24
-	lsrs r2, 24
-	adds r3, r0, 0
-	adds r3, 0x2A
-	strb r1, [r3]
-	adds r4, r0, 0
-	adds r4, 0x2C
-	ldrb r3, [r4]
-	movs r1, 0x41
-	negs r1, r1
-	ands r1, r3
-	strb r1, [r4]
-	adds r1, r2, 0
-	bl SeekSpriteAnim
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end obj_anim_image_set_and_seek
-
-	thumb_func_start sub_80979BC
-sub_80979BC: @ 80979BC
-	push {lr}
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	bne _080979CE
-	movs r0, 0
-	b _080979D0
-_080979CE:
-	movs r0, 0x1
-_080979D0:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80979BC
-
-	thumb_func_start sub_80979D4
-sub_80979D4: @ 80979D4
-	push {r4-r6,lr}
-	mov r12, r0
-	lsls r1, 24
-	lsrs r1, 24
-	mov r3, r12
-	adds r3, 0x3E
-	movs r0, 0x1
-	ands r1, r0
-	lsls r1, 2
-	ldrb r2, [r3]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-	movs r1, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08097A3C
-	mov r0, r12
-	ldrh r1, [r0, 0x24]
-	ldrh r2, [r0, 0x20]
-	adds r1, r2
-	mov r4, r12
-	adds r4, 0x28
-	movs r0, 0
-	ldrsb r0, [r4, r0]
-	ldr r2, =gSpriteCoordOffsetX
-	adds r0, r1
-	ldrh r2, [r2]
-	adds r0, r2
-	lsls r0, 16
-	lsrs r6, r0, 16
-	mov r0, r12
-	ldrh r1, [r0, 0x26]
-	ldrh r2, [r0, 0x22]
-	adds r1, r2
-	subs r3, 0x15
-	movs r0, 0
-	ldrsb r0, [r3, r0]
-	ldr r2, =gSpriteCoordOffsetY
-	adds r0, r1
-	ldrh r2, [r2]
-	adds r0, r2
-	lsls r0, 16
-	lsrs r5, r0, 16
-	adds r2, r3, 0
-	b _08097A6A
-	.pool
-_08097A3C:
-	mov r0, r12
-	ldrh r1, [r0, 0x24]
-	ldrh r2, [r0, 0x20]
-	adds r1, r2
-	mov r3, r12
-	adds r3, 0x28
-	movs r0, 0
-	ldrsb r0, [r3, r0]
-	adds r0, r1
-	lsls r0, 16
-	lsrs r6, r0, 16
-	mov r0, r12
-	ldrh r1, [r0, 0x26]
-	ldrh r2, [r0, 0x22]
-	adds r1, r2
-	mov r2, r12
-	adds r2, 0x29
-	movs r0, 0
-	ldrsb r0, [r2, r0]
-	adds r0, r1
-	lsls r0, 16
-	lsrs r5, r0, 16
-	adds r4, r3, 0
-_08097A6A:
-	ldrb r0, [r4]
-	lsls r0, 24
-	asrs r0, 25
-	subs r0, r6, r0
-	lsls r0, 16
-	lsrs r3, r0, 16
-	ldrb r0, [r2]
-	lsls r0, 24
-	asrs r0, 25
-	subs r0, r5, r0
-	lsls r0, 16
-	lsrs r2, r0, 16
-	lsls r0, r6, 16
-	asrs r0, 16
-	cmp r0, 0xFF
-	bgt _08097A96
-	lsls r0, r3, 16
-	asrs r0, 16
-	movs r1, 0x10
-	negs r1, r1
-	cmp r0, r1
-	bge _08097AA2
-_08097A96:
-	mov r4, r12
-	adds r4, 0x3E
-	ldrb r0, [r4]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r4]
-_08097AA2:
-	lsls r0, r5, 16
-	asrs r0, 16
-	cmp r0, 0xAF
-	bgt _08097AB6
-	lsls r0, r2, 16
-	asrs r0, 16
-	movs r1, 0x10
-	negs r1, r1
-	cmp r0, r1
-	bge _08097AC2
-_08097AB6:
-	mov r0, r12
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-_08097AC2:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80979D4
-
-	thumb_func_start sub_8097AC8
-sub_8097AC8: @ 8097AC8
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_8097D68
-	ldrh r0, [r4, 0x30]
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r4, 0
-	movs r2, 0x1
-	bl SetObjectSubpriorityByZCoord
-	ldrh r1, [r4, 0x32]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl sub_80979D4
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8097AC8
-
-	thumb_func_start sub_8097AF0
-sub_8097AF0: @ 8097AF0
-	push {r4,r5,lr}
-	movs r5, 0
-	movs r4, 0x3F
-_08097AF6:
-	ldr r0, =gSprites
-	adds r2, r5, r0
-	adds r0, r2, 0
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08097B16
-	ldr r1, [r2, 0x1C]
-	ldr r0, =sub_8097AC8
-	cmp r1, r0
-	bne _08097B16
-	adds r0, r2, 0
-	bl DestroySprite
-_08097B16:
-	adds r5, 0x44
-	subs r4, 0x1
-	cmp r4, 0
-	bge _08097AF6
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8097AF0
-
-	thumb_func_start sub_8097B2C
-sub_8097B2C: @ 8097B2C
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r3, 0
-	ldr r6, =gSprites
-	movs r4, 0
-_08097B38:
-	adds r2, r4, r6
-	adds r0, r2, 0
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08097B68
-	ldr r1, [r2, 0x1C]
-	ldr r0, =sub_8097AC8
-	cmp r1, r0
-	bne _08097B68
-	ldrh r0, [r2, 0x2E]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, r5
-	bne _08097B68
-	adds r0, r3, 0
-	b _08097B72
-	.pool
-_08097B68:
-	adds r4, 0x44
-	adds r3, 0x1
-	cmp r3, 0x3F
-	ble _08097B38
-	movs r0, 0x40
-_08097B72:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8097B2C
-
-	thumb_func_start sub_8097B78
-sub_8097B78: @ 8097B78
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r5, r1, 24
-	bl sub_8097B2C
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x40
-	beq _08097BAA
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gSprites
-	adds r4, r0
-	adds r0, r5, 0
-	bl FieldObjectDirectionToImageAnimId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl StartSpriteAnim
-_08097BAA:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8097B78
-
-	thumb_func_start sub_8097BB4
-sub_8097BB4: @ 8097BB4
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r5, r1, 24
-	bl sub_8097B2C
-	adds r1, r0, 0
-	cmp r1, 0x40
-	beq _08097C3E
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r4, r0, r1
-	adds r0, r5, 0
-	bl GetFieldObjectGraphicsInfo
-	ldrh r3, [r4, 0x4]
-	lsls r3, 22
-	ldr r1, [r0, 0x10]
-	ldr r2, [r1, 0x4]
-	ldr r1, [r1]
-	str r1, [r4]
-	str r2, [r4, 0x4]
-	lsrs r3, 22
-	ldrh r2, [r4, 0x4]
-	ldr r1, =0xfffffc00
-	ands r1, r2
-	orrs r1, r3
-	strh r1, [r4, 0x4]
-	ldrb r2, [r0, 0xC]
-	lsls r2, 28
-	lsrs r2, 24
-	ldrb r3, [r4, 0x5]
-	movs r1, 0xF
-	ands r1, r3
-	orrs r1, r2
-	strb r1, [r4, 0x5]
-	ldr r1, [r0, 0x1C]
-	str r1, [r4, 0xC]
-	ldr r1, [r0, 0x14]
-	cmp r1, 0
-	bne _08097C20
-	str r1, [r4, 0x18]
-	adds r0, r4, 0
-	adds r0, 0x42
-	strb r1, [r0]
-	b _08097C36
-	.pool
-_08097C20:
-	adds r0, r4, 0
-	bl SetSubspriteTables
-	adds r2, r4, 0
-	adds r2, 0x42
-	ldrb r0, [r2]
-	movs r1, 0x3F
-	ands r1, r0
-	movs r0, 0x80
-	orrs r1, r0
-	strb r1, [r2]
-_08097C36:
-	adds r0, r4, 0
-	movs r1, 0
-	bl StartSpriteAnim
-_08097C3E:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8097BB4
-
-	thumb_func_start sub_8097C44
-sub_8097C44: @ 8097C44
-	push {r4,lr}
-	adds r4, r1, 0
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_8097B2C
-	lsls r0, 24
-	lsrs r2, r0, 24
-	adds r3, r2, 0
-	cmp r2, 0x40
-	beq _08097C80
-	cmp r4, 0
-	beq _08097C74
-	ldr r0, =gSprites
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r0
-	movs r0, 0x1
-	strh r0, [r1, 0x32]
-	b _08097C80
-	.pool
-_08097C74:
-	ldr r1, =gSprites
-	lsls r0, r3, 4
-	adds r0, r3
-	lsls r0, 2
-	adds r0, r1
-	strh r4, [r0, 0x32]
-_08097C80:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8097C44
-
-	thumb_func_start sub_8097C8C
-sub_8097C8C: @ 8097C8C
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_8097B2C
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x40
-	bne _08097CA2
-	movs r0, 0
-	b _08097CBA
-_08097CA2:
-	movs r3, 0
-	ldr r0, =gSprites
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r0
-	movs r2, 0x32
-	ldrsh r0, [r1, r2]
-	cmp r0, 0x1
-	bne _08097CB8
-	movs r3, 0x1
-_08097CB8:
-	adds r0, r3, 0
-_08097CBA:
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8097C8C
-
-	thumb_func_start sub_8097CC4
-sub_8097CC4: @ 8097CC4
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r4, r1, 24
-	bl sub_8097B2C
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x40
-	beq _08097CEA
-	ldr r0, =gSprites
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r0
-	movs r0, 0
-	strh r4, [r1, 0x34]
-	strh r0, [r1, 0x36]
-_08097CEA:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8097CC4
-
-	thumb_func_start sub_8097CF4
-sub_8097CF4: @ 8097CF4
-	push {lr}
-	adds r2, r0, 0
-	movs r1, 0x36
-	ldrsh r0, [r2, r1]
-	cmp r0, 0
-	beq _08097D06
-	cmp r0, 0x1
-	beq _08097D0E
-	b _08097D2C
-_08097D06:
-	strh r0, [r2, 0x26]
-	ldrh r0, [r2, 0x36]
-	adds r0, 0x1
-	strh r0, [r2, 0x36]
-_08097D0E:
-	ldrh r0, [r2, 0x26]
-	subs r0, 0x8
-	movs r3, 0
-	strh r0, [r2, 0x26]
-	lsls r0, 16
-	asrs r0, 16
-	movs r1, 0xA0
-	negs r1, r1
-	cmp r0, r1
-	bne _08097D2C
-	strh r3, [r2, 0x26]
-	movs r0, 0x1
-	strh r0, [r2, 0x32]
-	strh r3, [r2, 0x34]
-	strh r3, [r2, 0x36]
-_08097D2C:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8097CF4
-
-	thumb_func_start sub_8097D30
-sub_8097D30: @ 8097D30
-	push {lr}
-	adds r1, r0, 0
-	movs r2, 0x36
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	beq _08097D42
-	cmp r0, 0x1
-	beq _08097D4C
-	b _08097D5E
-_08097D42:
-	ldr r0, =0x0000ff60
-	strh r0, [r1, 0x26]
-	ldrh r0, [r1, 0x36]
-	adds r0, 0x1
-	strh r0, [r1, 0x36]
-_08097D4C:
-	ldrh r0, [r1, 0x26]
-	adds r0, 0x8
-	strh r0, [r1, 0x26]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0
-	bne _08097D5E
-	strh r0, [r1, 0x34]
-	strh r0, [r1, 0x36]
-_08097D5E:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8097D30
-
-	thumb_func_start sub_8097D68
-sub_8097D68: @ 8097D68
-	push {lr}
-	adds r1, r0, 0
-	movs r2, 0x34
-	ldrsh r0, [r1, r2]
-	cmp r0, 0x1
-	beq _08097D84
-	cmp r0, 0x1
-	bgt _08097D7E
-	cmp r0, 0
-	beq _08097D98
-	b _08097D94
-_08097D7E:
-	cmp r0, 0x2
-	beq _08097D8C
-	b _08097D94
-_08097D84:
-	adds r0, r1, 0
-	bl sub_8097D30
-	b _08097D98
-_08097D8C:
-	adds r0, r1, 0
-	bl sub_8097CF4
-	b _08097D98
-_08097D94:
-	movs r0, 0
-	strh r0, [r1, 0x34]
-_08097D98:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8097D68
-
-	thumb_func_start sub_8097D9C
-sub_8097D9C: @ 8097D9C
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_8097B2C
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x40
-	beq _08097DC0
-	ldr r0, =gSprites
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r0
-	movs r2, 0x34
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	bne _08097DC8
-_08097DC0:
-	movs r0, 0
-	b _08097DCA
-	.pool
-_08097DC8:
-	movs r0, 0x1
-_08097DCA:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8097D9C
-
-	thumb_func_start oe_exec_and_other_stuff
-oe_exec_and_other_stuff: @ 8097DD0
-	push {r4,lr}
-	adds r4, r0, 0
-	adds r0, r1, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r1, =gFieldEffectArguments
-	adds r2, r1, 0x4
-	adds r3, r1, 0
-	adds r3, 0x8
-	bl FieldObjectGetLocalIdAndMap
-	adds r0, r4, 0
-	bl FieldEffectStart
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end oe_exec_and_other_stuff
-
-	thumb_func_start DoShadowFieldEffect
-DoShadowFieldEffect: @ 8097DF8
-	push {lr}
-	adds r1, r0, 0
-	ldrb r2, [r1, 0x2]
-	lsls r0, r2, 25
-	cmp r0, 0
-	blt _08097E10
-	movs r0, 0x40
-	orrs r0, r2
-	strb r0, [r1, 0x2]
-	movs r0, 0x3
-	bl oe_exec_and_other_stuff
-_08097E10:
-	pop {r0}
-	bx r0
-	thumb_func_end DoShadowFieldEffect
-
-	thumb_func_start DoRippleFieldEffect
-@ void DoRippleFieldEffect(struct npc_state *fieldObject, struct obj *object)
-DoRippleFieldEffect: @ 8097E14
-	push {r4,lr}
-	adds r4, r1, 0
-	ldrb r0, [r0, 0x5]
-	bl GetFieldObjectGraphicsInfo
-	ldr r2, =gFieldEffectArguments
-	movs r3, 0x20
-	ldrsh r1, [r4, r3]
-	str r1, [r2]
-	movs r3, 0x22
-	ldrsh r1, [r4, r3]
-	ldrh r0, [r0, 0xA]
-	lsls r0, 16
-	asrs r0, 17
-	adds r1, r0
-	subs r1, 0x2
-	str r1, [r2, 0x4]
-	movs r0, 0x97
-	str r0, [r2, 0x8]
-	movs r0, 0x3
-	str r0, [r2, 0xC]
-	movs r0, 0x5
-	bl FieldEffectStart
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end DoRippleFieldEffect
-
-	thumb_func_start sub_8097E50
-sub_8097E50: @ 8097E50
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r4, r0, 0
-	mov r8, r1
-	movs r0, 0
-	mov r12, r0
-	ldr r0, =gUnknown_020375B8
-	ldr r1, [r0]
-	adds r6, r0, 0
-	cmp r1, 0
-	bne _08097E80
-	movs r0, 0x14
-	bl AllocZeroed
-	str r0, [r6]
-	ldrb r1, [r4, 0x8]
-	strb r1, [r0]
-	ldr r1, [r6]
-	movs r0, 0x1
-	strb r0, [r1, 0x10]
-	b _08097ECC
-	.pool
-_08097E80:
-	movs r2, 0x10
-	movs r5, 0
-	movs r1, 0
-	adds r3, r6, 0
-	b _08097E90
-_08097E8A:
-	adds r0, r1, 0x1
-	lsls r0, 24
-	lsrs r1, r0, 24
-_08097E90:
-	cmp r1, 0xF
-	bhi _08097EB2
-	cmp r2, 0x10
-	bne _08097EA4
-	ldr r0, [r3]
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08097EA4
-	adds r2, r1, 0
-_08097EA4:
-	ldr r0, [r3]
-	adds r0, r1
-	ldrb r0, [r0]
-	ldrb r7, [r4, 0x8]
-	cmp r0, r7
-	bne _08097E8A
-	movs r5, 0x1
-_08097EB2:
-	cmp r5, 0
-	bne _08097ECE
-	cmp r2, 0x10
-	beq _08097ECE
-	ldr r0, [r6]
-	adds r0, r2
-	ldrb r1, [r4, 0x8]
-	strb r1, [r0]
-	ldr r1, [r6]
-	ldrb r0, [r1, 0x10]
-	adds r0, 0x1
-	strb r0, [r1, 0x10]
-	movs r0, 0x1
-_08097ECC:
-	mov r12, r0
-_08097ECE:
-	mov r1, r12
-	cmp r1, 0x1
-	bne _08097EE0
-	ldrb r0, [r4, 0x1]
-	movs r1, 0x10
-	orrs r0, r1
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r4, 0x1]
-_08097EE0:
-	movs r0, 0x1
-	mov r7, r8
-	strh r0, [r7, 0x32]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8097E50
-
-	thumb_func_start sub_8097EF0
-sub_8097EF0: @ 8097EF0
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r6, r0, 0
-	mov r8, r1
-	movs r0, 0x1
-	strh r0, [r1, 0x32]
-	ldr r5, =gUnknown_020375B8
-	ldr r0, [r5]
-	cmp r0, 0
-	beq _08097F68
-	movs r7, 0
-	adds r0, r6, 0
-	bl sub_8097F78
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0x10
-	beq _08097F28
-	ldr r0, [r5]
-	adds r0, r1
-	movs r1, 0
-	strb r1, [r0]
-	ldr r1, [r5]
-	ldrb r0, [r1, 0x10]
-	subs r0, 0x1
-	strb r0, [r1, 0x10]
-	movs r7, 0x1
-_08097F28:
-	ldr r0, [r5]
-	ldrb r4, [r0, 0x10]
-	cmp r4, 0
-	bne _08097F36
-	bl Free
-	str r4, [r5]
-_08097F36:
-	cmp r7, 0x1
-	bne _08097F68
-	ldrb r0, [r6, 0x5]
-	bl GetFieldObjectGraphicsInfo
-	ldrb r1, [r0, 0xC]
-	lsls r1, 25
-	lsrs r1, 31
-	lsls r1, 4
-	ldrb r2, [r6, 0x1]
-	movs r0, 0x11
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	movs r1, 0x3
-	negs r1, r1
-	ands r0, r1
-	strb r0, [r6, 0x1]
-	mov r2, r8
-	adds r2, 0x2C
-	ldrb r1, [r2]
-	movs r0, 0x41
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2]
-_08097F68:
-	movs r0, 0x1
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8097EF0
-
-	thumb_func_start sub_8097F78
-@ signed int sub_8097F78(npc_state *a1)
-sub_8097F78: @ 8097F78
-	push {lr}
-	movs r2, 0
-	ldr r1, =gUnknown_020375B8
-	ldr r1, [r1]
-	ldrb r3, [r0, 0x8]
-_08097F82:
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	cmp r0, r3
-	bne _08097F94
-	adds r0, r2, 0
-	b _08097FA0
-	.pool
-_08097F94:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0xF
-	bls _08097F82
-	movs r0, 0x10
-_08097FA0:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8097F78
-
-	thumb_func_start sub_8097FA4
-sub_8097FA4: @ 8097FA4
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	ldr r0, =sub_8097FE4
-	movs r1, 0xFF
-	bl CreateTask
-	adds r5, r0, 0
-	lsls r5, 24
-	lsrs r5, 24
-	lsls r4, r5, 2
-	adds r4, r5
-	lsls r4, 3
-	ldr r0, =gTasks
-	adds r4, r0
-	adds r0, r4, 0
-	adds r0, 0x8
-	adds r1, r6, 0
-	bl StoreWordInTwoHalfwords
-	strb r5, [r6, 0x1B]
-	ldr r0, =0x0000ffff
-	strh r0, [r4, 0xE]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8097FA4
-
-	thumb_func_start sub_8097FE4
-sub_8097FE4: @ 8097FE4
-	push {r4,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, =gTasks
-	adds r4, r1, r0
-	adds r0, r4, 0
-	adds r0, 0x8
-	mov r1, sp
-	bl LoadWordFromTwoHalfwords
-	ldr r0, [sp]
-	ldrb r1, [r0, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r2, r0, r1
-	ldrh r1, [r4, 0xC]
-	movs r0, 0x3
-	ands r0, r1
-	cmp r0, 0
-	bne _08098020
-	ldrh r0, [r4, 0xE]
-	ldrh r1, [r2, 0x26]
-	adds r0, r1
-	strh r0, [r2, 0x26]
-_08098020:
-	ldrh r1, [r4, 0xC]
-	movs r0, 0xF
-	ands r0, r1
-	cmp r0, 0
-	bne _08098030
-	ldrh r0, [r4, 0xE]
-	negs r0, r0
-	strh r0, [r4, 0xE]
-_08098030:
-	adds r0, r1, 0x1
-	strh r0, [r4, 0xC]
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8097FE4
-
-	thumb_func_start sub_8098044
-sub_8098044: @ 8098044
-	push {r4,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	ldr r1, =gTasks
-	adds r0, r1
-	adds r0, 0x8
-	mov r1, sp
-	bl LoadWordFromTwoHalfwords
-	adds r0, r4, 0
-	bl DestroyTask
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8098044
-
-	thumb_func_start sub_8098074
-sub_8098074: @ 8098074
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r1, 24
-	lsrs r5, r1, 24
-	movs r4, 0
-	ldr r7, =gMapObjects
-_08098082:
-	cmp r4, r6
-	beq _080980A8
-	cmp r4, r5
-	beq _080980A8
-	lsls r0, r4, 3
-	adds r0, r4
-	lsls r0, 2
-	adds r1, r0, r7
-	ldrb r0, [r1]
-	lsls r0, 31
-	cmp r0, 0
-	beq _080980A8
-	ldr r0, =gPlayerAvatar
-	ldrb r0, [r0, 0x5]
-	cmp r4, r0
-	beq _080980A8
-	adds r0, r1, 0
-	bl sub_8097404
-_080980A8:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0xF
-	bls _08098082
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8098074
-
-	thumb_func_start sub_80980C0
-sub_80980C0: @ 80980C0
-	movs r0, 0
-	strh r0, [r1, 0x26]
-	ldrh r0, [r1, 0x32]
-	adds r0, 0x1
-	strh r0, [r1, 0x32]
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_80980C0
-
-	thumb_func_start sub_80980D0
-sub_80980D0: @ 80980D0
-	push {lr}
-	adds r2, r1, 0
-	ldrh r0, [r2, 0x26]
-	subs r0, 0x8
-	strh r0, [r2, 0x26]
-	lsls r0, 16
-	asrs r0, 16
-	movs r1, 0xA0
-	negs r1, r1
-	cmp r0, r1
-	bne _080980EC
-	ldrh r0, [r2, 0x32]
-	adds r0, 0x1
-	strh r0, [r2, 0x32]
-_080980EC:
-	movs r0, 0
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80980D0
-
-	thumb_func_start sub_80980F4
-sub_80980F4: @ 80980F4
-	ldr r0, =0x0000ff60
-	strh r0, [r1, 0x26]
-	ldrh r0, [r1, 0x32]
-	adds r0, 0x1
-	strh r0, [r1, 0x32]
-	movs r0, 0
-	bx lr
-	.pool
-	thumb_func_end sub_80980F4
-
-	thumb_func_start sub_8098108
-sub_8098108: @ 8098108
-	push {lr}
-	ldrh r0, [r1, 0x26]
-	adds r0, 0x8
-	strh r0, [r1, 0x26]
-	lsls r0, 16
-	cmp r0, 0
-	bne _0809811C
-	ldrh r0, [r1, 0x32]
-	adds r0, 0x1
-	strh r0, [r1, 0x32]
-_0809811C:
-	movs r0, 0
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8098108
-
-	thumb_func_start sub_8098124
-sub_8098124: @ 8098124
-	movs r0, 0x1
-	bx lr
-	thumb_func_end sub_8098124
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s
index 3cf009175..97abc7fec 100644
--- a/asm/map_obj_lock.s
+++ b/asm/map_obj_lock.s
@@ -109,7 +109,7 @@ _0809842A:
 	cmp r0, 0
 	blt _08098452
 	adds r0, r1, 0
-	bl sub_8097404
+	bl FreezeMapObject
 	movs r0, 0x1
 	strh r0, [r5, 0xA]
 _08098452:
@@ -154,7 +154,7 @@ LockSelectedMapObject: @ 80984A0
 	push {r4,r5,lr}
 	ldr r4, =gSelectedMapObject
 	ldrb r0, [r4]
-	bl sub_80974D0
+	bl FreezeMapObjectsExceptOne
 	ldr r0, =sub_8098400
 	movs r1, 0x50
 	bl CreateTask
@@ -171,7 +171,7 @@ LockSelectedMapObject: @ 80984A0
 	cmp r0, 0
 	blt _080984DE
 	adds r0, r1, 0
-	bl sub_8097404
+	bl FreezeMapObject
 	ldr r0, =gTasks
 	lsls r1, r5, 2
 	adds r1, r5
@@ -317,7 +317,7 @@ _080985E8:
 	cmp r0, 0
 	blt _0809860C
 	adds r0, r1, 0
-	bl sub_8097404
+	bl FreezeMapObject
 	movs r0, 0x1
 	strh r0, [r5, 0xA]
 _0809860C:
@@ -385,7 +385,7 @@ sub_8098630: @ 8098630
 	cmp r0, 0
 	blt _0809869A
 	adds r0, r1, 0
-	bl sub_8097404
+	bl FreezeMapObject
 	movs r0, 0x1
 	strh r0, [r6, 0xA]
 _0809869A:
@@ -410,14 +410,14 @@ _0809869A:
 	cmp r0, 0
 	blt _0809871A
 	adds r0, r1, 0
-	bl sub_8097404
+	bl FreezeMapObject
 	movs r0, 0x1
 	strh r0, [r4, 0xA]
 	b _0809871A
 	.pool
 _080986E0:
 	adds r0, r4, 0
-	bl sub_80974D0
+	bl FreezeMapObjectsExceptOne
 	ldr r0, =sub_80985BC
 	movs r1, 0x50
 	bl CreateTask
@@ -439,7 +439,7 @@ _080986E0:
 	cmp r0, 0
 	blt _0809871A
 	adds r0, r1, 0
-	bl sub_8097404
+	bl FreezeMapObject
 	movs r0, 0x1
 	strh r0, [r5, 0xA]
 _0809871A:
diff --git a/asm/mystery_event_menu.s b/asm/mystery_event_menu.s
deleted file mode 100644
index 34b8cadd6..000000000
--- a/asm/mystery_event_menu.s
+++ /dev/null
@@ -1,669 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8178944
-sub_8178944: @ 8178944
-	push {lr}
-	bl LoadOam
-	bl ProcessSpriteCopyRequests
-	bl TransferPlttBuffer
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8178944
-
-	thumb_func_start sub_8178958
-sub_8178958: @ 8178958
-	push {lr}
-	movs r2, 0
-	ldr r1, =gLinkPlayers
-	ldrh r0, [r1, 0x1A]
-	ldrh r1, [r1, 0x36]
-	cmp r0, r1
-	bne _08178968
-	movs r2, 0x1
-_08178968:
-	adds r0, r2, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8178958
-
-	thumb_func_start sub_8178974
-sub_8178974: @ 8178974
-	push {r4,lr}
-	sub sp, 0x8
-	bl ResetSpriteData
-	bl FreeAllSpritePalettes
-	bl ResetTasks
-	ldr r0, =sub_8178944
-	bl SetVBlankCallback
-	movs r0, 0
-	bl ResetBgsAndClearDma3BusyFlags
-	ldr r1, =gUnknown_085EFD64
-	movs r0, 0
-	movs r2, 0x1
-	bl InitBgsFromTemplates
-	ldr r0, =gUnknown_085EFD68
-	bl InitWindows
-	lsls r0, 16
-	cmp r0, 0
-	beq _08178A22
-	bl DeactivateAllTextPrinters
-	movs r4, 0
-_081789AC:
-	lsls r0, r4, 24
-	lsrs r0, 24
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	adds r4, 0x1
-	cmp r4, 0x1
-	ble _081789AC
-	movs r0, 0x1E
-	str r0, [sp]
-	movs r0, 0x14
-	str r0, [sp, 0x4]
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0
-	bl FillBgTilemapBufferRect_Palette0
-	movs r0, 0
-	movs r1, 0x1
-	movs r2, 0xD0
-	bl sub_809882C
-	movs r0, 0xE0
-	bl sub_81978B0
-	movs r1, 0xA0
-	lsls r1, 1
-	movs r0, 0
-	bl SetGpuReg
-	movs r0, 0x50
-	movs r1, 0
-	bl SetGpuReg
-	ldr r0, =sub_8009404
-	movs r1, 0
-	bl CreateTask
-	bl StopMapMusic
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl RunTextPrinters
-	bl UpdatePaletteFade
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0x2
-	bl FillPalette
-	ldr r0, =sub_8178A78
-	bl SetMainCallback2
-_08178A22:
-	add sp, 0x8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8178974
-
-	thumb_func_start sub_8178A40
-sub_8178A40: @ 8178A40
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	adds r4, r1, 0
-	movs r5, 0x1
-	cmp r4, 0
-	bne _08178A54
-	ldr r1, =gText_EventSafelyLoaded
-	bl StringCopy
-	movs r5, 0
-_08178A54:
-	cmp r4, 0x2
-	bne _08178A5A
-	movs r5, 0
-_08178A5A:
-	cmp r4, 0x1
-	bne _08178A66
-	ldr r1, =gText_LoadErrorEndingSession
-	adds r0, r6, 0
-	bl StringCopy
-_08178A66:
-	adds r0, r5, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8178A40
-
-	thumb_func_start sub_8178A78
-sub_8178A78: @ 8178A78
-	push {r4-r6,lr}
-	sub sp, 0x8
-	ldr r1, =gMain
-	movs r2, 0x87
-	lsls r2, 3
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	adds r4, r1, 0
-	cmp r0, 0x10
-	bls _08178A8E
-	b _08178E58
-_08178A8E:
-	lsls r0, 2
-	ldr r1, =_08178AA0
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_08178AA0:
-	.4byte _08178AE4
-	.4byte _08178B12
-	.4byte _08178B48
-	.4byte _08178B80
-	.4byte _08178BCC
-	.4byte _08178BDC
-	.4byte _08178C54
-	.4byte _08178D28
-	.4byte _08178D38
-	.4byte _08178D58
-	.4byte _08178D60
-	.4byte _08178D74
-	.4byte _08178DBC
-	.4byte _08178DE0
-	.4byte _08178E0C
-	.4byte _08178E24
-	.4byte _08178E48
-_08178AE4:
-	movs r0, 0
-	movs r1, 0x1
-	movs r2, 0x1
-	movs r3, 0xD
-	bl SetWindowBorderStyle
-	movs r0, 0
-	bl PutWindowTilemap
-	movs r0, 0
-	movs r1, 0x3
-	bl CopyWindowToVram
-	movs r0, 0
-	bl ShowBg
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0x10
-	movs r3, 0
-	b _08178E30
-_08178B12:
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _08178B20
-	b _08178E58
-_08178B20:
-	ldr r1, =gText_LinkStandby2
-	movs r0, 0x1
-	str r0, [sp]
-	movs r0, 0
-	movs r2, 0x1
-	movs r3, 0x2
-	bl sub_8178EC4
-	ldr r1, =gMain
-	movs r2, 0x87
-	lsls r2, 3
-	adds r1, r2
-	b _08178E3C
-	.pool
-_08178B48:
-	movs r0, 0
-	bl IsTextPrinterActive
-	lsls r0, 16
-	cmp r0, 0
-	beq _08178B56
-	b _08178E58
-_08178B56:
-	ldr r1, =gMain
-	movs r0, 0x87
-	lsls r0, 3
-	adds r1, r0
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	ldr r1, =gLinkType
-	ldr r2, =0x00005501
-	adds r0, r2, 0
-	strh r0, [r1]
-	bl sub_8009734
-	b _08178E58
-	.pool
-_08178B80:
-	ldr r0, =gUnknown_030030E0
-	ldr r1, [r0]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	bne _08178B8E
-	b _08178D00
-_08178B8E:
-	movs r0, 0x1C
-	ands r1, r0
-	cmp r1, 0x4
-	bhi _08178B98
-	b _08178D00
-_08178B98:
-	movs r0, 0x15
-	bl PlaySE
-	ldr r1, =gText_PressAToLoadEvent
-	movs r0, 0x1
-	str r0, [sp]
-	movs r0, 0
-	movs r2, 0x1
-	movs r3, 0x2
-	bl sub_8178EC4
-	ldr r1, =gMain
-	movs r0, 0x87
-	lsls r0, 3
-	adds r1, r0
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _08178D00
-	.pool
-_08178BCC:
-	movs r0, 0
-	bl IsTextPrinterActive
-	lsls r0, 16
-	cmp r0, 0
-	beq _08178BDA
-	b _08178E58
-_08178BDA:
-	b _08178E34
-_08178BDC:
-	bl sub_800ABAC
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x2
-	bne _08178CD0
-	ldr r4, =gMain
-	ldrh r1, [r4, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08178C38
-	movs r0, 0x5
-	bl PlaySE
-	bl sub_800A620
-	movs r0, 0x1
-	movs r1, 0x1
-	movs r2, 0x1
-	movs r3, 0xD
-	bl SetWindowBorderStyle
-	ldr r1, =gText_LoadingEvent
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0x1
-	movs r2, 0x1
-	movs r3, 0x2
-	bl sub_8178EC4
-	movs r0, 0x1
-	bl PutWindowTilemap
-	movs r0, 0x1
-	movs r1, 0x3
-	bl CopyWindowToVram
-	movs r2, 0x87
-	lsls r2, 3
-	adds r1, r4, r2
-	b _08178E3C
-	.pool
-_08178C38:
-	adds r0, r2, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _08178C42
-	b _08178E58
-_08178C42:
-	movs r0, 0x5
-	bl PlaySE
-	bl sub_80097E8
-	movs r0, 0x87
-	lsls r0, 3
-	adds r1, r4, r0
-	b _08178D1E
-_08178C54:
-	bl sub_800B320
-	lsls r0, 24
-	cmp r0, 0
-	beq _08178D00
-	ldr r0, =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08178C68
-	b _08178E58
-_08178C68:
-	movs r0, 0x2
-	movs r1, 0x2
-	bl sub_800A0C8
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	bne _08178CAC
-	bl sub_800AC34
-	ldr r4, =gStringVar4
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_8178A40
-	movs r0, 0x1
-	str r0, [sp]
-	movs r0, 0
-	adds r1, r4, 0
-	movs r2, 0x1
-	movs r3, 0x2
-	bl sub_8178EC4
-	ldr r0, =gMain
-	movs r2, 0x87
-	lsls r2, 3
-	adds r0, r2
-	b _08178CF2
-	.pool
-_08178CAC:
-	bl sub_8178958
-	lsls r0, 24
-	cmp r0, 0
-	beq _08178CCC
-	ldr r1, =gText_DontRemoveCableTurnOff
-	movs r0, 0x1
-	str r0, [sp]
-	movs r0, 0
-	movs r2, 0x1
-	movs r3, 0x2
-	bl sub_8178EC4
-	b _08178E34
-	.pool
-_08178CCC:
-	bl sub_80097E8
-_08178CD0:
-	ldr r4, =gStringVar4
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_8178A40
-	movs r0, 0x1
-	str r0, [sp]
-	movs r0, 0
-	adds r1, r4, 0
-	movs r2, 0x1
-	movs r3, 0x2
-	bl sub_8178EC4
-	ldr r0, =gMain
-	movs r1, 0x87
-	lsls r1, 3
-	adds r0, r1
-_08178CF2:
-	movs r1, 0xD
-	strb r1, [r0]
-	b _08178E58
-	.pool
-_08178D00:
-	ldr r4, =gMain
-	ldrh r1, [r4, 0x2E]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	bne _08178D0E
-	b _08178E58
-_08178D0E:
-	movs r0, 0x5
-	bl PlaySE
-	bl sub_80097E8
-	movs r2, 0x87
-	lsls r2, 3
-	adds r1, r4, r2
-_08178D1E:
-	movs r0, 0xF
-	strb r0, [r1]
-	b _08178E58
-	.pool
-_08178D28:
-	movs r0, 0
-	bl IsTextPrinterActive
-	lsls r0, 16
-	cmp r0, 0
-	beq _08178D36
-	b _08178E58
-_08178D36:
-	b _08178E34
-_08178D38:
-	bl GetBlockReceivedStatus
-	lsls r0, 24
-	cmp r0, 0
-	bne _08178D44
-	b _08178E58
-_08178D44:
-	bl ResetBlockReceivedFlags
-	ldr r1, =gMain
-	movs r2, 0x87
-	lsls r2, 3
-	adds r1, r2
-	b _08178E3C
-	.pool
-_08178D58:
-	movs r0, 0x87
-	lsls r0, 3
-	adds r1, r4, r0
-	b _08178E3C
-_08178D60:
-	bl sub_800AC34
-	ldr r1, =gMain
-	movs r2, 0x87
-	lsls r2, 3
-	adds r1, r2
-	b _08178E3C
-	.pool
-_08178D74:
-	ldr r0, =gReceivedRemoteLinkPlayers
-	ldrb r6, [r0]
-	cmp r6, 0
-	bne _08178E58
-	ldr r5, =0x0201c000
-	adds r0, r5, 0
-	bl RunMysteryEventScript
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	str r6, [sp, 0x4]
-	ldr r2, =0x050001f5
-	add r0, sp, 0x4
-	adds r1, r5, 0
-	bl CpuSet
-	ldr r0, =gStringVar4
-	adds r1, r4, 0
-	bl sub_8178A40
-	lsls r0, 24
-	cmp r0, 0
-	bne _08178E34
-	movs r0, 0
-	bl TrySavingData
-	b _08178E34
-	.pool
-_08178DBC:
-	ldr r1, =gStringVar4
-	movs r0, 0x1
-	str r0, [sp]
-	movs r0, 0
-	movs r2, 0x1
-	movs r3, 0x2
-	bl sub_8178EC4
-	ldr r1, =gMain
-	movs r2, 0x87
-	lsls r2, 3
-	adds r1, r2
-	b _08178E3C
-	.pool
-_08178DE0:
-	movs r0, 0
-	bl IsTextPrinterActive
-	lsls r0, 16
-	lsrs r2, r0, 16
-	cmp r2, 0
-	bne _08178E58
-	ldr r0, =gMain
-	movs r1, 0x87
-	lsls r1, 3
-	adds r0, r1
-	ldrb r1, [r0]
-	adds r1, 0x1
-	strb r1, [r0]
-	ldr r0, =gUnknown_0203BCF8
-	strb r2, [r0]
-	b _08178E58
-	.pool
-_08178E0C:
-	ldrh r1, [r4, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08178E58
-	movs r0, 0x5
-	bl PlaySE
-	movs r2, 0x87
-	lsls r2, 3
-	adds r1, r4, r2
-	b _08178E3C
-_08178E24:
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-_08178E30:
-	bl BeginNormalPaletteFade
-_08178E34:
-	ldr r1, =gMain
-	movs r0, 0x87
-	lsls r0, 3
-	adds r1, r0
-_08178E3C:
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _08178E58
-	.pool
-_08178E48:
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08178E58
-	bl DoSoftReset
-_08178E58:
-	ldr r0, =gUnknown_030030E0
-	ldr r0, [r0]
-	movs r1, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _08178E98
-	bl sub_800ABBC
-	lsls r0, 24
-	cmp r0, 0
-	bne _08178E98
-	bl sub_80097E8
-	ldr r4, =gStringVar4
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_8178A40
-	movs r0, 0x1
-	str r0, [sp]
-	movs r0, 0
-	adds r1, r4, 0
-	movs r2, 0x1
-	movs r3, 0x2
-	bl sub_8178EC4
-	ldr r0, =gMain
-	movs r1, 0x87
-	lsls r1, 3
-	adds r0, r1
-	movs r1, 0xD
-	strb r1, [r0]
-_08178E98:
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl RunTextPrinters
-	bl UpdatePaletteFade
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8178A78
-
-	thumb_func_start sub_8178EC4
-sub_8178EC4: @ 8178EC4
-	push {r4-r6,lr}
-	mov r6, r10
-	mov r5, r9
-	mov r4, r8
-	push {r4-r6}
-	sub sp, 0x1C
-	adds r5, r0, 0
-	mov r10, r1
-	adds r6, r2, 0
-	ldr r4, [sp, 0x38]
-	lsls r5, 24
-	lsrs r5, 24
-	lsls r6, 24
-	lsrs r6, 24
-	lsls r3, 24
-	lsrs r3, 24
-	movs r0, 0
-	mov r9, r0
-	movs r1, 0x1
-	mov r8, r1
-	add r0, sp, 0x14
-	mov r1, r8
-	strb r1, [r0]
-	adds r1, r0, 0
-	movs r0, 0x2
-	strb r0, [r1, 0x1]
-	movs r0, 0x3
-	strb r0, [r1, 0x2]
-	adds r0, r1, 0
-	ldrb r0, [r0]
-	lsls r1, r0, 4
-	orrs r1, r0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	str r3, [sp, 0x18]
-	bl FillWindowPixelBuffer
-	mov r0, r9
-	str r0, [sp]
-	mov r1, r8
-	str r1, [sp, 0x4]
-	add r0, sp, 0x14
-	str r0, [sp, 0x8]
-	lsls r4, 24
-	asrs r4, 24
-	str r4, [sp, 0xC]
-	mov r1, r10
-	str r1, [sp, 0x10]
-	adds r0, r5, 0
-	movs r1, 0x1
-	adds r2, r6, 0
-	ldr r3, [sp, 0x18]
-	bl AddTextPrinterParameterized2
-	add sp, 0x1C
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8178EC4
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/overworld.s b/asm/overworld.s
index 855d33860..492fcd2cb 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -3584,7 +3584,7 @@ sub_808631C: @ 808631C
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0808632E
-	bl sub_80097E8
+	bl CloseLink
 _0808632E:
 	ldr r0, =gLinkVSyncDisabled
 	ldrb r0, [r0]
diff --git a/asm/pokenav.s b/asm/pokenav.s
index 35d6a40d5..66ecf71d0 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -28072,7 +28072,7 @@ sub_81D4E30: @ 81D4E30
 	ldr r2, =0x00005503
 	adds r0, r2, 0
 	strh r0, [r1]
-	bl sub_8009734
+	bl OpenLink
 	movs r0, 0x1
 	bl sub_800B330
 	pop {r0}
@@ -28128,11 +28128,11 @@ _081D4EBA:
 	thumb_func_start sub_81D4EC0
 sub_81D4EC0: @ 81D4EC0
 	push {lr}
-	bl sub_800ABBC
+	bl IsLinkMaster
 	lsls r0, 24
 	cmp r0, 0
 	beq _081D4EDC
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x2
@@ -28186,11 +28186,11 @@ _081D4F20:
 	.4byte _081D4FEC
 	.4byte _081D4FF8
 _081D4F38:
-	bl sub_800ABBC
+	bl IsLinkMaster
 	lsls r0, 24
 	cmp r0, 0
 	beq _081D4F88
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -28212,7 +28212,7 @@ _081D4F54:
 	strb r0, [r4]
 	b _081D500C
 _081D4F6C:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x2
@@ -28248,7 +28248,7 @@ _081D4FA0:
 	movs r0, 0x5
 	b _081D500E
 _081D4FB6:
-	bl sub_800B320
+	bl IsLinkConnectionEstablished
 	lsls r0, 24
 	cmp r0, 0
 	beq _081D500C
@@ -28447,7 +28447,7 @@ _081D515C:
 	beq _081D5166
 	b _081D52FC
 _081D5166:
-	bl sub_80097E8
+	bl CloseLink
 	b _081D525C
 _081D516C:
 	adds r0, r4, 0
@@ -28500,20 +28500,20 @@ _081D51D0:
 	beq _081D51F4
 	movs r0, 0x5
 	bl PlaySE
-	bl sub_80097E8
+	bl CloseLink
 	adds r0, r4, 0
 	bl sub_81D505C
 	b _081D535A
 	.pool
 _081D51F4:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
 	bls _081D5210
 	adds r0, r4, 0
 	bl sub_81D505C
-	bl sub_80097E8
+	bl CloseLink
 	movs r0, 0x7
 	strb r0, [r4, 0x8]
 	b _081D548A
@@ -28523,7 +28523,7 @@ _081D5210:
 	beq _081D522E
 	movs r0, 0x5
 	bl PlaySE
-	bl sub_80097E8
+	bl CloseLink
 	adds r0, r4, 0
 	bl sub_81D505C
 	movs r0, 0x8
@@ -28537,7 +28537,7 @@ _081D522E:
 	bne _081D523C
 	b _081D548A
 _081D523C:
-	bl sub_80097E8
+	bl CloseLink
 	bl sub_81D4E30
 	adds r0, r4, 0
 	bl sub_81D505C
@@ -28654,13 +28654,13 @@ _081D5340:
 _081D5350:
 	movs r0, 0x5
 	bl PlaySE
-	bl sub_80097E8
+	bl CloseLink
 _081D535A:
 	movs r0, 0x17
 	strb r0, [r4, 0x8]
 	b _081D548A
 _081D5360:
-	bl sub_80097E8
+	bl CloseLink
 	movs r0, 0x15
 	strb r0, [r4, 0x8]
 	b _081D548A
@@ -28670,7 +28670,7 @@ _081D536A:
 	cmp r0, 0
 	beq _081D537A
 _081D5374:
-	bl sub_80097E8
+	bl CloseLink
 	b _081D53C0
 _081D537A:
 	bl GetBlockReceivedStatus
diff --git a/asm/record_mixing.s b/asm/record_mixing.s
index b7bcca4a8..e54c3a1fb 100644
--- a/asm/record_mixing.s
+++ b/asm/record_mixing.s
@@ -765,10 +765,10 @@ _080E73B0:
 	movs r0, 0x65
 	b _080E7564
 _080E73B8:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_800ABBC
+	bl IsLinkMaster
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -796,7 +796,7 @@ _080E73EA:
 _080E73F8:
 	bl sub_800AA48
 	adds r4, r0, 0
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r4, 24
 	lsls r0, 24
 	cmp r4, r0
@@ -808,7 +808,7 @@ _080E740C:
 	strh r4, [r5, 0x20]
 	lsls r4, 16
 	asrs r4, 16
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 4
@@ -824,7 +824,7 @@ _080E742A:
 _080E7432:
 	bl sub_800AA48
 	adds r4, r0, 0
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r4, 24
 	lsls r0, 24
 	cmp r4, r0
@@ -868,7 +868,7 @@ _080E746E:
 	b _080E7564
 	.pool
 _080E7490:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0
diff --git a/asm/script_movement.s b/asm/script_movement.s
index 5f06fd179..8c6a6257c 100644
--- a/asm/script_movement.s
+++ b/asm/script_movement.s
@@ -553,7 +553,7 @@ _080D36DC:
 	adds r1, r6, 0
 	bl sub_80D355C
 	adds r0, r4, 0
-	bl sub_8097404
+	bl FreezeMapObject
 	b _080D370E
 	.pool
 _080D36F8:
diff --git a/asm/trade.s b/asm/trade.s
index dd0477560..0126baa6a 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -416,12 +416,12 @@ _080774B2:
 	cmp r0, 0
 	beq _08077528
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	bl sub_8011BA4
 	b _08077B46
 	.pool
 _08077528:
-	bl sub_8009734
+	bl OpenLink
 	ldr r0, =gMain
 	movs r7, 0x87
 	lsls r7, 3
@@ -466,7 +466,7 @@ _0807757A:
 	b _08077B22
 	.pool
 _0807758C:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	adds r4, r0, 0
 	bl sub_800AA48
 	lsls r4, 24
@@ -475,7 +475,7 @@ _0807758C:
 	bcs _080775A0
 	b _08077B46
 _080775A0:
-	bl sub_800ABBC
+	bl IsLinkMaster
 	lsls r0, 24
 	cmp r0, 0
 	beq _080775D8
@@ -7026,7 +7026,7 @@ _0807AC92:
 	lsls r0, 1
 	cmp r1, r0
 	bls _0807ACC4
-	bl sub_80097E8
+	bl CloseLink
 	ldr r0, =c2_800ACD4
 	bl SetMainCallback2
 	ldr r1, [r4]
@@ -7264,7 +7264,7 @@ _0807AEAC:
 	ldr r2, =0x00001144
 	adds r0, r2, 0
 	strh r0, [r1]
-	bl sub_80097E8
+	bl CloseLink
 _0807AEC0:
 	ldr r4, =gUnknown_020322A0
 	movs r5, 0x80
@@ -7332,7 +7332,7 @@ _0807AF58:
 	adds r0, 0xFA
 	movs r1, 0x1
 	strb r1, [r0]
-	bl sub_8009734
+	bl OpenLink
 	ldr r1, =gMain
 	movs r2, 0x87
 	lsls r2, 3
@@ -7369,13 +7369,13 @@ _0807AFAC:
 	b _0807B0E4
 	.pool
 _0807AFBC:
-	bl sub_800ABBC
+	bl IsLinkMaster
 	lsls r0, 24
 	cmp r0, 0
 	bne _0807AFC8
 	b _0807B0DC
 _0807AFC8:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	adds r4, r0, 0
 	bl sub_800AA48
 	lsls r4, 24