Final function (nonmatching)

1 files changed, 0 insertions, 186 deletions

diff --git a/asm/trade.s b/asm/trade.s
deleted file mode 100644
index 45bb5da25..000000000
--- a/asm/trade.s
+++ /dev/null
@@ -1,186 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-.ifdef ENGLISH
-	.set sub_804A96C_alt, sub_804A96C
-.endif
-
-	thumb_func_start sub_804ACF4
-sub_804ACF4: @ 804ACF4
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	cmp r0, 0
-	beq _0804AD0C
-	cmp r0, 0x1
-	beq _0804ADA0
-	b _0804AE2C
-_0804AD0C:
-	movs r7, 0
-	ldr r1, _0804AD4C @ =gUnknown_03004824
-	ldr r0, [r1]
-	adds r0, 0x42
-	ldrb r0, [r0]
-	cmp r7, r0
-	blt _0804AD1C
-	b _0804AE2C
-_0804AD1C:
-	adds r6, r1, 0
-	movs r5, 0
-	mov r9, r5
-_0804AD22:
-	movs r0, 0x64
-	adds r1, r7, 0
-	muls r1, r0
-	ldr r0, _0804AD50 @ =gPlayerParty
-	adds r4, r1, r0
-	adds r0, r4, 0
-	movs r1, 0x2D
-	bl GetMonData
-	adds r1, r0, 0
-	cmp r1, 0x1
-	bne _0804AD54
-	ldr r0, [r6]
-	adds r0, 0x51
-	adds r0, r5
-	mov r2, r9
-	strb r2, [r0]
-	ldr r0, [r6]
-	adds r0, 0x5D
-	adds r0, r5
-	b _0804AD84
-	.align 2, 0
-_0804AD4C: .4byte gUnknown_03004824
-_0804AD50: .4byte gPlayerParty
-_0804AD54:
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl GetMonData
-	adds r1, r0, 0
-	cmp r1, 0
-	bne _0804AD72
-	ldr r0, [r6]
-	adds r0, 0x51
-	adds r0, r5
-	strb r1, [r0]
-	ldr r0, [r6]
-	adds r0, 0x5D
-	adds r0, r5
-	b _0804AD84
-_0804AD72:
-	ldr r0, [r6]
-	adds r0, 0x51
-	adds r0, r5
-	movs r1, 0x1
-	strb r1, [r0]
-	ldr r0, [r6]
-	adds r0, 0x5D
-	adds r0, r5
-	mov r1, r9
-_0804AD84:
-	strb r1, [r0]
-	ldr r0, _0804AD9C @ =gUnknown_03004824
-	adds r5, 0x1
-	adds r7, 0x1
-	ldr r0, [r0]
-	adds r0, 0x42
-	add r0, r8
-	ldrb r0, [r0]
-	cmp r7, r0
-	blt _0804AD22
-	b _0804AE2C
-	.align 2, 0
-_0804AD9C: .4byte gUnknown_03004824
-_0804ADA0:
-	movs r7, 0
-	ldr r1, _0804ADE0 @ =gUnknown_03004824
-	ldr r0, [r1]
-	adds r0, 0x43
-	ldrb r0, [r0]
-	cmp r7, r0
-	bge _0804AE2C
-	adds r6, r1, 0
-	movs r5, 0x6
-	movs r2, 0
-	mov r9, r2
-_0804ADB6:
-	movs r0, 0x64
-	adds r1, r7, 0
-	muls r1, r0
-	ldr r0, _0804ADE4 @ =gEnemyParty
-	adds r4, r1, r0
-	adds r0, r4, 0
-	movs r1, 0x2D
-	bl GetMonData
-	adds r1, r0, 0
-	cmp r1, 0x1
-	bne _0804ADE8
-	ldr r0, [r6]
-	adds r0, 0x51
-	adds r0, r5
-	mov r2, r9
-	strb r2, [r0]
-	ldr r0, [r6]
-	adds r0, 0x5D
-	adds r0, r5
-	b _0804AE18
-	.align 2, 0
-_0804ADE0: .4byte gUnknown_03004824
-_0804ADE4: .4byte gEnemyParty
-_0804ADE8:
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl GetMonData
-	adds r1, r0, 0
-	cmp r1, 0
-	bne _0804AE06
-	ldr r0, [r6]
-	adds r0, 0x51
-	adds r0, r5
-	strb r1, [r0]
-	ldr r0, [r6]
-	adds r0, 0x5D
-	adds r0, r5
-	b _0804AE18
-_0804AE06:
-	ldr r0, [r6]
-	adds r0, 0x51
-	adds r0, r5
-	movs r1, 0x1
-	strb r1, [r0]
-	ldr r0, [r6]
-	adds r0, 0x5D
-	adds r0, r5
-	mov r1, r9
-_0804AE18:
-	strb r1, [r0]
-	ldr r0, _0804AE38 @ =gUnknown_03004824
-	adds r5, 0x1
-	adds r7, 0x1
-	ldr r0, [r0]
-	adds r0, 0x42
-	add r0, r8
-	ldrb r0, [r0]
-	cmp r7, r0
-	blt _0804ADB6
-_0804AE2C:
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804AE38: .4byte gUnknown_03004824
-	thumb_func_end sub_804ACF4
-
-	.align 2, 0 @ Don't pad with nop.