2 files changed, 32 insertions, 106 deletions

diff --git a/asm/trade.s b/asm/trade.s
index 8cfc23345..49fdce61c 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -1683,109 +1683,4 @@ _0804BA8C:
 _0804BA90: .4byte gLinkPlayers
 	thumb_func_end sub_804BA64
 
-	thumb_func_start sub_804BA94
-sub_804BA94: @ 804BA94
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x4
-	adds r4, r1, 0
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r5, 0x64
-	mov r1, r9
-	muls r1, r5
-	ldr r0, _0804BB60 @ =gPlayerParty
-	adds r7, r1, r0
-	adds r0, r7, 0
-	movs r1, 0x40
-	bl GetMonData
-	lsls r0, 16
-	lsrs r6, r0, 16
-	adds r1, r4, 0
-	muls r1, r5
-	ldr r0, _0804BB64 @ =gEnemyParty
-	adds r5, r1, r0
-	adds r0, r5, 0
-	movs r1, 0x40
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	mov r8, r0
-	cmp r6, 0xFF
-	beq _0804BAE8
-	lsls r0, r6, 3
-	adds r0, r6
-	lsls r0, 2
-	ldr r1, _0804BB68 @ =gSaveBlock1 + 0x2B4C
-	adds r0, r1
-	bl ClearMailStruct
-_0804BAE8:
-	ldr r4, _0804BB6C @ =gUnknown_03004828
-	ldr r0, [r4]
-	adds r0, 0x38
-	adds r1, r7, 0
-	movs r2, 0x64
-	bl memcpy
-	adds r0, r7, 0
-	adds r1, r5, 0
-	movs r2, 0x64
-	bl memcpy
-	ldr r1, [r4]
-	adds r1, 0x38
-	adds r0, r5, 0
-	movs r2, 0x64
-	bl memcpy
-	movs r1, 0x46
-	mov r0, sp
-	strb r1, [r0]
-	adds r0, r7, 0
-	movs r1, 0x2D
-	bl GetMonData
-	cmp r0, 0
-	bne _0804BB28
-	adds r0, r7, 0
-	movs r1, 0x20
-	mov r2, sp
-	bl SetMonData
-_0804BB28:
-	mov r0, r8
-	cmp r0, 0xFF
-	beq _0804BB3E
-	lsls r1, r0, 3
-	add r1, r8
-	lsls r1, 2
-	ldr r0, _0804BB70 @ =gUnknown_02029700
-	adds r1, r0
-	adds r0, r7, 0
-	bl GiveMailToMon2
-_0804BB3E:
-	mov r0, r9
-	bl sub_804BA18
-	ldr r0, _0804BB74 @ =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0804BB50
-	bl sub_804BA64
-_0804BB50:
-	add sp, 0x4
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804BB60: .4byte gPlayerParty
-_0804BB64: .4byte gEnemyParty
-_0804BB68: .4byte gSaveBlock1 + 0x2B4C
-_0804BB6C: .4byte gUnknown_03004828
-_0804BB70: .4byte gUnknown_02029700
-_0804BB74: .4byte gReceivedRemoteLinkPlayers
-	thumb_func_end sub_804BA94
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index ada0f5ace..c3e8c6a6f 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -128,7 +128,7 @@ struct TradeEwramSubstruct2 {
     /*0x0000*/ u8 filler_0000;
     /*0x0004*/ struct Window window;
     /*0x0034*/ u8 unk_0034;
-    /*0x0035*/ u8 filler_0035[0x67];
+    /*0x0038*/ struct Pokemon pokemon;
     /*0x009c*/ u8 unk_009c;
     /*0x009d*/ u8 unk_009d;
     /*0x009e*/ u16 linkData[13];
@@ -245,6 +245,8 @@ void sub_804D80C(struct Sprite *);
 void sub_804E1DC(void);
 void sub_804BBCC(void);
 void sub_804D8E4(void);
+void sub_804BA18(u8);
+void sub_804BA64(void);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -3502,6 +3504,35 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804BA94(u8 a0, u8 a1)
+{
+    u8 friendship;
+    struct Pokemon *playerPokemon = &gPlayerParty[a0];
+    u16 playerMail = GetMonData(playerPokemon, MON_DATA_MAIL);
+
+    struct Pokemon *friendPokemon = &gEnemyParty[a1];
+    u16 friendMail = GetMonData(friendPokemon, MON_DATA_MAIL);
+
+    if (playerMail != 0xff)
+        ClearMailStruct(&gSaveBlock1.mail[playerMail]);
+
+    // This is where the actual trade happens!!
+    gUnknown_03004828->pokemon = *playerPokemon;
+    *playerPokemon = *friendPokemon;
+    *friendPokemon = gUnknown_03004828->pokemon;
+
+    friendship = 70;
+    if (!GetMonData(playerPokemon, MON_DATA_IS_EGG))
+        SetMonData(playerPokemon, MON_DATA_FRIENDSHIP, &friendship);
+
+    if (friendMail != 0xff)
+        GiveMailToMon2(playerPokemon, &gUnknown_02029700[friendMail]);
+
+    sub_804BA18(a0);
+    if (gReceivedRemoteLinkPlayers)
+        sub_804BA64();
+}
+
 void sub_804BB78(void)
 {
     switch (gUnknown_03004828->unk_00bd)