random assortment of decomp work and fix of nonmatchings

3 files changed, 0 insertions, 198 deletions

diff --git a/asm/code_80118A4.s b/asm/code_80118A4.s
index 4fbfa06..5a097ed 100644
--- a/asm/code_80118A4.s
+++ b/asm/code_80118A4.s
@@ -5,26 +5,6 @@
 
 	.text	
 
-	thumb_func_start PrintFuncFileLine
-PrintFuncFileLine:
-	push {r4,r5,lr}
-	sub sp, 0x8
-	ldr r5, _08011AC4
-	ldr r3, [r1, 0x8]
-	ldr r4, [r1]
-	str r4, [sp]
-	ldr r1, [r1, 0x4]
-	str r1, [sp, 0x4]
-	adds r1, r5, 0
-	bl sprintf
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08011AC4: .4byte gUnknown_80D41C4
-	thumb_func_end PrintFuncFileLine
-
         @ Unused
 	thumb_func_start PrintMessageWithFuncFileLine
 PrintMessageWithFuncFileLine:
diff --git a/asm/code_80A7714.s b/asm/code_80A7714.s
index ea1c722..48ee9ba 100644
--- a/asm/code_80A7714.s
+++ b/asm/code_80A7714.s
@@ -5,61 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_80A77A0
-sub_80A77A0:
-	push {lr}
-	lsls r0, 16
-	asrs r1, r0, 16
-	adds r2, r1, 0
-	ldr r0, _080A77BC
-	movs r3, 0
-	ldrsh r0, [r0, r3]
-	cmp r0, r1
-	beq _080A77CA
-	cmp r1, 0
-	bge _080A77C0
-	bl sub_80A7784
-	b _080A77C6
-	.align 2, 0
-_080A77BC: .4byte gUnknown_2039DE0
-_080A77C0:
-	adds r0, r2, 0
-	bl sub_80A7764
-_080A77C6:
-	movs r0, 0x1
-	b _080A77CC
-_080A77CA:
-	movs r0, 0
-_080A77CC:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80A77A0
-
-	thumb_func_start sub_80A77D0
-sub_80A77D0:
-	push {lr}
-	lsls r0, 16
-	asrs r1, r0, 16
-	movs r0, 0x1
-	negs r0, r0
-	cmp r1, r0
-	bne _080A77E8
-	ldr r0, _080A77E4
-	b _080A77F0
-	.align 2, 0
-_080A77E4: .4byte gUnknown_8117EFC
-_080A77E8:
-	ldr r0, _080A77F4
-	lsls r1, 2
-	adds r1, r0
-	ldr r0, [r1]
-_080A77F0:
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080A77F4: .4byte gUnknown_811E258
-	thumb_func_end sub_80A77D0
-
 	thumb_func_start sub_80A77F8
 sub_80A77F8:
 	push {r4,r5,lr}
diff --git a/asm/save1.s b/asm/save1.s
index 543552e..52eb5c8 100644
--- a/asm/save1.s
+++ b/asm/save1.s
@@ -5,129 +5,6 @@
 
 	.text	
 
-	thumb_func_start sub_8012484
-sub_8012484:
-	push {r4,r5,lr}
-	sub sp, 0x8
-	ldr r1, _080124A0
-	ldr r0, [r1]
-	ldr r0, [r0]
-	adds r4, r1, 0
-	cmp r0, 0x6
-	bhi _0801254C
-	lsls r0, 2
-	ldr r1, _080124A4
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_080124A0: .4byte gUnknown_203B188
-_080124A4: .4byte _080124A8
-	.align 2, 0
-_080124A8:
-	.4byte _080124C4
-	.4byte _080124CC
-	.4byte _080124E8
-	.4byte _0801251C
-	.4byte _08012534
-	.4byte _0801254C
-	.4byte _08012548
-_080124C4:
-	ldr r1, [r4]
-	movs r0, 0x1
-	str r0, [r1]
-	b _0801254C
-_080124CC:
-	movs r0, 0
-	str r0, [sp]
-	mov r0, sp
-	bl sub_8011DAC
-	ldr r1, _080124E4
-	ldr r1, [r1]
-	str r0, [r1, 0x4]
-	movs r0, 0x2
-	str r0, [r1]
-	b _0801254C
-	.align 2, 0
-_080124E4: .4byte gUnknown_203B188
-_080124E8:
-	adds r5, r4, 0
-	ldr r1, [r5]
-	ldr r0, [r1, 0x4]
-	cmp r0, 0
-	beq _0801253C
-	bl sub_8011FF8
-	lsls r0, 24
-	cmp r0, 0
-	beq _08012518
-	ldr r0, _08012510
-	ldr r3, _08012514
-	movs r1, 0
-	movs r2, 0
-	bl sub_80141B4
-	ldr r1, [r5]
-	movs r0, 0x3
-	str r0, [r1]
-	b _0801254C
-	.align 2, 0
-_08012510: .4byte gUnknown_80D4354
-_08012514: .4byte 0x00000301
-_08012518:
-	ldr r1, [r4]
-	b _0801252A
-_0801251C:
-	add r0, sp, 0x4
-	bl sub_80144A4
-	cmp r0, 0
-	bne _0801254C
-	ldr r0, _08012530
-	ldr r1, [r0]
-_0801252A:
-	movs r0, 0x4
-	str r0, [r1]
-	b _0801254C
-	.align 2, 0
-_08012530: .4byte gUnknown_203B188
-_08012534:
-	bl sub_8012298
-	ldr r0, _08012544
-	ldr r1, [r0]
-_0801253C:
-	movs r0, 0x6
-	str r0, [r1]
-	b _0801254C
-	.align 2, 0
-_08012544: .4byte gUnknown_203B188
-_08012548:
-	movs r0, 0
-	b _0801254E
-_0801254C:
-	movs r0, 0x1
-_0801254E:
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8012484
-
-	thumb_func_start sub_8012558
-sub_8012558:
-	push {r4,lr}
-	ldr r4, _08012570
-	ldr r0, [r4]
-	cmp r0, 0
-	beq _0801256A
-	bl MemoryFree
-	movs r0, 0
-	str r0, [r4]
-_0801256A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08012570: .4byte gUnknown_203B188
-	thumb_func_end sub_8012558
-
 	thumb_func_start sub_8012574
 sub_8012574:
 	push {r4-r6,lr}