2 files changed, 44 insertions, 120 deletions
diff --git a/asm/trade.s b/asm/trade.s
index 309ebc46b..b68905d0f 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -460,124 +460,4 @@ _0804B042:
 _0804B054: .4byte gTileBuffer
 	thumb_func_end sub_804AFB8
 
-	thumb_func_start sub_804B058
-sub_804B058: @ 804B058
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0x1
-	strh r0, [r4, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xA
-	bne _0804B074
-	movs r0, 0x17
-	bl PlaySE
-	movs r0, 0
-	strh r0, [r4, 0x2E]
-_0804B074:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_804B058
-
-	thumb_func_start sub_804B07C
-sub_804B07C: @ 804B07C
-	push {lr}
-	adds r2, r0, 0
-	movs r0, 0x30
-	ldrsh r1, [r2, r0]
-	cmp r1, 0
-	bne _0804B0B2
-	ldrh r0, [r2, 0x2E]
-	adds r0, 0x1
-	strh r0, [r2, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xC
-	bne _0804B098
-	strh r1, [r2, 0x2E]
-_0804B098:
-	movs r1, 0x2E
-	ldrsh r0, [r2, r1]
-	lsls r0, 1
-	ldr r1, _0804B0B8 @ =gTradeGlow2PaletteAnimTable
-	adds r0, r1
-	ldrb r1, [r2, 0x5]
-	lsrs r1, 4
-	adds r1, 0x10
-	lsls r1, 4
-	adds r1, 0x4
-	movs r2, 0x2
-	bl LoadPalette
-_0804B0B2:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804B0B8: .4byte gTradeGlow2PaletteAnimTable
-	thumb_func_end sub_804B07C
-
-	thumb_func_start sub_804B0BC
-sub_804B0BC: @ 804B0BC
-	push {lr}
-	adds r2, r0, 0
-	ldrh r1, [r2, 0x2E]
-	adds r1, 0x1
-	strh r1, [r2, 0x2E]
-	ldrh r0, [r2, 0x26]
-	adds r0, 0x1
-	strh r0, [r2, 0x26]
-	lsls r1, 16
-	asrs r1, 16
-	cmp r1, 0xA
-	bne _0804B0DA
-	adds r0, r2, 0
-	bl DestroySprite
-_0804B0DA:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_804B0BC
-
-	thumb_func_start sub_804B0E0
-sub_804B0E0: @ 804B0E0
-	push {lr}
-	adds r2, r0, 0
-	ldrh r1, [r2, 0x2E]
-	adds r1, 0x1
-	strh r1, [r2, 0x2E]
-	ldrh r0, [r2, 0x26]
-	subs r0, 0x1
-	strh r0, [r2, 0x26]
-	lsls r1, 16
-	asrs r1, 16
-	cmp r1, 0xA
-	bne _0804B0FE
-	adds r0, r2, 0
-	bl DestroySprite
-_0804B0FE:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_804B0E0
-
-	thumb_func_start sub_804B104
-sub_804B104: @ 804B104
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0x1
-	strh r0, [r4, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xF
-	bne _0804B120
-	movs r0, 0xCC
-	bl PlaySE
-	movs r0, 0
-	strh r0, [r4, 0x2E]
-_0804B120:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_804B104
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/src/trade.c b/src/trade.c
index 06da2c333..13811336e 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -3511,6 +3511,50 @@ static bool8 sub_804ABF8(void)
 
 asm(".section .text.sub_804DAD4");
 
+void sub_804B058(struct Sprite *sprite)
+{
+    if (++ sprite->data0 == 10)
+    {
+        PlaySE(SE_BOWA);
+        sprite->data0 = 0;
+    }
+}
+
+void sub_804B07C(struct Sprite *sprite)
+{
+    if (sprite->data1 == 0)
+    {
+        if (++ sprite->data0 == 12)
+            sprite->data0 = 0;
+        LoadPalette(&gTradeGlow2PaletteAnimTable[sprite->data0], 16 * (sprite->oam.paletteNum + 16) + 4, 2);
+    }
+}
+
+void sub_804B0BC(struct Sprite *sprite)
+{
+    sprite->data0 ++;
+    sprite->pos2.y ++;
+    if (sprite->data0 == 10)
+        DestroySprite(sprite);
+}
+
+void sub_804B0E0(struct Sprite *sprite)
+{
+    sprite->data0 ++;
+    sprite->pos2.y --;
+    if (sprite->data0 == 10)
+        DestroySprite(sprite);
+}
+
+void sub_804B104(struct Sprite *sprite)
+{
+    if (++ sprite->data0 == 15)
+    {
+        PlaySE(SE_W107);
+        sprite->data0 = 0;
+    }
+}
+
 void sub_804B128(void)
 {
     struct BgAffineDstData dest;