From 85e758cb43dff511033c03d5c8f9ff3155bb805a Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 2 Sep 2017 14:30:28 -0400
Subject: sub_8049954

---
 asm/trade.s | 24 ------------------------
 src/trade.c |  9 +++++++++
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/asm/trade.s b/asm/trade.s
index 103fdbbaa..131df0f6f 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,30 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049954
-sub_8049954: @ 8049954
-	push {lr}
-	ldr r0, _08049978 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _0804996A
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08049974
-_0804996A:
-	movs r0, 0x5
-	bl PlaySE
-	bl sub_8049804
-_08049974:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08049978: .4byte gMain
-	thumb_func_end sub_8049954
-
 	thumb_func_start sub_804997C
 sub_804997C: @ 804997C
 	push {r4,lr}
diff --git a/src/trade.c b/src/trade.c
index b8732aeea..a9eeddf7c 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1757,6 +1757,15 @@ static void sub_8049620(void)
     }
 }
 
+/*static*/ void sub_8049954(void)
+{
+    if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        sub_8049804();
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
-- 
cgit v1.2.3