through sub_8017CB0

1 files changed, 2 insertions, 225 deletions

diff --git a/asm/union_room.s b/asm/union_room.s
index 446a62391..a8cbeeae2 100755
--- a/asm/union_room.s
+++ b/asm/union_room.s
@@ -5,231 +5,6 @@
 
 	.text
 
-	thumb_func_start nullsub_14
-nullsub_14: @ 8017B38
-	bx lr
-	thumb_func_end nullsub_14
-
-	thumb_func_start sub_8017B3C
-sub_8017B3C: @ 8017B3C
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0xC
-	ldr r4, [sp, 0x28]
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r1, 24
-	lsrs r5, r1, 24
-	lsls r4, 24
-	lsrs r4, 24
-	ldrh r0, [r2, 0x8]
-	lsls r0, 22
-	lsrs r0, 22
-	mov r8, r0
-	ldrb r0, [r2, 0x9]
-	lsrs r7, r0, 2
-	ldrb r0, [r2, 0xB]
-	lsrs r0, 1
-	mov r9, r0
-	str r5, [sp]
-	str r4, [sp, 0x4]
-	adds r0, r6, 0
-	movs r1, 0x1
-	adds r2, r3, 0
-	movs r3, 0x8
-	bl sub_80173E0
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r8, r0
-	bne _08017B94
-	ldr r2, =gUnknown_082EF7D0
-	str r5, [sp]
-	str r4, [sp, 0x4]
-	adds r0, r6, 0
-	movs r1, 0x1
-	movs r3, 0x44
-	bl sub_80173E0
-	b _08017BD4
-	.pool
-_08017B94:
-	adds r1, r7, 0x1
-	adds r0, r6, 0
-	movs r2, 0x44
-	adds r3, r5, 0
-	bl blit_move_info_icon
-	movs r0, 0xB
-	mov r2, r8
-	muls r2, r0
-	ldr r0, =gSpeciesNames
-	adds r2, r0
-	str r5, [sp]
-	str r4, [sp, 0x4]
-	adds r0, r6, 0
-	movs r1, 0x1
-	movs r3, 0x76
-	bl sub_80173E0
-	add r0, sp, 0x8
-	mov r1, r9
-	movs r2, 0x1
-	movs r3, 0x3
-	bl ConvertIntToDecimalStringN
-	str r5, [sp]
-	str r4, [sp, 0x4]
-	adds r0, r6, 0
-	movs r1, 0x1
-	add r2, sp, 0x8
-	movs r3, 0xC6
-	bl sub_80173E0
-_08017BD4:
-	add sp, 0xC
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8017B3C
-
-	thumb_func_start sub_8017BE8
-sub_8017BE8: @ 8017BE8
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x10
-	adds r4, r1, 0
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	lsls r2, 24
-	lsrs r7, r2, 24
-	ldr r0, =gUnknown_02022C30
-	ldr r0, [r0]
-	mov r8, r0
-	movs r0, 0x3
-	negs r0, r0
-	cmp r4, r0
-	bne _08017C6C
-	ldr r0, =gUnknown_082F03A4
-	ldrb r0, [r0, 0x14]
-	lsls r0, 28
-	lsrs r0, 28
-	cmp r7, r0
-	bne _08017C6C
-	bl sub_800F7DC
-	adds r2, r0, 0
-	ldrh r1, [r2, 0x8]
-	ldr r0, =0x000003ff
-	ands r0, r1
-	cmp r0, 0
-	beq _08017CA0
-	ldr r0, =gSaveBlock2Ptr
-	ldr r3, [r0]
-	movs r0, 0x5
-	str r0, [sp]
-	mov r0, r9
-	adds r1, r7, 0
-	bl sub_8017B3C
-	b _08017CA0
-	.pool
-_08017C4C:
-	mov r0, r12
-	adds r1, r0, r4
-	add r0, sp, 0x4
-	bl sub_8018404
-	mov r0, r8
-	ldr r2, [r0]
-	adds r2, r4
-	movs r0, 0x6
-	str r0, [sp]
-	mov r0, r9
-	adds r1, r7, 0
-	add r3, sp, 0x4
-	bl sub_8017B3C
-	b _08017CA0
-_08017C6C:
-	movs r5, 0
-	movs r1, 0
-	mov r2, r8
-	ldr r2, [r2]
-	mov r12, r2
-	adds r2, 0x8
-	movs r3, 0
-	adds r6, r4, 0x1
-_08017C7C:
-	ldrb r0, [r2, 0x12]
-	lsls r0, 30
-	lsrs r0, 30
-	adds r4, r3, 0
-	cmp r0, 0x1
-	bne _08017C92
-	ldrh r0, [r2]
-	lsls r0, 22
-	cmp r0, 0
-	beq _08017C92
-	adds r5, 0x1
-_08017C92:
-	cmp r5, r6
-	beq _08017C4C
-	adds r2, 0x20
-	adds r3, 0x20
-	adds r1, 0x1
-	cmp r1, 0x7
-	ble _08017C7C
-_08017CA0:
-	add sp, 0x10
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8017BE8
-
-	thumb_func_start sub_8017CB0
-sub_8017CB0: @ 8017CB0
-	push {r4-r7,lr}
-	movs r4, 0
-	movs r3, 0
-	movs r7, 0x3
-	ldr r6, =0x000003ff
-	adds r2, r0, 0
-	adds r2, 0x8
-	adds r5, r1, 0x1
-_08017CC0:
-	ldrb r1, [r2, 0x12]
-	adds r0, r7, 0
-	ands r0, r1
-	cmp r0, 0x1
-	bne _08017CD6
-	ldrh r1, [r2]
-	adds r0, r6, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _08017CD6
-	adds r4, 0x1
-_08017CD6:
-	cmp r4, r5
-	bne _08017CE4
-	adds r0, r3, 0
-	b _08017CF0
-	.pool
-_08017CE4:
-	adds r2, 0x20
-	adds r3, 0x1
-	cmp r3, 0x7
-	ble _08017CC0
-	movs r0, 0x1
-	negs r0, r0
-_08017CF0:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8017CB0
-
 	thumb_func_start sub_8017CF8
 sub_8017CF8: @ 8017CF8
 	lsls r0, 5
@@ -1124,6 +899,8 @@ sub_8018404: @ 8018404
 	bx r0
 	thumb_func_end sub_8018404
 
+    @ file boundary?
+
 	thumb_func_start sub_8018424
 sub_8018424: @ 8018424
 	push {lr}