nonmatching sub_8101460, and a few functions beyond

1 files changed, 0 insertions, 425 deletions

diff --git a/asm/decoration.s b/asm/decoration.s
index 4c98e4657..cb8a67ae7 100755
--- a/asm/decoration.s
+++ b/asm/decoration.s
@@ -8,431 +8,6 @@
 
 .equiv ewram_1f000, 0x0201f000
 
-	thumb_func_start sub_81012A0
-sub_81012A0: @ 81012A0
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	ldr r2, _0810130C @ =ewram_1f000
-	ldr r3, _08101310 @ =gUnknown_020391B4
-	ldr r0, _08101314 @ =gUnknown_02039234
-	ldrb r0, [r0]
-	lsls r0, 3
-	adds r0, r3
-	ldrb r1, [r0]
-	ldr r0, [r2, 0x4]
-	adds r0, r1
-	ldrb r0, [r0]
-	lsrs r7, r0, 4
-	movs r6, 0xF
-	ands r6, r0
-	movs r5, 0
-	ldr r0, _08101318 @ =gSaveBlock1
-	mov r8, r0
-	mov r9, r3
-_081012CA:
-	lsls r0, r5, 1
-	adds r0, r5
-	lsls r0, 3
-	mov r2, r8
-	adds r1, r0, r2
-	ldr r2, _0810131C @ =0x00000c24
-	adds r0, r1, r2
-	movs r2, 0
-	ldrsh r0, [r0, r2]
-	cmp r0, r7
-	bne _08101328
-	ldr r2, _08101320 @ =0x00000c26
-	adds r0, r1, r2
-	movs r2, 0
-	ldrsh r0, [r0, r2]
-	cmp r0, r6
-	bne _08101328
-	ldr r0, _08101324 @ =0x00000c34
-	adds r4, r1, r0
-	ldrh r0, [r4]
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	bne _08101328
-	ldr r0, _08101314 @ =gUnknown_02039234
-	ldrb r0, [r0]
-	lsls r0, 3
-	add r0, r9
-	ldrh r1, [r4]
-	strh r1, [r0, 0x4]
-	b _08101332
-	.align 2, 0
-_0810130C: .4byte ewram_1f000
-_08101310: .4byte gUnknown_020391B4
-_08101314: .4byte gUnknown_02039234
-_08101318: .4byte gSaveBlock1
-_0810131C: .4byte 0x00000c24
-_08101320: .4byte 0x00000c26
-_08101324: .4byte 0x00000c34
-_08101328:
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-	cmp r5, 0x3F
-	bls _081012CA
-_08101332:
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81012A0
-
-	thumb_func_start sub_8101340
-sub_8101340: @ 8101340
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r7, r0, 24
-	movs r6, 0
-	b _081013A2
-_0810134A:
-	ldr r0, [r0]
-	adds r1, r0, r6
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _0810139C
-	ldr r0, _08101390 @ =gDecorations
-	ldrb r2, [r1]
-	lsls r1, r2, 5
-	adds r1, r0
-	ldrb r0, [r1, 0x11]
-	cmp r0, 0x4
-	bne _0810139C
-	ldr r5, _08101394 @ =gUnknown_020391B4
-	adds r0, r2, 0
-	adds r1, r5, 0
-	bl sub_8101118
-	lsls r1, r6, 24
-	lsrs r1, 24
-	adds r0, r7, 0
-	adds r2, r5, 0
-	bl sub_8101200
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x1
-	bne _0810139C
-	strb r6, [r5]
-	bl sub_81012A0
-	ldr r0, _08101398 @ =gUnknown_02039234
-	strb r4, [r0]
-	movs r0, 0x1
-	b _081013AC
-	.align 2, 0
-_08101390: .4byte gDecorations
-_08101394: .4byte gUnknown_020391B4
-_08101398: .4byte gUnknown_02039234
-_0810139C:
-	adds r0, r6, 0x1
-	lsls r0, 16
-	lsrs r6, r0, 16
-_081013A2:
-	ldr r0, _081013B4 @ =ewram_1f000
-	ldrb r1, [r0, 0x8]
-	cmp r6, r1
-	bcc _0810134A
-	movs r0, 0
-_081013AC:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_081013B4: .4byte ewram_1f000
-	thumb_func_end sub_8101340
-
-	thumb_func_start sub_81013B8
-sub_81013B8: @ 81013B8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [sp]
-	lsls r1, 24
-	lsrs r1, 24
-	mov r10, r1
-	lsls r2, 24
-	lsrs r2, 24
-	mov r9, r2
-	lsls r3, 24
-	lsrs r3, 24
-	mov r8, r3
-	movs r4, 0
-	ldr r7, _08101450 @ =ewram_1f000
-	ldrb r0, [r7, 0x8]
-	cmp r4, r0
-	bcs _0810143E
-	adds r6, r7, 0
-	ldr r5, _08101454 @ =gUnknown_02039234
-_081013EA:
-	ldr r0, [r6]
-	adds r0, r4
-	ldrb r1, [r0]
-	ldr r0, [r6, 0x4]
-	adds r0, r4
-	ldrb r0, [r0]
-	lsrs r3, r0, 4
-	movs r2, 0xF
-	ands r2, r0
-	cmp r1, 0
-	beq _08101432
-	ldr r0, _08101458 @ =gDecorations
-	lsls r1, 5
-	adds r1, r0
-	ldrb r0, [r1, 0x11]
-	cmp r0, 0x4
-	bne _08101432
-	ldr r0, [sp]
-	cmp r0, r3
-	bhi _08101432
-	cmp r10, r2
-	bhi _08101432
-	cmp r9, r3
-	bcc _08101432
-	cmp r8, r2
-	bcc _08101432
-	ldr r0, _0810145C @ =gUnknown_020391B4
-	ldrb r1, [r5]
-	lsls r1, 3
-	adds r1, r0
-	strb r4, [r1]
-	bl sub_81012A0
-	ldrb r0, [r5]
-	adds r0, 0x1
-	strb r0, [r5]
-_08101432:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldrb r0, [r7, 0x8]
-	cmp r4, r0
-	bcc _081013EA
-_0810143E:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08101450: .4byte ewram_1f000
-_08101454: .4byte gUnknown_02039234
-_08101458: .4byte gDecorations
-_0810145C: .4byte gUnknown_020391B4
-	thumb_func_end sub_81013B8
-
-	thumb_func_start sub_8101460
-sub_8101460: @ 8101460
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r4, _081014B8 @ =gUnknown_02039234
-	movs r0, 0
-	strb r0, [r4]
-	adds r0, r6, 0
-	bl sub_8101340
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _08101504
-	movs r5, 0
-	ldr r0, _081014BC @ =ewram_1f000
-	ldrb r1, [r0, 0x8]
-	cmp r5, r1
-	bcs _081014D2
-	adds r7, r4, 0
-_08101486:
-	ldr r0, [r0]
-	adds r0, r5
-	ldrb r1, [r0]
-	cmp r1, 0
-	beq _081014C4
-	ldr r4, _081014C0 @ =gUnknown_020391B4
-	adds r0, r1, 0
-	adds r1, r4, 0
-	bl sub_8101118
-	adds r0, r6, 0
-	adds r1, r5, 0
-	adds r2, r4, 0
-	bl sub_8101200
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _081014C4
-	strb r5, [r4]
-	ldrb r0, [r7]
-	adds r0, 0x1
-	strb r0, [r7]
-	b _081014D2
-	.align 2, 0
-_081014B8: .4byte gUnknown_02039234
-_081014BC: .4byte ewram_1f000
-_081014C0: .4byte gUnknown_020391B4
-_081014C4:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r0, _0810150C @ =ewram_1f000
-	ldrb r1, [r0, 0x8]
-	cmp r5, r1
-	bcc _08101486
-_081014D2:
-	ldr r0, _08101510 @ =gUnknown_02039234
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08101504
-	ldr r0, _0810150C @ =ewram_1f000
-	ldr r2, _08101514 @ =gUnknown_020391B4
-	ldrb r1, [r2]
-	ldr r0, [r0, 0x4]
-	adds r0, r1
-	ldrb r1, [r0]
-	lsrs r0, r1, 4
-	movs r3, 0xF
-	ands r3, r1
-	ldrb r1, [r2, 0x2]
-	subs r1, r3, r1
-	adds r1, 0x1
-	lsls r1, 24
-	lsrs r1, 24
-	ldrb r2, [r2, 0x1]
-	adds r2, r0
-	subs r2, 0x1
-	lsls r2, 24
-	lsrs r2, 24
-	bl sub_81013B8
-_08101504:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810150C: .4byte ewram_1f000
-_08101510: .4byte gUnknown_02039234
-_08101514: .4byte gUnknown_020391B4
-	thumb_func_end sub_8101460
-
-	thumb_func_start sub_8101518
-sub_8101518: @ 8101518
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x14
-	movs r1, 0x8
-	movs r2, 0x1
-	bl DisplayYesNoMenu
-	ldr r1, _08101538 @ =gUnknown_083EC9CC
-	adds r0, r4, 0
-	bl sub_80F914C
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08101538: .4byte gUnknown_083EC9CC
-	thumb_func_end sub_8101518
-
-	thumb_func_start sub_810153C
-sub_810153C: @ 810153C
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x1
-	movs r1, 0
-	bl fade_screen
-	ldr r1, _08101564 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	movs r1, 0
-	strh r1, [r0, 0xC]
-	ldr r1, _08101568 @ =sub_8100C88
-	str r1, [r0]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08101564: .4byte gTasks
-_08101568: .4byte sub_8100C88
-	thumb_func_end sub_810153C
-
-	thumb_func_start sub_810156C
-sub_810156C: @ 810156C
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x14
-	movs r1, 0x8
-	movs r2, 0x1
-	bl DisplayYesNoMenu
-	ldr r1, _0810158C @ =gUnknown_083EC9D4
-	adds r0, r4, 0
-	bl sub_80F914C
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810158C: .4byte gUnknown_083EC9D4
-	thumb_func_end sub_810156C
-
-	thumb_func_start sub_8101590
-sub_8101590: @ 8101590
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-	adds r0, r4, 0
-	bl sub_81015B0
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8101590
-
-	thumb_func_start sub_81015B0
-sub_81015B0: @ 81015B0
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x1
-	movs r1, 0
-	bl fade_screen
-	ldr r1, _081015D8 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	movs r1, 0
-	strh r1, [r0, 0xC]
-	ldr r1, _081015DC @ =sub_81015E0
-	str r1, [r0]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081015D8: .4byte gTasks
-_081015DC: .4byte sub_81015E0
-	thumb_func_end sub_81015B0
-
 	thumb_func_start sub_81015E0
 sub_81015E0: @ 81015E0
 	push {r4,r5,lr}