Merge pull request #26 from notyouraveragehooman/master

keese.c, input.c

3 files changed, 0 insertions, 207 deletions

diff --git a/asm/keese.s b/asm/keese.s
deleted file mode 100644
index f1035924..00000000
--- a/asm/keese.s
+++ /dev/null
@@ -1,74 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_08021F24
-sub_08021F24: @ 0x08021F24
-	push {r4, lr}
-	adds r4, r0, #0
-	adds r0, #0x78
-	ldrh r0, [r0]
-	cmp r0, #0
-	bne _08021F48
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	bl Random
-	ldr r2, _08021F44 @ =gUnk_080CB6F6
-	movs r1, #0xf
-	ands r1, r0
-	adds r1, r1, r2
-	ldrb r0, [r1]
-	b _08021F6E
-	.align 2, 0
-_08021F44: .4byte gUnk_080CB6F6
-_08021F48:
-	adds r0, r4, #0
-	adds r0, #0x7a
-	ldrh r0, [r0]
-	cmp r0, #0
-	bne _08021F80
-	ldr r0, _08021F7C @ =gLinkEntity
-	movs r2, #0x2e
-	ldrsh r1, [r0, r2]
-	movs r3, #0x32
-	ldrsh r2, [r0, r3]
-	adds r0, r4, #0
-	movs r3, #0x70
-	bl sub_0806FCB8
-	cmp r0, #0
-	bne _08021F80
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	movs r0, #0x1e
-_08021F6E:
-	strb r0, [r4, #0xe]
-	adds r0, r4, #0
-	movs r1, #1
-	bl InitializeAnimation
-	b _08021FA4
-	.align 2, 0
-_08021F7C: .4byte gLinkEntity
-_08021F80:
-	adds r0, r4, #0
-	bl sub_08049FA0
-	cmp r0, #0
-	beq _08021F94
-	bl Random
-	movs r1, #0x1f
-	ands r0, r1
-	b _08021F9A
-_08021F94:
-	adds r0, r4, #0
-	bl sub_08049EE4
-_08021F9A:
-	strb r0, [r4, #0x15]
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-_08021FA4:
-	pop {r4, pc}
-	.align 2, 0
diff --git a/asm/readKeyInput.s b/asm/readKeyInput.s
deleted file mode 100644
index 50e63e38..00000000
--- a/asm/readKeyInput.s
+++ /dev/null
@@ -1,54 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start ReadKeyInput
-ReadKeyInput: @ 0x0801D6C0
-	push {lr}
-	ldr r0, _0801D6D4 @ =0x04000130
-	ldrh r0, [r0]
-	ldr r1, _0801D6D8 @ =0x000003FF
-	bics r1, r0
-	ldr r0, _0801D6DC @ =gUnk_03000FF0
-	bl sub_0801D6E0
-	pop {pc}
-	.align 2, 0
-_0801D6D4: .4byte 0x04000130
-_0801D6D8: .4byte 0x000003FF
-_0801D6DC: .4byte gUnk_03000FF0
-
-
-	thumb_func_start sub_0801D6E0
-sub_0801D6E0: @ 0x0801D6E0
-	push {lr}
-	adds r2, r0, #0
-	ldrh r0, [r2]
-	adds r3, r1, #0
-	bics r3, r0
-	strh r3, [r2, #2]
-	cmp r1, r0
-	bne _0801D70A
-	ldrb r0, [r2, #7]
-	subs r0, #1
-	strb r0, [r2, #7]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _0801D704
-	movs r0, #4
-	strb r0, [r2, #7]
-	strh r1, [r2, #4]
-	b _0801D710
-_0801D704:
-	movs r0, #0
-	strh r0, [r2, #4]
-	b _0801D710
-_0801D70A:
-	movs r0, #0x14
-	strb r0, [r2, #7]
-	strh r3, [r2, #4]
-_0801D710:
-	strh r1, [r2]
-	pop {pc}
diff --git a/asm/tingleSiblings.s b/asm/tingleSiblings.s
index d4cb0bc2..e8d3f96c 100644
--- a/asm/tingleSiblings.s
+++ b/asm/tingleSiblings.s
@@ -6,85 +6,6 @@
 
 	.text
 
-
-	thumb_func_start TingleSiblings
-TingleSiblings: @ 0x08064D58
-	push {lr}
-	adds r2, r0, #0
-	ldrb r1, [r2, #0x10]
-	movs r0, #2
-	ands r0, r1
-	cmp r0, #0
-	beq _08064D6E
-	adds r0, r2, #0
-	bl sub_08064DE4
-	b _08064D74
-_08064D6E:
-	adds r0, r2, #0
-	bl sub_08064D78
-_08064D74:
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_08064D78
-sub_08064D78: @ 0x08064D78
-	push {lr}
-	ldr r2, _08064D8C @ =gUnk_0810FBFC
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08064D8C: .4byte gUnk_0810FBFC
-
-	thumb_func_start sub_08064D90
-sub_08064D90: @ 0x08064D90
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r1, #2
-	bl InitAnimationForceUpdate
-	movs r0, #1
-	strb r0, [r4, #0xf]
-	pop {r4, pc}
-
-	thumb_func_start sub_08064DA0
-sub_08064DA0: @ 0x08064DA0
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_08064EE8
-	adds r0, r4, #0
-	adds r0, #0x39
-	ldrb r0, [r0]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	cmp r0, #0
-	beq _08064DC8
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	adds r0, r4, #0
-	movs r1, #6
-	bl InitAnimationForceUpdate
-	movs r0, #0
-	bl TextboxNoOverlapFollow
-_08064DC8:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08064DCC
-sub_08064DCC: @ 0x08064DCC
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_08064EE8
-	adds r0, r4, #0
-	movs r1, #2
-	bl InitAnimationForceUpdate
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	pop {r4, pc}
-	.align 2, 0
-
 	thumb_func_start sub_08064DE4
 sub_08064DE4: @ 0x08064DE4
 	push {r4, r5, lr}