through sub_8130FD4 and associated rodata

1 files changed, 0 insertions, 207 deletions

diff --git a/asm/oak_speech.s b/asm/oak_speech.s
index d3d7ffc4a..f9d4e9b5a 100644
--- a/asm/oak_speech.s
+++ b/asm/oak_speech.s
@@ -5,213 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8130FB8
-sub_8130FB8: @ 8130FB8
-	ldr r3, _08130FD0 @ =gSprites
-	movs r1, 0x2E
-	ldrsh r2, [r0, r1]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r3
-	adds r1, 0x2B
-	ldrb r1, [r1]
-	strh r1, [r0, 0x26]
-	bx lr
-	.align 2, 0
-_08130FD0: .4byte gSprites
-	thumb_func_end sub_8130FB8
-
-	thumb_func_start sub_8130FD4
-sub_8130FD4: @ 8130FD4
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	lsls r1, 24
-	lsrs r1, 24
-	movs r4, 0
-	cmp r1, 0
-	beq _08130FF4
-	cmp r1, 0x1
-	beq _081310C8
-	b _08131146
-_08130FF4:
-	ldr r4, _081310B0 @ =gUnknown_8462EFC
-	adds r0, r4, 0
-	bl LoadCompressedObjectPic
-	adds r0, r4, 0
-	adds r0, 0x8
-	bl LoadCompressedObjectPic
-	adds r4, 0x10
-	adds r0, r4, 0
-	bl LoadCompressedObjectPic
-	ldr r0, _081310B4 @ =gUnknown_8462F1C
-	bl LoadSpritePalette
-	ldr r0, _081310B8 @ =gUnknown_846302C
-	mov r8, r0
-	movs r1, 0x10
-	movs r2, 0x11
-	movs r3, 0x2
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r6, _081310BC @ =gSprites
-	lsls r1, r7, 4
-	adds r1, r7
-	lsls r1, 2
-	adds r1, r6
-	ldrb r2, [r1, 0x5]
-	movs r5, 0xD
-	negs r5, r5
-	adds r0, r5, 0
-	ands r0, r2
-	strb r0, [r1, 0x5]
-	ldr r0, _081310C0 @ =gTasks
-	mov r1, r9
-	lsls r4, r1, 2
-	add r4, r9
-	lsls r4, 3
-	adds r4, r0
-	strh r7, [r4, 0x16]
-	mov r0, r8
-	adds r0, 0x18
-	movs r1, 0x10
-	movs r2, 0x9
-	movs r3, 0x3
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r7, r0, 24
-	lsls r1, r7, 4
-	adds r1, r7
-	lsls r1, 2
-	adds r2, r1, r6
-	ldrb r3, [r2, 0x5]
-	adds r0, r5, 0
-	ands r0, r3
-	strb r0, [r2, 0x5]
-	ldrh r0, [r4, 0x16]
-	strh r0, [r2, 0x2E]
-	movs r2, 0x1C
-	adds r2, r6
-	mov r10, r2
-	add r1, r10
-	ldr r3, _081310C4 @ =sub_8130FB8
-	mov r9, r3
-	str r3, [r1]
-	strh r7, [r4, 0x18]
-	movs r0, 0x30
-	add r8, r0
-	mov r0, r8
-	movs r1, 0x18
-	movs r2, 0xD
-	movs r3, 0x1
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r7, r0, 24
-	lsls r0, r7, 4
-	adds r0, r7
-	lsls r0, 2
-	adds r6, r0, r6
-	ldrb r1, [r6, 0x5]
-	ands r5, r1
-	strb r5, [r6, 0x5]
-	ldrh r1, [r4, 0x16]
-	strh r1, [r6, 0x2E]
-	add r0, r10
-	mov r1, r9
-	str r1, [r0]
-	strh r7, [r4, 0x1A]
-	b _08131146
-	.align 2, 0
-_081310B0: .4byte gUnknown_8462EFC
-_081310B4: .4byte gUnknown_8462F1C
-_081310B8: .4byte gUnknown_846302C
-_081310BC: .4byte gSprites
-_081310C0: .4byte gTasks
-_081310C4: .4byte sub_8130FB8
-_081310C8:
-	ldr r0, _08131154 @ =gUnknown_8462F14
-	bl LoadCompressedObjectPic
-	ldr r0, _08131158 @ =gUnknown_8462F24
-	bl LoadSpritePalette
-	mov r2, r9
-	lsls r5, r2, 2
-	ldr r3, _0813115C @ =gTasks+0x8
-	mov r8, r3
-	ldr r6, _08131160 @ =gSprites
-_081310DE:
-	lsls r0, r4, 1
-	adds r0, r4
-	lsls r0, 3
-	ldr r1, _08131164 @ =gUnknown_8462F50
-	adds r0, r1
-	lsls r1, r4, 21
-	movs r2, 0xB0
-	lsls r2, 15
-	adds r1, r2
-	asrs r1, 16
-	movs r2, 0x70
-	movs r3, 0x1
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r7, r0, 24
-	lsls r2, r7, 4
-	adds r2, r7
-	lsls r2, 2
-	adds r2, r6
-	ldrb r1, [r2, 0x5]
-	movs r3, 0xD
-	negs r3, r3
-	adds r0, r3, 0
-	ands r1, r0
-	movs r0, 0x8
-	orrs r1, r0
-	strb r1, [r2, 0x5]
-	adds r3, r2, 0
-	adds r3, 0x2C
-	ldrb r0, [r3]
-	movs r1, 0x40
-	orrs r0, r1
-	strb r0, [r3]
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r2]
-	adds r1, r4, 0x7
-	lsls r1, 1
-	mov r2, r9
-	adds r0, r5, r2
-	lsls r0, 3
-	adds r1, r0
-	add r1, r8
-	strh r7, [r1]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x2
-	bls _081310DE
-_08131146:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08131154: .4byte gUnknown_8462F14
-_08131158: .4byte gUnknown_8462F24
-_0813115C: .4byte gTasks+0x8
-_08131160: .4byte gSprites
-_08131164: .4byte gUnknown_8462F50
-	thumb_func_end sub_8130FD4
-
 	thumb_func_start sub_8131168
 sub_8131168: @ 8131168
 	push {r4-r7,lr}