Through sub_8049D9C

2 files changed, 22 insertions, 66 deletions

diff --git a/asm/trade.s b/asm/trade.s
index 4333bda3f..0403bc252 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10,72 +10,6 @@
 	.set sub_804A96C_alt, sub_804A96C
 .endif
 
-	thumb_func_start sub_8049D44
-sub_8049D44: @ 8049D44
-	push {lr}
-	ldr r0, _08049D90 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08049D8A
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0
-	bl sub_804A840
-	movs r0, 0x1
-	bl sub_804A840
-	ldr r2, _08049D94 @ =gUnknown_03004824
-	ldr r0, [r2]
-	adds r0, 0x7B
-	movs r1, 0
-	strb r1, [r0]
-	ldr r3, _08049D98 @ =gSprites
-	ldr r0, [r2]
-	adds r0, 0x40
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x3E
-	ldrb r2, [r0]
-	movs r1, 0x5
-	negs r1, r1
-	ands r1, r2
-	strb r1, [r0]
-_08049D8A:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08049D90: .4byte gMain
-_08049D94: .4byte gUnknown_03004824
-_08049D98: .4byte gSprites
-	thumb_func_end sub_8049D44
-
-	thumb_func_start sub_8049D9C
-sub_8049D9C: @ 8049D9C
-	push {lr}
-	ldr r0, _08049DBC @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08049DB8
-	bl sub_800832C
-	ldr r0, _08049DC0 @ =gUnknown_03004824
-	ldr r0, [r0]
-	adds r0, 0x7B
-	movs r1, 0xC
-	strb r1, [r0]
-_08049DB8:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08049DBC: .4byte gPaletteFade
-_08049DC0: .4byte gUnknown_03004824
-	thumb_func_end sub_8049D9C
-
 	thumb_func_start sub_8049DC4
 sub_8049DC4: @ 8049DC4
 	push {lr}
diff --git a/src/trade.c b/src/trade.c
index 308082606..774b5f6d1 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -150,6 +150,7 @@ static void sub_8048AB4(void);
 /*static*/ void sub_804AADC(u8, u8);
 /*static*/ void sub_804A80C(void);
 static u8 sub_80499F0(const u8 *, u8, u8);
+/*static*/ void sub_804A840(u8);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -1932,6 +1933,27 @@ static void sub_8049A20(void)
     }
 }
 
+/*static*/ void sub_8049D44(void)
+{
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        sub_804A840(0);
+        sub_804A840(1);
+        gUnknown_03004824->unk_007b = 0;
+        gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].invisible = FALSE;
+    }
+}
+
+/*static*/ void sub_8049D9C(void)
+{
+    if (!gPaletteFade.active)
+    {
+        sub_800832C();
+        gUnknown_03004824->unk_007b = 12;
+    }
+}
+
 asm(".section .text.sub_804A96C");
 
 /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {