Merge branch 'master' into field_poison

2 files changed, 0 insertions, 131 deletions

diff --git a/asm/coins.s b/asm/coins.s
deleted file mode 100644
index d2b6cbb47..000000000
--- a/asm/coins.s
+++ /dev/null
@@ -1,74 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start GiveCoins
-@ bool8 GiveCoins(u16 toAdd)
-GiveCoins: @ 8145C80
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	bl GetCoins
-	lsls r0, 16
-	lsrs r1, r0, 16
-	ldr r0, =0x0000270e
-	cmp r1, r0
-	bls _08145C9C
-	movs r0, 0
-	b _08145CC0
-	.pool
-_08145C9C:
-	adds r0, r1, r4
-	cmp r1, r0
-	ble _08145CAC
-	ldr r0, =0x0000270f
-	b _08145CBA
-	.pool
-_08145CAC:
-	lsls r0, 16
-	lsrs r1, r0, 16
-	ldr r0, =0x0000270f
-	cmp r1, r0
-	bls _08145CB8
-	adds r1, r0, 0
-_08145CB8:
-	adds r0, r1, 0
-_08145CBA:
-	bl SetCoins
-	movs r0, 0x1
-_08145CC0:
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end GiveCoins
-
-	thumb_func_start TakeCoins
-@ bool8 TakeCoins(u16 toSub)
-TakeCoins: @ 8145CCC
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	bl GetCoins
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, r4
-	bcs _08145CE2
-	movs r0, 0
-	b _08145CEE
-_08145CE2:
-	subs r0, r4
-	lsls r0, 16
-	lsrs r0, 16
-	bl SetCoins
-	movs r0, 0x1
-_08145CEE:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end TakeCoins
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/unk_81BAD84.s b/asm/unk_81BAD84.s
deleted file mode 100644
index 2a95feed4..000000000
--- a/asm/unk_81BAD84.s
+++ /dev/null
@@ -1,57 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_81BAD84
-sub_81BAD84: @ 81BAD84
-	push {r4-r6,lr}
-	movs r6, 0x80
-	lsls r6, 19
-	movs r2, 0
-	strh r2, [r6]
-	ldr r1, =0x04000010
-	strh r2, [r1]
-	adds r1, 0x2
-	strh r2, [r1]
-	adds r1, 0x3E
-	strh r2, [r1]
-	ldr r5, =gUnknown_08617128
-	lsls r4, r0, 1
-	adds r4, r0
-	lsls r4, 2
-	adds r0, r4, r5
-	ldr r0, [r0]
-	movs r1, 0xC0
-	lsls r1, 19
-	bl LZ77UnCompVram
-	adds r0, r5, 0x4
-	adds r0, r4, r0
-	ldr r0, [r0]
-	ldr r1, =0x0600f800
-	bl LZ77UnCompVram
-	adds r5, 0x8
-	adds r4, r5
-	ldr r0, [r4]
-	movs r1, 0xA0
-	lsls r1, 19
-	movs r4, 0x80
-	lsls r4, 1
-	adds r2, r4, 0
-	bl CpuSet
-	ldr r1, =0x04000008
-	movs r2, 0xF8
-	lsls r2, 5
-	adds r0, r2, 0
-	strh r0, [r1]
-	strh r4, [r6]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81BAD84
-
-
-	.align 2, 0 @ Don't pad with nop.