Made a new substruct for the substruct

We must go deeper.

1 files changed, 0 insertions, 284 deletions

diff --git a/asm/pokenav.s b/asm/pokenav.s
index 5a3864199..fee2fc91c 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -5,290 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_81C8B70
-sub_81C8B70: @ 81C8B70
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x10
-	mov r9, r0
-	adds r7, r1, 0
-	adds r6, r2, 0
-	ldrb r0, [r0, 0x8]
-	movs r1, 0x7
-	bl GetWindowAttribute
-	mov r10, r0
-	mov r1, r9
-	ldrb r0, [r1, 0x4]
-	lsls r3, r0, 6
-	ldrh r0, [r1, 0xA]
-	adds r7, r0, r7
-	movs r0, 0xF
-	ands r7, r0
-	adds r0, r7, r6
-	cmp r0, 0x10
-	bgt _081C8BD4
-	ldr r0, =0x11111111
-	str r0, [sp]
-	adds r1, r7, 0
-	muls r1, r3
-	add r1, r10
-	adds r2, r6, 0
-	muls r2, r3
-	lsrs r2, 2
-	ldr r0, =0x001fffff
-	ands r2, r0
-	movs r0, 0x80
-	lsls r0, 17
-	orrs r2, r0
-	mov r0, sp
-	bl CpuFastSet
-	mov r1, r9
-	ldrb r0, [r1, 0x8]
-	movs r1, 0x2
-	bl CopyWindowToVram
-	b _081C8C1E
-	.pool
-_081C8BD4:
-	movs r2, 0x10
-	subs r2, r7
-	subs r0, r6, r2
-	mov r8, r0
-	ldr r1, =0x11111111
-	str r1, [sp, 0x4]
-	add r0, sp, 0x4
-	adds r1, r7, 0
-	muls r1, r3
-	add r1, r10
-	muls r2, r3
-	lsrs r2, 2
-	ldr r5, =0x001fffff
-	ands r2, r5
-	movs r4, 0x80
-	lsls r4, 17
-	orrs r2, r4
-	str r3, [sp, 0xC]
-	bl CpuFastSet
-	ldr r0, =0x11111111
-	str r0, [sp, 0x8]
-	add r0, sp, 0x8
-	ldr r3, [sp, 0xC]
-	mov r2, r8
-	muls r2, r3
-	lsrs r2, 2
-	ands r2, r5
-	orrs r2, r4
-	mov r1, r10
-	bl CpuFastSet
-	mov r1, r9
-	ldrb r0, [r1, 0x8]
-	movs r1, 0x2
-	bl CopyWindowToVram
-_081C8C1E:
-	subs r6, 0x1
-	movs r0, 0x1
-	negs r0, r0
-	cmp r6, r0
-	beq _081C8C40
-	movs r5, 0xF
-	adds r4, r0, 0
-_081C8C2C:
-	mov r1, r9
-	ldrh r0, [r1, 0x8]
-	adds r1, r7, 0
-	bl sub_81CBD48
-	adds r7, 0x1
-	ands r7, r5
-	subs r6, 0x1
-	cmp r6, r4
-	bne _081C8C2C
-_081C8C40:
-	mov r1, r9
-	ldrb r0, [r1, 0x8]
-	movs r1, 0x1
-	bl CopyWindowToVram
-	add sp, 0x10
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81C8B70
-
-	thumb_func_start sub_81C8C64
-sub_81C8C64: @ 81C8C64
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	adds r4, r1, 0
-	ldrb r0, [r5, 0x8]
-	movs r1, 0
-	bl GetWindowAttribute
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetBgTilemapBuffer
-	adds r2, r0, 0
-	ldrh r0, [r5, 0xA]
-	lsls r0, 6
-	ldrb r1, [r5, 0x2]
-	adds r0, r1
-	lsls r0, 1
-	subs r0, 0x2
-	adds r2, r0
-	cmp r4, 0
-	beq _081C8C98
-	ldrb r0, [r5, 0x1]
-	lsls r0, 12
-	ldrh r1, [r5, 0x6]
-	adds r1, 0x1
-	b _081C8C9E
-_081C8C98:
-	ldrb r0, [r5, 0x1]
-	lsls r0, 12
-	ldrh r1, [r5, 0x6]
-_081C8C9E:
-	orrs r0, r1
-	lsls r0, 16
-	lsrs r1, r0, 16
-	strh r1, [r2]
-	adds r0, r2, 0
-	adds r0, 0x40
-	strh r1, [r0]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81C8C64
-
-	thumb_func_start sub_81C8CB4
-sub_81C8CB4: @ 81C8CB4
-	push {r4-r6,lr}
-	sub sp, 0x10
-	adds r5, r0, 0
-	adds r4, r1, 0
-	ldr r1, =gUnknown_0861FBE4
-	add r0, sp, 0xC
-	movs r2, 0x3
-	bl memcpy
-	ldrh r1, [r5]
-	ldr r0, [r5, 0xC]
-	muls r1, r0
-	ldr r0, [r5, 0x10]
-	adds r0, r1
-	adds r6, r4, 0
-	adds r6, 0x48
-	ldr r2, [r4, 0x34]
-	adds r1, r6, 0
-	bl _call_via_r2
-	ldrh r0, [r4, 0x8]
-	ldrh r1, [r5]
-	ldrh r2, [r4, 0xA]
-	ldr r3, [r4, 0x38]
-	bl _call_via_r3
-	ldrb r0, [r4, 0x8]
-	ldrh r3, [r4, 0xA]
-	lsls r3, 20
-	lsrs r3, 16
-	ldrb r1, [r4, 0x4]
-	lsls r1, 3
-	str r1, [sp]
-	movs r1, 0x10
-	str r1, [sp, 0x4]
-	movs r1, 0x44
-	movs r2, 0
-	bl FillWindowPixelRect
-	ldrb r0, [r4, 0x8]
-	ldrb r1, [r4, 0x5]
-	ldrh r3, [r4, 0xA]
-	lsls r3, 4
-	adds r3, 0x1
-	lsls r3, 24
-	lsrs r3, 24
-	add r2, sp, 0xC
-	str r2, [sp]
-	movs r2, 0x1
-	negs r2, r2
-	str r2, [sp, 0x4]
-	str r6, [sp, 0x8]
-	movs r2, 0x8
-	bl AddTextPrinterParameterized3
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_81C8C64
-	ldrh r0, [r4, 0x8]
-	ldrh r3, [r4, 0xA]
-	lsls r3, 1
-	ldrb r1, [r4, 0x4]
-	str r1, [sp]
-	movs r1, 0x2
-	str r1, [sp, 0x4]
-	movs r1, 0x3
-	movs r2, 0
-	bl CopyWindowRectToVram
-	add sp, 0x10
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81C8CB4
-
-	thumb_func_start sub_81C8D4C
-sub_81C8D4C: @ 81C8D4C
-	push {r4,r5,lr}
-	sub sp, 0xC
-	adds r4, r1, 0
-	ldrh r2, [r0]
-	ldr r1, [r0, 0xC]
-	muls r1, r2
-	ldr r0, [r0, 0x10]
-	adds r0, r1
-	adds r5, r4, 0
-	adds r5, 0x48
-	ldr r2, [r4, 0x34]
-	adds r1, r5, 0
-	bl _call_via_r2
-	ldrb r0, [r4, 0x8]
-	ldrh r3, [r4, 0xA]
-	lsls r3, 20
-	lsrs r3, 16
-	ldrb r1, [r4, 0x4]
-	lsls r1, 3
-	str r1, [sp]
-	movs r1, 0x10
-	str r1, [sp, 0x4]
-	movs r1, 0x11
-	movs r2, 0
-	bl FillWindowPixelRect
-	ldrb r0, [r4, 0x8]
-	ldrb r1, [r4, 0x5]
-	ldrh r2, [r4, 0xA]
-	lsls r2, 4
-	adds r2, 0x1
-	lsls r2, 24
-	lsrs r2, 24
-	str r2, [sp]
-	movs r2, 0xFF
-	str r2, [sp, 0x4]
-	movs r2, 0
-	str r2, [sp, 0x8]
-	adds r2, r5, 0
-	movs r3, 0x8
-	bl AddTextPrinterParameterized
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_81C8C64
-	ldrb r0, [r4, 0x8]
-	movs r1, 0x3
-	bl CopyWindowToVram
-	add sp, 0xC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81C8D4C
-
 	thumb_func_start sub_81C8DBC
 sub_81C8DBC: @ 81C8DBC
 	push {r4-r6,lr}