some more work on decomping funcs

2 files changed, 0 insertions, 248 deletions

diff --git a/asm/code_8098BDC.s b/asm/code_8098BDC.s
index 3dad36e..099d9d3 100644
--- a/asm/code_8098BDC.s
+++ b/asm/code_8098BDC.s
@@ -5,241 +5,6 @@
 
 	.text	
 
-	thumb_func_start sub_8098E18
-sub_8098E18:
-	push {r4-r6,lr}
-	adds r6, r1, 0
-	lsls r0, 16
-	asrs r2, r0, 16
-	adds r5, r2, 0
-	ldr r4, _08098E40
-	ldr r0, [r4]
-	cmp r0, 0
-	bne _08098EA8
-	ldr r1, _08098E44
-	movs r0, 0
-	adds r3, r6, 0
-	bl Log
-	ldr r0, _08098E48
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08098E4C
-	movs r0, 0x7
-	b _08098E8A
-	.align 2, 0
-_08098E40: .4byte gUnknown_20398A8
-_08098E44: .4byte gUnknown_8115F80
-_08098E48: .4byte gUnknown_203B49D
-_08098E4C:
-	ldr r0, _08098E74
-	ldrb r0, [r0]
-	ldr r1, _08098E78
-	cmp r0, 0
-	bne _08098E58
-	strh r5, [r1]
-_08098E58:
-	movs r2, 0
-	ldrsh r0, [r1, r2]
-	bl sub_80A2750
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x2
-	beq _08098E88
-	cmp r0, 0x2
-	bgt _08098E7C
-	cmp r0, 0x1
-	beq _08098E84
-	b _08098E8C
-	.align 2, 0
-_08098E74: .4byte gUnknown_203B49C
-_08098E78: .4byte gUnknown_20398C4
-_08098E7C:
-	cmp r0, 0x4
-	bne _08098E8C
-	movs r0, 0x8
-	b _08098E8A
-_08098E84:
-	movs r0, 0x5
-	b _08098E8A
-_08098E88:
-	movs r0, 0x6
-_08098E8A:
-	str r0, [r4]
-_08098E8C:
-	ldr r0, _08098EA0
-	movs r1, 0x1
-	str r1, [r0]
-	ldr r0, _08098EA4
-	str r6, [r0]
-	bl sub_809C730
-	movs r0, 0x1
-	b _08098EAA
-	.align 2, 0
-_08098EA0: .4byte gUnknown_20398AC
-_08098EA4: .4byte gUnknown_20398B0
-_08098EA8:
-	movs r0, 0
-_08098EAA:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8098E18
-
-	thumb_func_start sub_8098EB0
-sub_8098EB0:
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldr r5, _08098EE4
-	ldr r0, [r5]
-	cmp r0, 0
-	bne _08098EF8
-	ldr r0, _08098EE8
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08098EF8
-	ldr r1, _08098EEC
-	movs r0, 0
-	adds r2, r4, 0
-	bl Log
-	movs r0, 0x7
-	str r0, [r5]
-	ldr r1, _08098EF0
-	movs r0, 0x1
-	str r0, [r1]
-	ldr r0, _08098EF4
-	str r4, [r0]
-	bl sub_809C730
-	movs r0, 0x1
-	b _08098EFA
-	.align 2, 0
-_08098EE4: .4byte gUnknown_20398A8
-_08098EE8: .4byte gUnknown_203B49D
-_08098EEC: .4byte gUnknown_8115FA4
-_08098EF0: .4byte gUnknown_20398AC
-_08098EF4: .4byte gUnknown_20398B0
-_08098EF8:
-	movs r0, 0
-_08098EFA:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8098EB0
-
-	thumb_func_start sub_8098F00
-sub_8098F00:
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldr r5, _08098F10
-	ldr r0, [r5]
-	cmp r0, 0
-	beq _08098F14
-	movs r0, 0
-	b _08098F32
-	.align 2, 0
-_08098F10: .4byte gUnknown_20398A8
-_08098F14:
-	ldr r1, _08098F38
-	movs r0, 0
-	adds r2, r4, 0
-	bl Log
-	movs r0, 0x9
-	str r0, [r5]
-	ldr r1, _08098F3C
-	movs r0, 0x1
-	str r0, [r1]
-	ldr r0, _08098F40
-	str r4, [r0]
-	bl sub_809C730
-	movs r0, 0x1
-_08098F32:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08098F38: .4byte gUnknown_8115FC8
-_08098F3C: .4byte gUnknown_20398AC
-_08098F40: .4byte gUnknown_20398B0
-	thumb_func_end sub_8098F00
-
-	thumb_func_start sub_8098F44
-sub_8098F44:
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldr r5, _08098F54
-	ldr r0, [r5]
-	cmp r0, 0
-	beq _08098F58
-	movs r0, 0
-	b _08098F76
-	.align 2, 0
-_08098F54: .4byte gUnknown_20398A8
-_08098F58:
-	ldr r1, _08098F7C
-	movs r0, 0
-	adds r2, r4, 0
-	bl Log
-	movs r0, 0xA
-	str r0, [r5]
-	ldr r1, _08098F80
-	movs r0, 0x1
-	str r0, [r1]
-	ldr r0, _08098F84
-	str r4, [r0]
-	bl sub_809C730
-	movs r0, 0x1
-_08098F76:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08098F7C: .4byte gUnknown_8115FE8
-_08098F80: .4byte gUnknown_20398AC
-_08098F84: .4byte gUnknown_20398B0
-	thumb_func_end sub_8098F44
-
-	thumb_func_start sub_8098F88
-sub_8098F88:
-	ldr r0, _08098F90
-	ldrb r0, [r0]
-	bx lr
-	.align 2, 0
-_08098F90: .4byte gUnknown_20398B9
-	thumb_func_end sub_8098F88
-
-	thumb_func_start sub_8098F94
-sub_8098F94:
-	ldr r0, _08098F9C
-	ldrb r0, [r0]
-	bx lr
-	.align 2, 0
-_08098F9C: .4byte gUnknown_20398BA
-	thumb_func_end sub_8098F94
-
-	thumb_func_start sub_8098FA0
-sub_8098FA0:
-	push {lr}
-	movs r0, 0
-	movs r1, 0x11
-	bl sub_8001658
-	lsls r0, 16
-	asrs r0, 16
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8098FA0
-
-	thumb_func_start sub_8098FB4
-sub_8098FB4:
-	push {lr}
-	movs r0, 0
-	movs r1, 0x11
-	bl sub_8001658
-	lsls r0, 16
-	asrs r0, 16
-	bl sub_80A2B18
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8098FB4
-
 	thumb_func_start sub_8098FCC
 sub_8098FCC:
 	push {r4,lr}
diff --git a/asm/code_809D148.s b/asm/code_809D148.s
index 5571ce2..bc5bed2 100644
--- a/asm/code_809D148.s
+++ b/asm/code_809D148.s
@@ -10035,17 +10035,4 @@ _080A26B4:
 	bx r1
 	thumb_func_end sub_80A2688
 
-	thumb_func_start sub_80A26B8
-sub_80A26B8:
-	lsls r0, 16
-	ldr r1, _080A26C8
-	asrs r0, 15
-	adds r0, r1
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	bx lr
-	.align 2, 0
-_080A26C8: .4byte gUnknown_8116F9A
-	thumb_func_end sub_80A26B8
-
         .align 2,0