From b22a80058104eca7f04ef608b01e96982a276216 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Fri, 19 Jan 2018 19:52:46 -0600
Subject: [PATCH] Extract data from trade.s

Also rename window_template_terminator to null_window_template, in keeping with naming conventions
---
 asm/macros/window.inc                      |   2 +-
 asm/trade.s                                |  56 +--
 data/battle_frontier_1.s                   |   2 +-
 data/battle_frontier_2.s                   |   4 +-
 data/battle_records.s                      |   2 +-
 data/berry_tag_screen.s                    |   2 +-
 data/contest.s                             |   2 +-
 data/contest_link_80F57C4.s                |   2 +-
 data/credits.s                             |   2 +-
 data/data2b.s                              |   4 +-
 data/easy_chat.s                           |   2 +-
 data/link.s                                |  16 +-
 data/main_menu.s                           |   4 +-
 data/pokemon_storage_system.s              |   2 +-
 data/pokenav.s                             |   2 +-
 data/reset_rtc_screen.s                    |   2 +-
 data/shop.s                                |   2 +-
 data/slot_machine.s                        |   2 +-
 data/strings.s                             |  23 +-
 data/trade.s                               | 464 ++++++++++++++++++---
 data/use_pokeblock.s                       |   2 +-
 graphics/trade/ball.png                    | Bin 0 -> 464 bytes
 graphics/trade/black.pal                   |  19 +
 graphics/trade/cable_closeup_map.bin       | Bin 0 -> 2048 bytes
 graphics/trade/cable_end.png               | Bin 0 -> 194 bytes
 graphics/trade/gba.pal                     |  19 +
 graphics/trade/gba_affine.png              | Bin 0 -> 1897 bytes
 graphics/trade/gba_affine_map_cable.bin    | Bin 0 -> 256 bytes
 graphics/trade/gba_affine_map_wireless.bin | Bin 0 -> 256 bytes
 graphics/trade/gba_map_cable.bin           | Bin 0 -> 4096 bytes
 graphics/trade/gba_map_wireless.bin        | Bin 0 -> 4096 bytes
 graphics/trade/gba_screen.png              | Bin 0 -> 170 bytes
 graphics/trade/glow1.png                   | Bin 0 -> 195 bytes
 graphics/trade/glow2.png                   | Bin 0 -> 190 bytes
 graphics/trade/misc.pal                    |  19 +
 graphics/trade/pokeball_symbol.png         | Bin 0 -> 1569 bytes
 graphics/trade/pokeball_symbol_map.bin     | Bin 0 -> 256 bytes
 graphics/trade/shadow.pal                  |  19 +
 graphics/trade/shadow_map.bin              | Bin 0 -> 4096 bytes
 graphics/trade/unknown_3308C0.pal          |  19 +
 graphics/trade/unknown_3379A0.bin          | Bin 0 -> 2048 bytes
 graphics/trade/unknown_338EA4.pal          |  15 +
 graphics/trade/wireless_signal.bin         | Bin 0 -> 2048 bytes
 graphics/trade/wireless_signal.png         | Bin 0 -> 1307 bytes
 graphics/trade/wireless_signal_receive.pal | 259 ++++++++++++
 graphics/trade/wireless_signal_send.pal    | 259 ++++++++++++
 46 files changed, 1086 insertions(+), 141 deletions(-)
 create mode 100644 graphics/trade/ball.png
 create mode 100644 graphics/trade/black.pal
 create mode 100644 graphics/trade/cable_closeup_map.bin
 create mode 100644 graphics/trade/cable_end.png
 create mode 100644 graphics/trade/gba.pal
 create mode 100644 graphics/trade/gba_affine.png
 create mode 100644 graphics/trade/gba_affine_map_cable.bin
 create mode 100644 graphics/trade/gba_affine_map_wireless.bin
 create mode 100644 graphics/trade/gba_map_cable.bin
 create mode 100644 graphics/trade/gba_map_wireless.bin
 create mode 100644 graphics/trade/gba_screen.png
 create mode 100644 graphics/trade/glow1.png
 create mode 100644 graphics/trade/glow2.png
 create mode 100644 graphics/trade/misc.pal
 create mode 100644 graphics/trade/pokeball_symbol.png
 create mode 100644 graphics/trade/pokeball_symbol_map.bin
 create mode 100644 graphics/trade/shadow.pal
 create mode 100644 graphics/trade/shadow_map.bin
 create mode 100644 graphics/trade/unknown_3308C0.pal
 create mode 100644 graphics/trade/unknown_3379A0.bin
 create mode 100644 graphics/trade/unknown_338EA4.pal
 create mode 100644 graphics/trade/wireless_signal.bin
 create mode 100644 graphics/trade/wireless_signal.png
 create mode 100644 graphics/trade/wireless_signal_receive.pal
 create mode 100644 graphics/trade/wireless_signal_send.pal

diff --git a/asm/macros/window.inc b/asm/macros/window.inc
index b7291138b..a91782bbf 100644
--- a/asm/macros/window.inc
+++ b/asm/macros/window.inc
@@ -8,7 +8,7 @@
 	.2byte \vram_tile_offset
 	.endm
 
-	.macro window_template_terminator
+	.macro null_window_template
 	window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
 	.endm
 
diff --git a/asm/trade.s b/asm/trade.s
index 50e6b71e2..cfc5307d3 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -2394,7 +2394,7 @@ _08078726:
 	mov r2, sp
 	bl GetMonData
 	mov r0, sp
-	ldr r1, =gUnknown_0832DF94
+	ldr r1, =gJPText_Shedinja
 	bl StringCompareWithoutExtCtrlCodes
 	cmp r0, 0
 	bne _08078766
@@ -2444,7 +2444,7 @@ _080787AC:
 	thumb_func_start sub_80787B8
 sub_80787B8: @ 80787B8
 	push {lr}
-	ldr r0, =gUnknown_0832DAE5
+	ldr r0, =gText_IsThisTradeOkay
 	ldr r1, =gUnknown_0203229C
 	ldr r1, [r1]
 	adds r1, 0x72
@@ -4769,7 +4769,7 @@ _08079AFE:
 	lsrs r4, r0, 16
 	cmp r4, 0x3
 	bls _08079ADE
-	ldr r1, =gUnknown_0832DABC
+	ldr r1, =gText_EmptyString7
 	adds r0, r6, 0
 	bl StringCopy
 	movs r4, 0
@@ -4789,7 +4789,7 @@ _08079B20:
 	bl StringAppend
 _08079B3C:
 	adds r0, r6, 0
-	ldr r1, =gUnknown_0832DAD2
+	ldr r1, =gText_NewLine3
 	bl StringAppend
 	adds r0, r4, 0x1
 	lsls r0, 16
@@ -4799,10 +4799,10 @@ _08079B3C:
 	b _08079B6C
 	.pool
 _08079B5C:
-	ldr r1, =gUnknown_0832DABC
+	ldr r1, =gText_EmptyString7
 	adds r0, r6, 0
 	bl StringCopy
-	ldr r1, =gUnknown_0832DADF
+	ldr r1, =gText_FourQuestionMarks
 	adds r0, r6, 0
 	bl StringAppend
 _08079B6C:
@@ -8571,7 +8571,7 @@ _0807BB68:
 	lsls r4, r0, 4
 	subs r4, r0
 	lsls r4, 2
-	ldr r0, =gUnknown_08338ED0
+	ldr r0, =gIngameTrades
 	adds r4, r0
 	ldr r0, =gStringVar1
 	adds r1, r4, 0
@@ -9098,7 +9098,7 @@ _0807C1DC:
 	beq _0807C1FC
 	bl _0807CFB4
 _0807C1FC:
-	ldr r0, =gUnknown_08338D28
+	ldr r0, =gSpriteTemplate_8338D28
 	movs r1, 0x78
 	movs r2, 0x20
 	movs r3, 0
@@ -9228,7 +9228,7 @@ _0807C318:
 	bl _0807CFB4
 _0807C328:
 	bl sub_807AB28
-	ldr r0, =gUnknown_08338E74
+	ldr r0, =gSpriteTemplate_8338E74
 	movs r1, 0x78
 	movs r2, 0x50
 	movs r3, 0
@@ -9296,7 +9296,7 @@ _0807C3B0:
 	beq _0807C3C4
 	bl _0807CFB4
 _0807C3C4:
-	ldr r0, =gUnknown_08338DFC
+	ldr r0, =gSpriteTemplate_8338DFC
 	movs r1, 0x80
 	movs r2, 0x41
 	movs r3, 0
@@ -9316,7 +9316,7 @@ _0807C3E0:
 	ldr r1, [r4]
 	adds r1, 0x90
 	strb r0, [r1]
-	ldr r0, =gUnknown_08338DC8
+	ldr r0, =gSpriteTemplate_8338DC8
 	movs r1, 0x80
 	movs r2, 0x50
 	movs r3, 0
@@ -9455,7 +9455,7 @@ _0807C528:
 	movs r2, 0x10
 	movs r3, 0
 	bl BeginNormalPaletteFade
-	ldr r5, =gUnknown_08338DC8
+	ldr r5, =gSpriteTemplate_8338DC8
 	adds r0, r5, 0
 	movs r1, 0x6F
 	movs r2, 0xAA
@@ -9604,7 +9604,7 @@ _0807C66C:
 	adds r1, r4, 0
 	adds r1, 0x10
 	adds r0, r1
-	ldr r1, =gUnknown_08338ECC
+	ldr r1, =gSpriteAffineAnimTable_8338ECC
 	str r1, [r0]
 	ldrb r1, [r2]
 	lsls r0, r1, 4
@@ -9915,7 +9915,7 @@ _0807C8FA:
 	ldr r1, [r7]
 	adds r1, 0x90
 	strb r0, [r1]
-	ldr r0, =gUnknown_08338DC8
+	ldr r0, =gSpriteTemplate_8338DC8
 	movs r1, 0x80
 	adds r2, r4, 0
 	movs r3, 0
@@ -10091,7 +10091,7 @@ _0807CA86:
 	bne _0807CA92
 	b _0807CFB4
 _0807CA92:
-	ldr r0, =gUnknown_08338DFC
+	ldr r0, =gSpriteTemplate_8338DFC
 	movs r1, 0x80
 	movs r2, 0x41
 	movs r3, 0
@@ -10113,7 +10113,7 @@ _0807CA92:
 	b _0807CFB4
 	.pool
 _0807CAC8:
-	ldr r0, =gUnknown_08338E74
+	ldr r0, =gSpriteTemplate_8338E74
 	movs r1, 0x78
 	movs r2, 0x50
 	movs r3, 0
@@ -10255,7 +10255,7 @@ _0807CBEC:
 	b _0807CF48
 	.pool
 _0807CBF4:
-	ldr r0, =gUnknown_08338D28
+	ldr r0, =gSpriteTemplate_8338D28
 	movs r2, 0x8
 	negs r2, r2
 	movs r1, 0x78
@@ -11160,7 +11160,7 @@ _0807D5B8:
 	beq _0807D5D8
 	bl _0807E400
 _0807D5D8:
-	ldr r0, =gUnknown_08338D28
+	ldr r0, =gSpriteTemplate_8338D28
 	movs r1, 0x78
 	movs r2, 0x20
 	movs r3, 0
@@ -11290,7 +11290,7 @@ _0807D6F4:
 _0807D704:
 	movs r0, 0x3
 	bl sub_807B62C
-	ldr r0, =gUnknown_08338E8C
+	ldr r0, =gSpriteTemplate_8338E8C
 	movs r1, 0x78
 	movs r2, 0x50
 	movs r3, 0
@@ -11386,7 +11386,7 @@ _0807D7C4:
 	adds r0, r1
 	ldr r1, =sub_807AA4C
 	str r1, [r0]
-	ldr r0, =gUnknown_08338DC8
+	ldr r0, =gSpriteTemplate_8338DC8
 	movs r1, 0x78
 	movs r2, 0x50
 	movs r3, 0
@@ -11524,7 +11524,7 @@ _0807D924:
 	movs r2, 0x10
 	movs r3, 0
 	bl BeginNormalPaletteFade
-	ldr r5, =gUnknown_08338DC8
+	ldr r5, =gSpriteTemplate_8338DC8
 	adds r0, r5, 0
 	movs r1, 0x6F
 	movs r2, 0xAA
@@ -11678,7 +11678,7 @@ _0807DA74:
 	adds r1, r4, 0
 	adds r1, 0x10
 	adds r0, r1
-	ldr r1, =gUnknown_08338ECC
+	ldr r1, =gSpriteAffineAnimTable_8338ECC
 	str r1, [r0]
 	ldrb r1, [r2]
 	lsls r0, r1, 4
@@ -12008,7 +12008,7 @@ _0807DD02:
 	adds r0, r1
 	ldr r1, =sub_807AA4C
 	str r1, [r0]
-	ldr r0, =gUnknown_08338DC8
+	ldr r0, =gSpriteTemplate_8338DC8
 	movs r1, 0x78
 	adds r2, r4, 0
 	movs r3, 0
@@ -12218,7 +12218,7 @@ _0807DF12:
 	strh r6, [r5]
 	b _0807E398
 _0807DF16:
-	ldr r0, =gUnknown_08338E74
+	ldr r0, =gSpriteTemplate_8338E74
 	movs r1, 0x78
 	movs r2, 0x50
 	movs r3, 0
@@ -12360,7 +12360,7 @@ _0807E038:
 	b _0807E394
 	.pool
 _0807E040:
-	ldr r0, =gUnknown_08338D28
+	ldr r0, =gSpriteTemplate_8338D28
 	movs r2, 0x8
 	negs r2, r2
 	movs r1, 0x78
@@ -13184,7 +13184,7 @@ sub_807E73C: @ 807E73C
 	lsls r4, r0, 4
 	subs r4, r0
 	lsls r4, 2
-	ldr r0, =gUnknown_08338ED0
+	ldr r0, =gIngameTrades
 	adds r4, r0
 	ldr r0, =gStringVar1
 	ldrh r1, [r4, 0x38]
@@ -13214,7 +13214,7 @@ sub_807E784: @ 807E784
 	lsls r4, r0, 4
 	subs r4, r0
 	lsls r4, 2
-	ldr r0, =gUnknown_08338ED0
+	ldr r0, =gIngameTrades
 	adds r4, r0
 	ldr r0, =gSpecialVar_0x8005
 	ldrh r1, [r0]
@@ -13253,7 +13253,7 @@ sub_807E7E8: @ 807E7E8
 	lsls r2, r1, 4
 	subs r2, r1
 	lsls r2, 2
-	ldr r1, =gUnknown_08338ED0
+	ldr r1, =gIngameTrades
 	adds r5, r2, r1
 	movs r1, 0x64
 	muls r0, r1
diff --git a/data/battle_frontier_1.s b/data/battle_frontier_1.s
index 177d8adfc..34e8df6d2 100644
--- a/data/battle_frontier_1.s
+++ b/data/battle_frontier_1.s
@@ -243,7 +243,7 @@ gUnknown_0860CE94:: @ 860CE94
 	window_template 0x00, 0x00, 0x03, 0x08, 0x10, 0x0f, 0x0010
 	window_template 0x00, 0x16, 0x03, 0x08, 0x10, 0x0f, 0x0090
 	window_template 0x00, 0x08, 0x01, 0x0e, 0x02, 0x0f, 0x0110
-	window_template_terminator
+	null_window_template
 
     .align 2
 gUnknown_0860CEB4:: @ 860CEB4
diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s
index bfb99f97d..c9bab5a64 100644
--- a/data/battle_frontier_2.s
+++ b/data/battle_frontier_2.s
@@ -108,7 +108,7 @@ gUnknown_08610434:: @ 8610434
 	window_template 0x00, 0x16, 0x0e, 0x08, 0x06, 0x0f, 0x006b
 	window_template 0x00, 0x16, 0x0e, 0x08, 0x04, 0x0f, 0x009b
 	window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00bb
-	window_template_terminator
+	null_window_template
 
 	.align 1
 gUnknown_0861046C:: @ 861046C
@@ -345,7 +345,7 @@ gUnknown_086108C8:: @ 86108C8
 	window_template 0x02, 0x0a, 0x02, 0x04, 0x02, 0x0e, 0x00c1
 	window_template 0x00, 0x13, 0x02, 0x0b, 0x02, 0x0f, 0x00c9
 	window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00df
-	window_template_terminator
+	null_window_template
 
 gUnknown_08610918:: @ 8610918
 	.byte 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x1f, 0x00
diff --git a/data/battle_records.s b/data/battle_records.s
index 22c487e4c..86dc9d8b9 100644
--- a/data/battle_records.s
+++ b/data/battle_records.s
@@ -23,7 +23,7 @@ gUnknown_085B3D64:: @ 85B3D64
 	.align 2
 gUnknown_085B3D6C:: @ 85B3D6C
 	window_template 0x00, 0x02, 0x01, 0x1a, 0x12, 0x0f, 0x0014
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gUnknown_085B3D7C:: @ 85B3D7C
diff --git a/data/berry_tag_screen.s b/data/berry_tag_screen.s
index 01a44bb14..13078e8e5 100644
--- a/data/berry_tag_screen.s
+++ b/data/berry_tag_screen.s
@@ -23,7 +23,7 @@ gUnknown_085EFD28:: @ 85EFD28
 	window_template 0x01, 0x0b, 0x07, 0x12, 0x04, 0x0f, 0x0055
 	window_template 0x01, 0x04, 0x0e, 0x19, 0x04, 0x0f, 0x009d
 	window_template 0x00, 0x02, 0x00, 0x08, 0x02, 0x0f, 0x0101
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gBerryFirmnessStringPointers:: @ 85EFD50
diff --git a/data/contest.s b/data/contest.s
index 4bb54bd00..4491d5fda 100644
--- a/data/contest.s
+++ b/data/contest.s
@@ -295,7 +295,7 @@ gUnknown_08587F44:: @ 8587F44
 	window_template 0x00, 0x01, 0x25, 0x09, 0x02, 0x0f, 0x02da
 	window_template 0x00, 0x10, 0x1f, 0x01, 0x02, 0x0f, 0x02ec
 	window_template 0x00, 0x0b, 0x23, 0x12, 0x04, 0x0f, 0x02ee
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gUnknown_08587FA4:: @ 8587FA4
diff --git a/data/contest_link_80F57C4.s b/data/contest_link_80F57C4.s
index 6bf51d174..a434eee28 100644
--- a/data/contest_link_80F57C4.s
+++ b/data/contest_link_80F57C4.s
@@ -68,7 +68,7 @@ gUnknown_0858D898:: @ 858D898
 	window_template 0x01, 0x07, 0x07, 0x0c, 0x02, 0x0f, 0x031a
 	window_template 0x01, 0x07, 0x0a, 0x0c, 0x02, 0x0f, 0x0332
 	window_template 0x01, 0x07, 0x0d, 0x0c, 0x02, 0x0f, 0x034a
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gUnknown_0858D8C0:: @ 858D8C0
diff --git a/data/credits.s b/data/credits.s
index cc75915a0..a5c0837d1 100644
--- a/data/credits.s
+++ b/data/credits.s
@@ -1493,7 +1493,7 @@ gUnknown_085E6F68:: @ 85E6F68 struct BgTemplate
 	.align 2
 gUnknown_085E6F6C:: @ 85E6F6C
 	window_template 0x00, 0x00, 0x09, 0x1e, 0x0c, 0x08, 0x0001
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gUnknown_085E6F7C:: @ 85E6F7C
diff --git a/data/data2b.s b/data/data2b.s
index 1400b31d3..6c24060a0 100644
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -4711,7 +4711,7 @@ gUnknown_0831AA18:: @ 831AA18
 	window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0
 	window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0
 	window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gUnknown_0831AAE0:: @ 831AAE0
@@ -4738,7 +4738,7 @@ gUnknown_0831AAE0:: @ 831AAE0
 	window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c
 	window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148
 	window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gUnknown_0831ABA0:: @ 831ABA0
diff --git a/data/easy_chat.s b/data/easy_chat.s
index edbb77f59..ce416dfbc 100644
--- a/data/easy_chat.s
+++ b/data/easy_chat.s
@@ -273,7 +273,7 @@ gUnknown_08597C64:: @ 8597C64
 	window_template 0x01, 0x06, 0x00, 0x12, 0x02, 0x0a, 0x0010
 	window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x000a
 	window_template 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gUnknown_08597C84:: @ 8597C84
diff --git a/data/link.s b/data/link.s
index f1f84c5b8..e458ad5de 100644
--- a/data/link.s
+++ b/data/link.s
@@ -60,7 +60,7 @@ gUnknown_082ED204:: @ 82ED204
 	window_template 0x00, 0x00, 0x00, 0x1E, 0x05, 0x0F, 0x0002
 	window_template 0x00, 0x00, 0x06, 0x1E, 0x07, 0x0F, 0x0098
 	window_template 0x00, 0x00, 0x0D, 0x1E, 0x07, 0x0F, 0x016A
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gUnknown_082ED224:: @ 82ED224
@@ -1887,7 +1887,7 @@ gUnknown_082F05A8:: @ 82F05A8
 	window_template 0x00, 0x00, 0x00, 0x1e, 0x02, 0x0c, 0x0013
 	window_template 0x00, 0x01, 0x0f, 0x1c, 0x04, 0x0c, 0x004f
 	window_template 0x00, 0x00, 0x0f, 0x1e, 0x05, 0x0d, 0x004f
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gUnknown_082F05C8:: @ 82F05C8
@@ -2071,7 +2071,7 @@ gUnknown_082F0D3C:: @ 82F0D3C
 	window_template 0x00, 0x03, 0x00, 0x18, 0x03, 0x0f, 0x0001
 	window_template 0x00, 0x03, 0x04, 0x15, 0x0f, 0x0f, 0x0049
 	window_template 0x00, 0x18, 0x04, 0x03, 0x0f, 0x0f, 0x0184
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gUnknown_082F0D5C:: @ 82F0D5C
@@ -2103,7 +2103,7 @@ gUnknown_082F0DD0:: @ 82F0DD0
 	.align 2
 gUnknown_082F0DD4:: @ 82F0DD4
 	window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0e, 0x0014
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gUnknown_082F0DE4:: @ 82F0DE4
@@ -2756,7 +2756,7 @@ gUnknown_082F2C70:: @ 82F2C70
 	window_template 0x01, 0x09, 0x12, 0x0f, 0x02, 0x0c, 0x007a
 	window_template 0x01, 0x00, 0x02, 0x06, 0x0f, 0x07, 0x0020
 	window_template 0x00, 0x01, 0x02, 0x07, 0x09, 0x0e, 0x0013
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gUnknown_082F2C98:: @ 82F2C98
@@ -3023,12 +3023,12 @@ gUnknown_082F32F4:: @ 82F32F4
 	window_template 0x00, 0x00, 0x06, 0x09, 0x02, 0x08, 0x03c9
 	window_template 0x00, 0x15, 0x03, 0x09, 0x02, 0x08, 0x03b7
 	window_template 0x00, 0x15, 0x06, 0x09, 0x02, 0x08, 0x03a5
-	window_template_terminator
+	null_window_template
 
 	window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001
 	window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001
 	window_template 0x00, 0x04, 0x02, 0x16, 0x10, 0x0f, 0x0001
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gUnknown_082F3344:: @ 82F3344
@@ -4422,7 +4422,7 @@ gUnknown_082FE164:: @ 82FE164 struct BgTemplate
 gUnknown_082FE174:: @ 82FE174
 	window_template 0x00, 0x13, 0x00, 0x06, 0x02, 0x02, 0x0013
 	window_template 0x00, 0x08, 0x00, 0x06, 0x02, 0x02, 0x001f
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gUnknown_082FE18C:: @ 82FE18C
diff --git a/data/main_menu.s b/data/main_menu.s
index fba0e7ddb..019fdfab8 100644
--- a/data/main_menu.s
+++ b/data/main_menu.s
@@ -42,7 +42,7 @@ gUnknown_082FF048:: @ 82FF048
 	.align 2
 gUnknown_082FF070:: @ 82FF070
 	window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x0f, 0x016d
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gUnknown_082FF080:: @ 82FF080
@@ -52,7 +52,7 @@ gUnknown_082FF080:: @ 82FF080
 gUnknown_082FF088:: @ 82FF088
 	window_template 0x00, 0x03, 0x05, 0x06, 0x04, 0x0f, 0x006d
 	window_template 0x00, 0x03, 0x02, 0x09, 0x0a, 0x0f, 0x0085
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gMainMenuBgPal:: @ 82FF0A0
diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s
index f123f4fe2..f05613b00 100644
--- a/data/pokemon_storage_system.s
+++ b/data/pokemon_storage_system.s
@@ -87,7 +87,7 @@ gUnknown_08572714:: @ 8572714
 	window_template 0x01, 0x00, 0x0b, 0x09, 0x07, 0x03, 0x00c0
 	window_template 0x00, 0x0b, 0x11, 0x12, 0x02, 0x0f, 0x0014
 	window_template 0x00, 0x00, 0x0d, 0x15, 0x07, 0x0f, 0x0014
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gUnknown_08572734:: @ 8572734
diff --git a/data/pokenav.s b/data/pokenav.s
index 3a8be11a3..03c0d4b8a 100644
--- a/data/pokenav.s
+++ b/data/pokenav.s
@@ -127,7 +127,7 @@ gUnknown_0861FA04:: @ 861FA04
 
 gUnknown_0861FA08:: @ 861FA08
 	window_template 0, 1, 0x16, 0x10, 0x2, 0x0, 0x36
-	window_template_terminator
+	null_window_template
 
 gUnknown_0861FA18:: @ 861FA18
 	.4byte gUnknown_085EBED5
diff --git a/data/reset_rtc_screen.s b/data/reset_rtc_screen.s
index 37c532497..6d3964da8 100644
--- a/data/reset_rtc_screen.s
+++ b/data/reset_rtc_screen.s
@@ -11,7 +11,7 @@ gUnknown_08510404:: @ 8510404 struct BgTemplate
 gUnknown_08510408:: @ 8510408
 	window_template 0x00, 0x01, 0x01, 0x13, 0x09, 0x0f, 0x0155
 	window_template 0x00, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x00e9
-	window_template_terminator
+	null_window_template
 
 	.align 2
 gUnknown_08510420:: @ 8510420
diff --git a/data/shop.s b/data/shop.s
index d19feff1e..58f294e6b 100644
--- a/data/shop.s
+++ b/data/shop.s
@@ -46,7 +46,7 @@ gUnknown_08589A70:: @ 8589A70
 	window_template 0, 1, 11, 12, 2, 15, 0x176
 	window_template 0, 18, 11, 10, 2, 15, 0x18E
 	window_template 0, 2, 15, 27, 4, 15, 0x1A2
-	window_template_terminator
+	null_window_template
 
 gUnknown_08589AA8:: @ 8589AA8
 	window_template 0, 21, 9, 5, 4, 15, 0x20E
diff --git a/data/slot_machine.s b/data/slot_machine.s
index b25d496d9..b704cdb7a 100644
--- a/data/slot_machine.s
+++ b/data/slot_machine.s
@@ -12,7 +12,7 @@ gUnknown_085A7424:: @ 85A7424
 
 gUnknown_085A7434:: @ 85A7434
 	window_template 0, 2, 15, 0x1B, 4, 15, 0x194
-	window_template_terminator
+	null_window_template
 
 gUnknown_085A7444:: @ 85A7444
 	window_template 0, 1, 3, 20, 13, 13, 1
diff --git a/data/strings.s b/data/strings.s
index 9ff36256d..30969e452 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -139,17 +139,14 @@ gUnknown_085E852C:: @ 85E852C
 	.string "CONTROLS$"
 
 	.align 2
-
 gUnknown_085E8538:: @ 85E8538
 	.string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}OK$"
 
 	.align 2
-
 gUnknown_085E8544:: @ 85E8544
 	.string "{UNK_CTRL_F800}NEXT$"
 
 	.align 2
-
 gUnknown_085E854C:: @ 85E854C
 	.string "{UNK_CTRL_F800}NEXT {UNK_CTRL_F801}BACK$"
 
@@ -1340,27 +1337,22 @@ gText_EggCantBeTradedNow:: @ 85EA234
 	.string "An EGG can’t be traded now.$"
 
 	.align 2
-
-gUnknown_085EA250:: @ 85EA250
+gText_OtherTrainersPkmnCantBeTraded:: @ 85EA250
 	.string "The other TRAINER’s POKéMON\ncan’t be traded now.$"
 
 	.align 2
-
 gUnknown_085EA284:: @ 85EA284
 	.string "The other TRAINER can’t accept\nthat POKéMON now.$"
 
 	.align 2
-
 gUnknown_085EA2B8:: @ 85EA2B8
 	.string "You can’t trade with that\nTRAINER now.$"
 
 	.align 2
-
 gUnknown_085EA2E0:: @ 85EA2E0
 	.string "That isn’t the type of POKéMON\nthat the other TRAINER wants.$"
 
 	.align 2
-
 gUnknown_085EA320:: @ 85EA320
 	.string "That isn’t an EGG.$"
 
@@ -3585,27 +3577,22 @@ gText_BattlePyramid:: @ 85ED153
 	.string "BATTLE PYRAMID$"
 
 	.align 2
-
 gUnknown_085ED164:: @ 85ED164
 	.string "{STR_VAR_1} SINGLE$"
 
 	.align 2
-
 gUnknown_085ED170:: @ 85ED170
 	.string "{STR_VAR_1} DOUBLE$"
 
 	.align 2
-
 gUnknown_085ED17C:: @ 85ED17C
 	.string "{STR_VAR_1} MULTI$"
 
 	.align 2
-
 gUnknown_085ED188:: @ 85ED188
 	.string "{STR_VAR_1} LINK$"
 
 	.align 2
-
 gUnknown_085ED190:: @ 85ED190
 	.string "{STR_VAR_1}$"
 
@@ -4319,37 +4306,30 @@ gText_FloorsCleared:: @ 85EE39C
 	.string "Floors cleared: {STR_VAR_1}$"
 
 	.align 2
-
 gUnknown_085EE3B0:: @ 85EE3B0
 	.string "LV. 50$"
 
 	.align 2
-
 gUnknown_085EE3B8:: @ 85EE3B8
 	.string "OPEN LEVEL$"
 
 	.align 2
-
 gUnknown_085EE3C4:: @ 85EE3C4
 	.string "Win streak: {STR_VAR_2}$"
 
 	.align 2
-
 gUnknown_085EE3D4:: @ 85EE3D4
 	.string "Clear streak: {STR_VAR_2}$"
 
 	.align 2
-
 gUnknown_085EE3E8:: @ 85EE3E8
 	.string "Rooms cleared: {STR_VAR_2}$"
 
 	.align 2
-
 gUnknown_085EE3FC:: @ 85EE3FC
 	.string "KOs in a row: {STR_VAR_2}$"
 
 	.align 2
-
 gUnknown_085EE410:: @ 85EE410
 	.string "Floors cleared: {STR_VAR_2}$"
 
@@ -4931,7 +4911,6 @@ gText_WhereShouldNewsBeAccessed:: @ 85EEF94
 	.string "Where should the WONDER NEWS\nbe accessed?$"
 
 	.align 2
-
 gUnknown_085EEFC0:: @ 85EEFC0
 	.string "Communication standby…\nB Button: Cancel$"
 
diff --git a/data/trade.s b/data/trade.s
index 2674f3b65..4958d5717 100644
--- a/data/trade.s
+++ b/data/trade.s
@@ -1,3 +1,5 @@
+#include "constants/species.h"
+#include "constants/items.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
@@ -23,9 +25,10 @@ gTradeStripesBG2Tilemap:: @ 832CABC
 gTradeStripesBG3Tilemap:: @ 832D2BC
 	.incbin "graphics/trade/stripes_bg3_map.bin"
 
-gUnknown_0832DABC:: @ 832DABC
+gText_EmptyString7:: @ 832DABC
 	.string "$"
 
+gText_ClrWhtHltTrspntShdwDrkGry:: @ 832DABD
 	.string "{COLOR WHITE}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}$"
 
 gText_MaleSymbol4:: @ 832DAC7
@@ -37,49 +40,67 @@ gText_FemaleSymbol4:: @ 832DAC9
 gText_GenderlessSymbol:: @ 832DACB
 	.string "$"
 
+gText_SpaceMove:: @ 832DACC
 	.string " MOVE$"
 
-gUnknown_0832DAD2:: @ 832DAD2
+gText_NewLine3:: @ 832DAD2
 	.string "\n$"
 
+gText_Slash2:: @ 832DAD4
 	.string "/$"
 
+gText_Lv2:: @ 832DAD6
 	.string "Lv. $"
 
+gText_ThreeDashes2:: @ 832DADB
 	.string "---$"
 
-gUnknown_0832DADF:: @ 832DADF
+gText_FourQuestionMarks:: @ 832DADF
 	.string "????$"
 
+gText_832DAE4:: @ 832DAE4
 	.string "$"
 
-gUnknown_0832DAE5:: @ 832DAE5
+gText_IsThisTradeOkay:: @ 832DAE5
 	.string "Is this trade okay?$"
 
+gText_Cancel6:: @ 832DAF9
 	.string "CANCEL$"
 
+gText_ChooseAPkmn:: @ 832DB00
 	.string "Choose a POKéMON.$"
 
+gText_Summary3:: @ 832DB12
 	.string "SUMMARY$"
 
+gText_Trade2:: @ 832DB1A
 	.string "TRADE$"
 
+gText_CancelTrade:: @ 832DB20
 	.string "Cancel trade?$"
 
+gJPText_832DB2E:: @ 832DB2E
 	.string "Bボタン　で　もどります$"
 
+gText_Summary4:: @ 832DB3B
 	.string "SUMMARY$"
 
+gText_Trade3:: @ 832DB43
 	.string "TRADE$"
 
+gText_CommunicationStandby6:: @ 832DB49
 	.string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Communication standby…\nPlease wait.$"
 
+gText_TheTradeHasBeenCanceled:: @ 832DB76
 	.string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}The trade has\nbeen canceled.$"
 
+gText_YourOnlyPkmnForBattle:: @ 832DB9C
 	.string "That’s your only\nPOKéMON for battle.$"
 
+gText_WaitingForYourFriend:: @ 832DBC1
 	.string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Waiting for your friend\nto finish…$"
 
+gText_YourFriendWantsToTrade:: @ 832DBED
 	.string "Your friend wants\nto trade POKéMON.$"
 
 	.align 2
@@ -150,159 +171,476 @@ gSpriteTemplate_832DC94:: @ 832DC94
 
 	.align 2
 gSpriteTemplate_832DCAC:: @ 832DCAC
-	.incbin "baserom.gba", 0x32dcac, 0x18
+	spr_template 0x00c8, 0x133d, gOamData_832DC14, gSpriteAnimTable_832DC7C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 	.align 2
 TradeScreenTextPalette:: @ 832DCC4
 	.incbin "graphics/trade/text.gbapal"
 
+	.align 2
 gSpritePalette_TradeScreenText:: @ 832DCE4
-	.incbin "baserom.gba", 0x32dce4, 0x8
+	obj_pal TradeScreenTextPalette, 0x133d
 
 gUnknown_0832DCEC:: @ 832DCEC
-	.incbin "baserom.gba", 0x32dcec, 0x138
+	.byte 0x04, 0x02, 0x0c, 0x0c, 0x00, 0x00, 0x02, 0x04, 0x0c, 0x0c, 0x00, 0x00, 0x07, 0x06, 0x01, 0x00, 0x00, 0x00, 0x01, 0x06, 0x07, 0x00, 0x00, 0x00, 0x05, 0x03, 0x0c, 0x0c, 0x00, 0x00, 0x03, 0x05
+	.byte 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x07, 0x06, 0x01, 0x00, 0x00, 0x06, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x08, 0x07, 0x06
+	.byte 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x05, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x09, 0x08, 0x07, 0x00, 0x00, 0x08, 0x09, 0x06, 0x06, 0x00, 0x00
+	.byte 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05, 0x03, 0x01, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x01, 0x01
+	.byte 0x01, 0x01, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x0a, 0x08, 0x06, 0x00, 0x00, 0x00, 0x0a, 0x08, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x0a, 0x0c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+	.byte 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x09, 0x07, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x0c
+	.byte 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x04, 0x03, 0x02
+	.byte 0x01, 0x00, 0x0b, 0x09, 0x07, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00
+	.byte 0x0b, 0x09, 0x07, 0x06, 0x00, 0x00, 0x07, 0x06, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00
 
 gUnknown_0832DE24:: @ 832DE24
-	.incbin "baserom.gba", 0x32de24, 0x1a
+	.byte 0x01, 0x05, 0x08, 0x05, 0x01, 0x0a, 0x08, 0x0a, 0x01, 0x0f, 0x08, 0x0f, 0x10, 0x05, 0x17, 0x05, 0x10, 0x0a, 0x17, 0x0a, 0x10, 0x0f, 0x17, 0x0f, 0x17, 0x12
 
 gUnknown_0832DE3E:: @ 832DE3E
-	.incbin "baserom.gba", 0x32de3e, 0x18
+	.byte 0x05, 0x04, 0x0c, 0x04, 0x05, 0x09, 0x0c, 0x09, 0x05, 0x0e, 0x0c, 0x0e, 0x14, 0x04, 0x1b, 0x04, 0x14, 0x09, 0x1b, 0x09, 0x14, 0x0e, 0x1b, 0x0e
 
 gUnknown_0832DE56:: @ 832DE56
-	.incbin "baserom.gba", 0x32de56, 0x3e
+	.byte 0x01, 0x03, 0x08, 0x03, 0x01, 0x08, 0x08, 0x08, 0x01, 0x0d, 0x08, 0x0d, 0x10, 0x03, 0x17, 0x03, 0x10, 0x08, 0x17, 0x08, 0x10, 0x0d, 0x17, 0x0d, 0x00, 0x0e, 0x0f, 0x1d, 0x03, 0x05, 0x03, 0x07
+	.byte 0x12, 0x05, 0x12, 0x07, 0x08, 0x07, 0x16, 0x0c, 0x08, 0x07, 0x16, 0x0c, 0x06, 0x07, 0x18, 0x0c, 0x06, 0x07, 0x18, 0x0c, 0x08, 0x07, 0x16, 0x0c, 0x07, 0x07, 0x17, 0x0c, 0x00, 0x00
 
 	.align 2
 gUnknown_0832DE94:: @ 832DE94
-	.incbin "baserom.gba", 0x32de94, 0x18
+	.4byte gText_Cancel6
+	.4byte gText_ChooseAPkmn
+	.4byte gText_Summary3
+	.4byte gText_Trade2
+	.4byte gText_CancelTrade
+	.4byte gJPText_832DB2E
 
+	.align 2
 gUnknown_0832DEAC:: @ 832DEAC
-	.incbin "baserom.gba", 0x32deac, 0x10
+	.4byte gText_Summary4, sub_807A000
+	.4byte gText_Trade3, sub_807A024
 
+	.align 2
 gUnknown_0832DEBC:: @ 832DEBC
-	.incbin "baserom.gba", 0x32debc, 0x24
+	.4byte gText_CommunicationStandby6
+	.4byte gText_TheTradeHasBeenCanceled
+	.4byte gText_YourOnlyPkmnForBattle
+	.4byte gText_OnlyPkmnForBattle
+	.4byte gText_WaitingForYourFriend
+	.4byte gText_YourFriendWantsToTrade
+	.4byte gText_PkmnCantBeTradedNow
+	.4byte gText_EggCantBeTradedNow
+	.4byte gText_OtherTrainersPkmnCantBeTraded
 
 gUnknown_0832DEE0:: @ 832DEE0
-	.incbin "baserom.gba", 0x32dee0, 0x4
+	.byte 0x00, 0x01, 0x02, 0x00
 
+	.align 2
 gUnknown_0832DEE4:: @ 832DEE4
-	.incbin "baserom.gba", 0x32dee4, 0x10
+	.4byte 0x000001f8, 0x00001051, 0x00002062, 0x00003073
 
+	.align 2
 gUnknown_0832DEF4:: @ 832DEF4
-	.incbin "baserom.gba", 0x32def4, 0x98
+	window_template 0x00, 0x04, 0x07, 0x16, 0x04, 0x0f, 0x001e
+	window_template 0x00, 0x13, 0x0f, 0x0a, 0x04, 0x0f, 0x0076
+	window_template 0x00, 0x00, 0x05, 0x08, 0x02, 0x0d, 0x009e
+	window_template 0x00, 0x07, 0x05, 0x08, 0x02, 0x0d, 0x00ae
+	window_template 0x00, 0x00, 0x0a, 0x08, 0x02, 0x0d, 0x00be
+	window_template 0x00, 0x07, 0x0a, 0x08, 0x02, 0x0d, 0x00ce
+	window_template 0x00, 0x00, 0x0f, 0x08, 0x02, 0x0d, 0x00de
+	window_template 0x00, 0x07, 0x0f, 0x08, 0x02, 0x0d, 0x00ee
+	window_template 0x00, 0x0f, 0x05, 0x08, 0x02, 0x0d, 0x00fe
+	window_template 0x00, 0x16, 0x05, 0x08, 0x02, 0x0d, 0x010e
+	window_template 0x00, 0x0f, 0x0a, 0x08, 0x02, 0x0d, 0x011e
+	window_template 0x00, 0x16, 0x0a, 0x08, 0x02, 0x0d, 0x012e
+	window_template 0x00, 0x0f, 0x0f, 0x08, 0x02, 0x0d, 0x013e
+	window_template 0x00, 0x16, 0x0f, 0x08, 0x02, 0x0d, 0x014e
+	window_template 0x00, 0x02, 0x05, 0x0e, 0x02, 0x0d, 0x015e
+	window_template 0x00, 0x03, 0x08, 0x0b, 0x08, 0x0f, 0x017a
+	window_template 0x00, 0x11, 0x05, 0x0e, 0x02, 0x0f, 0x01d2
+	window_template 0x00, 0x12, 0x08, 0x0b, 0x08, 0x0f, 0x01ee
+	null_window_template
 
+	.align 2
 gUnknown_0832DF8C:: @ 832DF8C
-	.incbin "baserom.gba", 0x32df8c, 0x8
+	window_template 0x00, 0x17, 0x0d, 0x05, 0x04, 0x0f, 0x0246
 
-gUnknown_0832DF94:: @ 832DF94
-	.incbin "baserom.gba", 0x32df94, 0x5
+gJPText_Shedinja:: @ 832DF94
+	.string "ヌケニン$"
 
 gUnknown_0832DF99:: @ 832DF99
-	.incbin "baserom.gba", 0x32df99, 0x2027
+	.incbin "baserom.gba", 0x32df99, 0x7
 
+	.align 2
+gTradeBallPalette:: @ 832DFA0
+	.incbin "graphics/trade/ball.gbapal"
+
+	.align 2
+gTradeBallTiles:: @ 832DFC0
+	.incbin "graphics/trade/ball.4bpp"
+
+	.align 2
+gUnknown_832E5C0:: @ 832E5C0
+	.incbin "graphics/trade/pokeball_symbol.8bpp"
+
+	.align 2
 gUnknown_0832FFC0:: @ 832FFC0
-	.incbin "baserom.gba", 0x32ffc0, 0x1fa0
+	.incbin "graphics/trade/cable_closeup_map.bin"
 
+	.align 2
+gUnknown_083307C0:: @ 83307C0
+	.incbin "graphics/trade/pokeball_symbol_map.bin"
+
+	.align 2
+gUnknown_083308C0:: @ 83308C0
+	.incbin "graphics/trade/unknown_3308C0.gbapal"
+
+	.align 2
+gUnknown_083308E0:: @ 83308E0
+	.incbin "graphics/trade/gba.gbapal"
+	.incbin "graphics/trade/shadow.gbapal"
+	.incbin "graphics/trade/black.gbapal"
+
+	.align 2
+gUnknown_08330940:: @ 8330940
+	.incbin "graphics/trade/misc.gbapal"
+
+	.align 2
+gTradeGlow1Tiles:: @ 8330960
+	.incbin "graphics/trade/glow1.4bpp"
+
+	.align 2
+gTradeGlow2Tiles:: @ 8330B60
+	.incbin "graphics/trade/glow2.4bpp"
+
+	.align 2
+gTradeCableEndTiles:: @ 8330D60
+	.incbin "graphics/trade/cable_end.4bpp"
+
+	.align 2
+gTradeGBAScreenTiles:: @ 8330F60
+	.incbin "graphics/trade/gba_screen.4bpp"
+
+	.align 2
 gUnknown_08331F60:: @ 8331F60
-	.incbin "baserom.gba", 0x331f60, 0x1000
+	.incbin "graphics/trade/shadow_map.bin"
 
+	.align 2
 gUnknown_08332F60:: @ 8332F60
-	.incbin "baserom.gba", 0x332f60, 0x2840
+	.incbin "graphics/trade/gba_affine.8bpp"
 
+	.space 0x40
+
+	.align 2
 gUnknown_083357A0:: @ 83357A0
-	.incbin "baserom.gba", 0x3357a0, 0x100
+	.incbin "graphics/trade/gba_affine_map_cable.bin"
 
+	.align 2
 gUnknown_083358A0:: @ 83358A0
-	.incbin "baserom.gba", 0x3358a0, 0x100
+	.incbin "graphics/trade/gba_affine_map_wireless.bin"
 
+	.align 2
 gUnknown_083359A0:: @ 83359A0
-	.incbin "baserom.gba", 0x3359a0, 0x1000
+	.incbin "graphics/trade/gba_map_wireless.bin"
 
+	.align 2
 gUnknown_083369A0:: @ 83369A0
-	.incbin "baserom.gba", 0x3369a0, 0x1000
+	.incbin "graphics/trade/gba_map_cable.bin"
 
+	.align 2
 gUnknown_083379A0:: @ 83379A0
-	.incbin "baserom.gba", 0x3379a0, 0x100
+	.incbin "graphics/trade/unknown_3379A0.bin.lz"
 
+	.align 2
 gUnknown_08337AA0:: @ 8337AA0
-	.incbin "baserom.gba", 0x337aa0, 0x200
+	.incbin "graphics/trade/wireless_signal_send.gbapal"
 
+	.align 2
 gUnknown_08337CA0:: @ 8337CA0
-	.incbin "baserom.gba", 0x337ca0, 0x200
+	.incbin "graphics/trade/wireless_signal_receive.gbapal"
 
+	.align 2
 gUnknown_08337EA0:: @ 8337EA0
-	.incbin "baserom.gba", 0x337ea0, 0x20
+	.incbin "graphics/trade/black.gbapal"
 
+	.align 2
 gUnknown_08337EC0:: @ 8337EC0
-	.incbin "baserom.gba", 0x337ec0, 0x690
+	.incbin "graphics/trade/wireless_signal.4bpp.lz"
 
+	.align 2
 gUnknown_08338550:: @ 8338550
-	.incbin "baserom.gba", 0x338550, 0x7c8
+	.incbin "graphics/trade/wireless_signal.bin.lz"
 
+	.align 2
+gOamData_8338C44:: @ 8338C44
+	.2byte 0x0100, 0x4000, 0x0000, 0x0000
+
+	.align 2
+gSpriteAnim_8338C4C:: @ 8338C4C
+	.2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0x0010, 0x0003, 0x0014, 0x0003, 0x0018, 0x0003, 0x001c, 0x0003
+	.2byte 0x0020, 0x0003, 0x0024, 0x0003, 0x0028, 0x0003, 0x002c, 0x0003, 0xfffd, 0x0001, 0x0000, 0x0003, 0xffff, 0x0000
+
+	.align 2
+gSpriteAnim_8338C88:: @ 8338C88
+	.2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0x0010, 0x0003, 0x0014, 0x0003, 0x0018, 0x0003, 0x001c, 0x0003
+	.2byte 0x0020, 0x0003, 0x0024, 0x0003, 0x0028, 0x0003, 0x002c, 0x0003, 0xfffd, 0x0002, 0x0000, 0x0003, 0xffff, 0x0000
+
+	.align 2
+gSpriteAnimTable_8338C88:: @ 8338CC4
+	.4byte gSpriteAnim_8338C4C
+	.4byte gSpriteAnim_8338C88
+
+	.align 2
+gSpriteAffineAnim_8338CCC:: @ 8338CCC
+	.2byte 0x0000, 0x0000, 0x0100, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
+
+	.align 2
+gSpriteAffineAnim_8338CDC:: @ 8338CDC
+	.2byte 0xfff8, 0x0000, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
+
+	.align 2
+gSpriteAffineAnim_8338CEC:: @ 8338CEC
+	.2byte 0x0060, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0500, 0x0000, 0x0008, 0x0000, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
+
+	.align 2
+gSpriteAffineAnimTable_8338D0C:: @ 8338D0C
+	.4byte gSpriteAffineAnim_8338CCC
+	.4byte gSpriteAffineAnim_8338CDC
+	.4byte gSpriteAffineAnim_8338CEC
+
+	.align 2
 gUnknown_08338D18:: @ 8338D18
-	.incbin "baserom.gba", 0x338d18, 0x8
+	obj_tiles gTradeBallTiles, 0x0600, 0x15b5
 
+	.align 2
 gUnknown_08338D20:: @ 8338D20
-	.incbin "baserom.gba", 0x338d20, 0x8
+	obj_pal gTradeBallPalette, 0x15b6
 
-gUnknown_08338D28:: @ 8338D28
-	.incbin "baserom.gba", 0x338d28, 0x48
+	.align 2
+gSpriteTemplate_8338D28:: @ 8338D28
+	spr_template 0x15b5, 0x15b6, gOamData_8338C44, gSpriteAnimTable_8338C88, NULL, gSpriteAffineAnimTable_8338D0C, sub_807E55C
 
+	.align 2
+gOamData_8338D40:: @ 8338D40
+	.2byte 0x0500, 0x8000, 0x0400, 0x0000
+
+	.align 2
+gSpriteAnim_8338D48:: @ 8338D48
+	.2byte 0x0000, 0x00c5, 0xffff, 0x0000
+
+	.align 2
+gSpriteAnimTable_8338D50:: @ 8338D50
+	.4byte gSpriteAnim_8338D48
+
+	.align 2
+gSpriteAffineAnim_8338D54:: @ 8338D54
+	.2byte 0xfff6, 0xfff6, 0x0500, 0x0000, 0x000a, 0x000a, 0x0500, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
+
+	.align 2
+gSpriteAffineAnimTable_8338D6C:: @ 8338D6C
+	.4byte gSpriteAffineAnim_8338D54
+
+	.align 2
 gUnknown_08338D70:: @ 8338D70
-	.incbin "baserom.gba", 0x338d70, 0x8
+	obj_tiles gTradeGlow1Tiles, 0x0200, 0x15ae
 
+	.align 2
 gUnknown_08338D78:: @ 8338D78
-	.incbin "baserom.gba", 0x338d78, 0x8
+	obj_pal gUnknown_08330940, 0x15af
 
+	.align 2
 gUnknown_08338D80:: @ 8338D80
-	.incbin "baserom.gba", 0x338d80, 0x8
+	obj_pal gUnknown_083308E0, 0x15b3
 
+	.align 2
 gUnknown_08338D88:: @ 8338D88
-	.incbin "baserom.gba", 0x338d88, 0x38
+	spr_template 0x15ae, 0x15af, gOamData_8338D40, gSpriteAnimTable_8338D50, NULL, gSpriteAffineAnimTable_8338D6C, sub_807AA28
 
+	.align 2
+gOamData_8338DA0:: @ 8338DA0
+	.2byte 0x8000, 0x8000, 0x0400, 0x0000
+
+	.align 2
+gSpriteAnim_8338DA8:: @ 8338DA8
+	.2byte 0x0000, 0x00c5, 0xffff, 0x0000
+
+	.align 2
+gSpriteAnim_8338DB0:: @ 8338DB0
+	.2byte 0x0008, 0x00c5, 0xffff, 0x0000
+
+	.align 2
+gSpriteAnimTable_8338DB8:: @ 8338DB8
+	.4byte gSpriteAnim_8338DA8
+	.4byte gSpriteAnim_8338DB0
+
+	.align 2
 gUnknown_08338DC0:: @ 8338DC0
-	.incbin "baserom.gba", 0x338dc0, 0x8
+	obj_tiles gTradeGlow2Tiles, 0x0300, 0x15b0
 
-gUnknown_08338DC8:: @ 8338DC8
-	.incbin "baserom.gba", 0x338dc8, 0x2c
+	.align 2
+gSpriteTemplate_8338DC8:: @ 8338DC8
+	spr_template 0x15b0, 0x15af, gOamData_8338DA0, gSpriteAnimTable_8338DB8, NULL, gDummySpriteAffineAnimTable, sub_807AA7C
 
+	.align 2
+gOamData_8338DE0:: @ 8338DE0
+	.2byte 0x8000, 0x8000, 0x0400, 0x0000
+
+	.align 2
+gSpriteAnim_8338DE8:: @ 8338DE8
+	.2byte 0x0000, 0x000a, 0xffff, 0x0000
+
+	.align 2
+gSpriteAnimTable_8338DF0:: @ 8338DF0
+	.4byte gSpriteAnim_8338DE8
+
+	.align 2
 gUnknown_08338DF4:: @ 8338DF4
-	.incbin "baserom.gba", 0x338df4, 0x8
+	obj_tiles gTradeCableEndTiles, 0x0100, 0x15b2
 
-gUnknown_08338DFC:: @ 8338DFC
-	.incbin "baserom.gba", 0x338dfc, 0x70
+	.align 2
+gSpriteTemplate_8338DFC:: @ 8338DFC
+	spr_template 0x15b2, 0x15b3, gOamData_8338DE0, gSpriteAnimTable_8338DF0, NULL, gDummySpriteAffineAnimTable, sub_807AABC
+
+	.align 2
+gOamData_8338E14:: @ 8338E14
+	.2byte 0x4000, 0xc000, 0x0400, 0x0000
+
+	.align 2
+gSpriteAnim_8338E1C:: @ 8338E1C
+	.2byte 0x0000, 0x00c2, 0x0020, 0x00c2, 0x0040, 0x00c2, 0x0060, 0x00c2, 0x0040, 0x00c2, 0x0020, 0x00c2, 0x0000, 0x00c2, 0xfffd, 0x0008
+	.2byte 0xffff, 0x0000
+
+	.align 2
+gSpriteAnim_8338E40:: @ 8338E40
+	.2byte 0x0000, 0x00c2, 0x0020, 0x00c2, 0x0040, 0x00c2, 0x0060, 0x00c2, 0x0040, 0x00c2, 0x0020, 0x00c2, 0x0000, 0x00c2, 0xfffd, 0x0002
+	.2byte 0xffff, 0x0000
+
+	.align 2
+gSpriteAnimTable_8338E64:: @ 8338E64
+	.4byte gSpriteAnim_8338E1C
+
+	.align 2
+gSpriteAnimTable_8338E68:: @ 8338E68
+	.4byte gSpriteAnim_8338E40
 
 gUnknown_08338E6C:: @ 8338E6C
-	.incbin "baserom.gba", 0x338e6c, 0x8
+	obj_tiles gTradeGBAScreenTiles, 0x1000, 0x15b4
 
-gUnknown_08338E74:: @ 8338E74
-	.incbin "baserom.gba", 0x338e74, 0x18
+	.align 2
+gSpriteTemplate_8338E74:: @ 8338E74
+	spr_template 0x15b4, 0x15b3, gOamData_8338E14, gSpriteAnimTable_8338E64, NULL, gDummySpriteAffineAnimTable, sub_807AB04
 
-gUnknown_08338E8C:: @ 8338E8C
-	.incbin "baserom.gba", 0x338e8c, 0x18
+	.align 2
+gSpriteTemplate_8338E8C:: @ 8338E8C
+	spr_template 0x15b4, 0x15b3, gOamData_8338E14, gSpriteAnimTable_8338E68, NULL, gDummySpriteAffineAnimTable, sub_807AB04
 
+	.align 1
 gUnknown_08338EA4:: @ 8338EA4
-	.incbin "baserom.gba", 0x338ea4, 0x28
+	.incbin "graphics/trade/unknown_338EA4.gbapal"
 
-gUnknown_08338ECC:: @ 8338ECC
-	.incbin "baserom.gba", 0x338ecc, 0x4
+	.align 2
+gSpriteAffineAnim_8338EBC:: @ 8338EBC
+	.2byte 0xff00, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
 
-gUnknown_08338ED0:: @ 8338ED0
-	.incbin "baserom.gba", 0x338ed0, 0xf0
+	.align 2
+gSpriteAffineAnimTable_8338ECC:: @ 8338ECC
+	.4byte gSpriteAffineAnim_8338EBC
 
+	.align 2
+gIngameTrades:: @ 8338ED0
+	.string "DOTS$", 11
+	.align 1
+	.2byte SPECIES_SEEDOT
+	.byte 5, 4, 5, 4, 4, 4
+	.byte 1
+	.align 2
+	.4byte 0x9746
+	.byte 30, 5, 5, 5, 5
+	.align 2
+	.4byte 0x84
+	.2byte ITEM_CHESTO_BERRY
+	.byte -1
+	.string "KOBE$", 11
+	.byte 0
+	.byte 10
+	.2byte SPECIES_RALTS
+
+	.align 2
+	.string "PLUSES$", 11
+	.align 1
+	.2byte SPECIES_PLUSLE
+	.byte 4, 4, 4, 5, 5, 4
+	.byte 0
+	.align 2
+	.4byte 0x1210c
+	.byte 5, 5, 30, 5, 5
+	.align 2
+	.4byte 0x6f
+	.2byte ITEM_WOOD_MAIL
+	.byte 0
+	.string "ROMAN$", 11
+	.byte 0
+	.byte 10
+	.2byte SPECIES_VOLBEAT
+
+	.align 2
+	.string "SEASOR$", 11
+	.align 1
+	.2byte SPECIES_HORSEA
+	.byte 5, 4, 4, 4, 5, 4
+	.byte 0
+	.align 2
+	.4byte 0xb4cd
+	.byte 5, 5, 5, 5, 30
+	.align 2
+	.4byte 0x7f
+	.2byte ITEM_WAVE_MAIL
+	.byte 1
+	.string "SKYLAR$", 11
+	.byte 0
+	.byte 10
+	.2byte SPECIES_BAGON
+
+	.align 2
+	.string "MEOWOW$", 11
+	.align 1
+	.2byte SPECIES_MEOWTH
+	.byte 4, 5, 4, 5, 4, 4
+	.byte 0
+	.align 2
+	.4byte 0x16559
+	.byte 5, 5, 5, 30, 5
+	.align 2
+	.4byte 0x8b
+	.2byte ITEM_RETRO_MAIL
+	.byte 2
+	.string "ISIS$", 11
+	.byte 1
+	.byte 10
+	.2byte SPECIES_SKITTY
+
+	.align 2
 gUnknown_08338FC0:: @ 8338FC0
-	.incbin "baserom.gba", 0x338fc0, 0x3c
+	.2byte 0x1006, 0x1232, 0x102f, 0x0161, 0x0c00, 0x0182, 0x1000, 0x1006, 0x0e3b, 0x0000, 0x0a01, 0x1000, 0x161e, 0x018b, 0x0433, 0x1611
+	.2byte 0x180f, 0x0074, 0x1440, 0x0000, 0x0811, 0x102b, 0x013b, 0x2a34, 0x0c16, 0x1037, 0x1020, 0x0418, 0x0c23, 0x0000
 
+	.align 2
 gUnknown_08338FFC:: @ 8338FFC
-	.incbin "baserom.gba", 0x338ffc, 0x10
+	window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0040
+	null_window_template
 
+	.align 2
 gUnknown_0833900C:: @ 833900C
-	.incbin "baserom.gba", 0x33900c, 0x8
+	window_template 0x00, 0x15, 0x09, 0x05, 0x04, 0x0f, 0x00bc
 
+	.align 2
 gUnknown_08339014:: @ 8339014
-	.incbin "baserom.gba", 0x339014, 0x10
+	.4byte 0x000001fc, 0x00002051, 0x00002326, 0x00003063
 
 gUnknown_08339024:: @ 8339024
-	.incbin "baserom.gba", 0x339024, 0x6c
+	.byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0xfc, 0xfc, 0xfc, 0xfd, 0xfd, 0xfd, 0xfd, 0xfe, 0xfe, 0xfe
+	.byte 0xfe, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04
+	.byte 0x04, 0x04, 0xfc, 0xfd, 0xfd, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0xfc, 0xfd, 0xfe, 0xff
+	.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x02, 0x03
 
 gUnknown_08339090:: @ 8339090
-	.incbin "baserom.gba", 0x339090, 0x44
+	.byte 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x01, 0x04, 0x01, 0x05, 0x02, 0x06, 0x02, 0x07, 0x02, 0x08, 0x02, 0x09, 0x02, 0x0a, 0x03, 0x0b, 0x03, 0x0c, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x0f, 0x02
+	.byte 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x01, 0x04, 0x01, 0x05, 0x02, 0x06, 0x02, 0x07, 0x02, 0x08, 0x02, 0x09, 0x02, 0x0a, 0x03, 0x0b, 0x03, 0x0c, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x10, 0x01
+	.byte 0x10, 0xff, 0x00, 0x00
diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s
index ffb7802d9..0e99cf223 100644
--- a/data/use_pokeblock.s
+++ b/data/use_pokeblock.s
@@ -34,7 +34,7 @@ gUnknown_085DFCDC:: @ 85DFCDC
 	window_template 0, 0xD, 1, 0xD, 4, 0xF, 1
 	window_template 0, 0, 0xE, 0xB, 2, 0xF, 0x35
 	window_template 0, 1, 0x11, 0x1C, 2, 0xF, 0x4B
-	window_template_terminator
+	null_window_template
 
 sUsePokeblockYesNoWinTemplate:: @ 85DFCFC
 	window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x83
diff --git a/graphics/trade/ball.png b/graphics/trade/ball.png
new file mode 100644
index 0000000000000000000000000000000000000000..97cc86a6f79c9d20b0cbb2f5de67003c0aa9d97c
GIT binary patch
literal 464
zcmeAS@N?(olHy`uVBq!ia0vp^0ziC#g&9cxfBdf&NErn9gt-3y|G$}mVGRSrRZY$R
zbE<*dDO096Iyy>7NC4TGAggAYHv<D>w5N+>h(+(-s|WL%4S3iR@+>!Vryo*zw<Jh@
z!Q_fY)_Dy-b}cLZ^s8HzeeJCkYNFS?>sK1qY?9f&>fg7{z<pbvE!lPYLS2BxUTNQh
zv%4?)a+w!@lUd}L@zUfNgW!t|bDJNpI%>riTB3Jve^PzF<h2W8iN21NEp4lxF(_6)
zE0~j>VKGByk~(*-;Hq;kVwV2So@=|Z^n8WD5#wLI|9%|$aZh8eZIy=H-LB>9=6~|2
zp6XgqKKJ<fkJm0waQU3JqjP_S)!yyLZ@r0JGxx{IGPgEXp-Jg;?^Q_EHp)Jm_<Dj(
z@Vox4VK$l@+VuphJv^4%a^C!`mAp8v<Zu1FFOyl+H>fNzYUMZ(n#=If<oaXVXoIag
z_LNO&R`|{SeP_J)%^Z6heyOE*LTvJu*H(PHIk_zVxW66y2a!Ar<u9WBd!Cltyg45?
zFYj)<+qd&?QvWMFxgEQ#Tz0nTwtv1kRr?t7*q**LW@vf^j3Ne4S3j3^P6<r_0J`M9

literal 0
HcmV?d00001

diff --git a/graphics/trade/black.pal b/graphics/trade/black.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/graphics/trade/black.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/trade/cable_closeup_map.bin b/graphics/trade/cable_closeup_map.bin
new file mode 100644
index 0000000000000000000000000000000000000000..aad25ed839c757b38f1a4577efaf0cb153f24a9b
GIT binary patch
literal 2048
vcmZQjV89Cf6#NzZRY1^B1-lCTqNDmp!*4YGjOL#~Uw$x*g3%Bdxgh`mOty9*

literal 0
HcmV?d00001

diff --git a/graphics/trade/cable_end.png b/graphics/trade/cable_end.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d7828a0083f89deb7bb695c186820b8eab70952
GIT binary patch
literal 194
zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*!VDxI2ESSgqznRlLR^9L|NsB*J$twJ?6Wyr
z?lm`eCnZ%odSz)EMm>A>?CjaITefVOGiT1#Em>#h1R4I%62IBb4%Fl8>EaloG4XAe
zAy<O~56k6Wfd}s|5o+7x@<{lThW<wG>zv`1XZa3yonTz9@>`*t*(X>gCVFF7Q-@IT
s{$P!J1{Z!^`@Q?d)zm7tr|F#hUvEa1FXr=q2sD_%)78&qol`;+0D$jMo&W#<

literal 0
HcmV?d00001

diff --git a/graphics/trade/gba.pal b/graphics/trade/gba.pal
new file mode 100644
index 000000000..64a442293
--- /dev/null
+++ b/graphics/trade/gba.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+222 230 238
+189 205 230
+156 180 222
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+230 230 230
+205 205 205
+180 180 180
+156 156 156
+213 180 106
+205 156 82
+49 255 106
diff --git a/graphics/trade/gba_affine.png b/graphics/trade/gba_affine.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8c2623c4ffce1da5f1ed3ad18e6a08246d3422e
GIT binary patch
literal 1897
zcmeHHTToM16y149?v0RKmEoZXQBstrfdYyG4azG-X>bG)l!ppptRMzOpkRc+Xh8@X
zus{r<BArT5tN}*`F`$T|L6iy=22FiLP+p3mEh4w^$LU8u>}O}XW}nB}d!4oCoR4#i
z7aU+jT}TB0BTk_2M*S+(4<16&&)UbwdjUwmTffOqPya1&4+M`u@EinJAoxQB$Mune
ze+2jd2ry7EK<j~gveg$JYsaptwNmBdoSgja+cSKE__odwTCG;CRx6cCsZ{z<$yZA^
zI^%r(slV$1Q!p5O42u8=!ttwGZM9l0xvCW8=SKtuc`z7^PhCELgG)22Gumx&0p#mj
z>1}a7pRZ5;V|>2t|H}X33!HS$%>p1ZIlexd5{`_PZP~A28Tw_|j?(Gjo8s&r;e456
znq|Gw*z-)^GCS8H%V?CO)me%n3PQZ^-fks#WJX)ZHJW{Cu@2T(HI&xAGJar@&Phf!
zO1B-scsMm6rtqLK7eb`Ya7AHh#uTdW=L~^-m36Z9;mwsuwR+x?c#ur>hi&T}o6LGW
z*+e^GhGp+|Ghj{oc-m)mmzai}V0ExD9+m=u1F2c!YY+B{cOvB2<u}1U`sO94{uY}g
z>r!jkDVJq|%jysYH+fP1vjBQ$V!cNkRZg=rjKE;wwp~Wyr;lx@op6~uzZ%;745030
za9O!i9@PYVMWj61Hx!tfvshS}3@uGyMCqR%2of*Y**8WfRu_|C)GiBUD8aq;9_f!a
zYv_EqG-z6MXAS6l#Uy4$Bxn;HHD>@@3gI6hrZMM&%2C*C5FhE^J!j(m^(c5bq`!8|
z<qDw}%yh5%!2@2G*xaFU>*qizjF5+m(hxT3w{%pM=vn9p=cgD-wHwNAPxYEGRP|X3
z)((n(-E&~UQ|EV+_2`bpwtY-+e^T1h-Pa;J=0B;jf#~-h!ktT9$!%60FT6mSzeIZ*
zeY@rsf=!Y8fKDhB+feG!lA}c~ZfwH?rkYpTGn5IO#H^dN2Qg~|kY`&6t47Wmx&z!m
z<Lk&4;}jV|oc=;pTj0N-oZC*I6Poo5gJQyu_m@FbX4jF+b`_W=mhNgH=e8Pxd(~HS
zdrg<8)9w-^8xGmerxbcnHfA@Y<3tJV`*-79I9*ApLf5fu%s<4>R+>|`(r+|$(%62&
z+(6yvO2J_wNBG7*+t_opW~Ru#B<lBpTnZ~SNT&-t3wP5PaXel070<yFK8-^rn}?fV
zD(olnEr*!%w8RlnYxW|P=v`2AJ>)k3fR((xzKNIrY=x{Vv?VMH?T*pBN-tU67xtp<
z%DE_$0w{0L3_J8lLK_ZpGihLcF3%yP>F1D^vUHk;80*rMq=+Y!?`m&O#~TJcRRdl(
z9QH(CbKOb|KV!y!LOyD|SKNJEP?kuPFgS`Y4pApOXF*%@^bXO!?rSHJDucJA%b_j4
zb+o7B{Rgk3^V#=b@3C?;h|{_CEKdoGMTd4=q-lQ1bQ=72vcQ1V)ju7m@oqFxfP5yc
zCiPFG*gBjvgGEl4s?3?az-!5Rz!tT^cZJ@egzMofy1e|YXy3V%m9r>3?7N(cRT<8c
z*IJ=91j*`?#cqh`QLE!*@<mJl{<F<4!o2-5_3l_E%b@<PwrZ*qf|D+kBa2|)a}osK
z8-5u8<l*R0)fV=O$W#)e^%f8lhQ@(KUYE&C7)~M_IyF7Z>}=#bYIaXdX7rf8p;kDj
cATr_%NloVn_Ev>7eEjD)e!;%y*T!W31#1^ZM*si-

literal 0
HcmV?d00001

diff --git a/graphics/trade/gba_affine_map_cable.bin b/graphics/trade/gba_affine_map_cable.bin
new file mode 100644
index 0000000000000000000000000000000000000000..19bab962b945523bb6ecca2d5178c7a8a3b15357
GIT binary patch
literal 256
zcmZQzfB-&zD1%CTIeAp`^z>2rcJ?qnBNH<VD;qlpCl@ylF9U;sppdYLsF=8fq?ELb
zECYjrqLQ+Ts+zinrk1vjE(3#sp^>qPshPQjrIodfEdzstqm#3XtDC!rr<b>nF9SnB
yU{G*KXjpheWK?uaECWMAVp4KSYFc_mW>$7iE(1eBVNr2OX<2ziWmR=eEdv0p104YX

literal 0
HcmV?d00001

diff --git a/graphics/trade/gba_affine_map_wireless.bin b/graphics/trade/gba_affine_map_wireless.bin
new file mode 100644
index 0000000000000000000000000000000000000000..53a511321009e872ee7b2cd8ac4fff3d92ab2ca9
GIT binary patch
literal 256
zcmZQzpaE!TY-(<4MHoC`;-tw_rXu)l?H!$6-B3Ow6Eh1d8#@Ol7dH<t1A~B|kg$lT
zn7D+bl(dX21A~I1lCp}bn!1LjmbQ*A1A~E~k+F%XnYo3fm9>p61A~L3le3Gfo4bdn
zm$#2E14BSyP;f|SSa?KaRCG)%14BY$QgTXaT6#uiR(4J<14BV!QE^FWS$RceRdr1*
F0{~T`B?<rl

literal 0
HcmV?d00001

diff --git a/graphics/trade/gba_map_cable.bin b/graphics/trade/gba_map_cable.bin
new file mode 100644
index 0000000000000000000000000000000000000000..80705aef534111e1cbe4370aef3494334c2a61df
GIT binary patch
literal 4096
zcmeI!*-sQf5P<PPQ4~SB1VP20a--q_c%gWJa+;`|3M2?99+04Tf$+bxn=rb(?2b#q
zgX!vrnRMoxq`t1MR1{?iC!G?dSAG%r;4joqxIg>vANe`_+kXO|&lv=NasLkWb1?Oj
z_MEZ)%pdVyt~n(BZuc4Z-T5u{68vR15PSMh>Zjg?y%}ZCKFYj%>GuxT_Qm&l_|JTS
zLk=r+#8E|#Ij-0VB}&tO$`#6#t5B)RY1L|+QLD~b=bTT(bI~OY8Z~LwqE(xAmtAo+
z5r5qcH+AaL?Uvi_xa*!C_dQ6$M~^)AM4x_7Ju_g?kYOW6J<pwe%FYWfy)tIpgh^AT
zz4pe8S#yc_d2cOPwB()lmVNNiC!eiYO~kMH;;VJveD}joziim_+m`J_d@6+y2WVgi
Dl#OZw

literal 0
HcmV?d00001

diff --git a/graphics/trade/gba_map_wireless.bin b/graphics/trade/gba_map_wireless.bin
new file mode 100644
index 0000000000000000000000000000000000000000..52f6232fc5a3c1f5e45d1d7ca0f30e36b6d70de8
GIT binary patch
literal 4096
zcmeIuS4$RP7{}q))P^Z&W!ey~9F+^SG*c5C<qj(M0%zs|N2RG9=V%;SY4uh63XkuB
zAUyx`-wpSbNW?{fC=dmrKop1qQ6LILfhcg^1-{s`@4%t2lKJJxPrv+j>?EoFo9}-3
z<F9|G>!r9LRho1cU2@qK8LrBd6?7+Cj%%*FA=gcL^4)UV9d{K3_1sgaNU;+4J@8Pe
zGUX~%2K7~{J@QzMT2It@s$PRe&ol+~&04f-^V|#VI&|vNtw*nyLH#SQz0s%NfI&ls
zjTkj%+(b}6Y09)2v*x@t@0|sUmMmKd>Q}8<x8c1HKH9Y9lWjY8eGcjqac3&<A9+<Z
A?*IS*

literal 0
HcmV?d00001

diff --git a/graphics/trade/gba_screen.png b/graphics/trade/gba_screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..4220e5e0d4500d4b503891c07096b992b28c1fde
GIT binary patch
literal 170
zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!VDxm*B3<sDT4r?5LY1m|NsAc&))4l`)tmZ
zd(F+=NlDd?URj!kQO}+|JA3x*mMvT6%$aj_OV-&rL5Bac#Ba8<1NE4Cx;TbJw7xxM
z$jG3;!@ME#0F&5;hI-!*Z`L%amap0;9U{z<m}AkXz;TF=#Ze#(NWb{Nuw=_W0nfr_
Q6QBVMp00i_>zopr09&Cy(*OVf

literal 0
HcmV?d00001

diff --git a/graphics/trade/glow1.png b/graphics/trade/glow1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e223d97ce3583d2bc7b7d6872a24cb3627cef418
GIT binary patch
literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvg8-ipS0Md=PW6)NqniJV8M^=f
z|L+CFSy@>?L99qmZLt$jkDsTDV~EDY<b(r!PK^wmr=_^q7&B^GJTzn$Xf|ka^122$
z=^g0O5oqvLFcI<PcVr9;X=J#?G2x+sQjNF85d&sPWhnz?E@dr4WobzUhUULzrUsv?
RQ-LNkc)I$ztaD0e0s!HdLY@Es

literal 0
HcmV?d00001

diff --git a/graphics/trade/glow2.png b/graphics/trade/glow2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7729bc84b08d46a1cd766ff3c7b19cd2cb1d02a
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*!VDxI2ESSgqznRlLR^9L|NsB*J$twJ?6Wyr
z?lm`eCnZ%odSz)EMm>A>?CjaITefVOGiT1#Em>#h1R4I%62IBb4%Fl6>EaloF)=ye
z09%C2f-T+LEl-(PG<d`W4l~Yt_=suh;e-ti5`0(EA8Zuq<~FQt{Gf2>^cRML-3!(^
oSTL722p>IQ!k)+4Ys0}%lWxp-e)GS@KtmZkUHx3vIVCg!0Co~eGynhq

literal 0
HcmV?d00001

diff --git a/graphics/trade/misc.pal b/graphics/trade/misc.pal
new file mode 100644
index 000000000..32fafddfc
--- /dev/null
+++ b/graphics/trade/misc.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 156 123
+164 123 197
+41 255 115
+0 139 255
+255 255 74
+255 255 255
+106 106 106
+255 156 123
+255 156 123
+255 156 123
+255 156 123
+255 156 123
+255 156 123
+255 156 123
+255 156 123
diff --git a/graphics/trade/pokeball_symbol.png b/graphics/trade/pokeball_symbol.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b4a30f4f90b67922bda3cdc7fa8c3a01425d44c
GIT binary patch
literal 1569
zcmeAS@N?(olHy`uVBq!ia0vp^4nUm2!3-qJJlM7~FfcO&_=LCuxuk;smK^`1IQ}<t
z{9nWI|0>7-|3K9I9|Ra285oKM7}h8-JhSA08w-@U_w3!?v(M&ix!2s>os?AV=#`~u
z81?Mgv$JQ<ZrQSB&YU?{w`8526J+>53#bcOJ%hj+1%)gDfhYzBumAt|K6|$0?Aa-M
zw-k4GM|pW!DkvzxZ6TiVe@^w1>Z6+fiy69sRsoIupOuvb6vT>%H+EFzPz-^|hOKoB
z3`}=CT^vIqT9?j@EMivVak1nRHz@u;TlKNzg=@Mlhul}mc%P4Q;K<OGyxZ#|rWKzz
zMKQQ?M_{wY(|&2LNh^d?*$;NS?^i#?)pVw!zGk_t<iVa>{nf?+JOLj%&KtB`=s0-j
z*_TS54SQK%^Z!Y>7Hx0z*Xtj1V%@&8_gC7x{kRi;Ry}V|!@s$IGs0Z*l-Oik$|5(e
zJ8IK-#I^gbo`#|O3dWu(iWiP_Tv_k2IjC!bN}1=~2FHEB%^lj)c-2c!U+~!b^|Ry}
zk9!I$^hN(jifflW{-ozq8vXBgbY5c)3r|q3LDH5*R<0HYmVIlSb#u<Yy2r&W&%P9Y
zoms={u}|4X`|6KZ3%^P1OuP1M#fxZ1E|13xRiq>9W><9SF#fnDQng0)3`3dX8aeO3
z<xB;vJEr`4wJpc{qZc=WXj^K>%i6X`gJpXv{$_eaxMpqlXM7~{CW?n4XZ_<xzno@R
zK4#m{`(IVV;YCjHUrzxC3ES)SoZJHJXV-NFP1pSTQ$<?(ep#y5U)c+c3KH*baWM-B
zFIkqyP-U4ce2&3)8AE);nfC9C&(<!qp4{}Q=8pP&racEfx^Okv`=qj4#QPj`jg?$|
z`X<w^S>d{hE1HrR4z$F2ZvM4l*K^mY%wDOsYX1wGJ9paOezfnf-m=ZU-+mw0d%ijM
zpP|E&vw~^fJ9d`_`1eK4W$StsxS93zFVEfVt9Pwutdt2j$Iz&haLF-n8OIF63)%rJ
z-$X(~n>3hD1a>fZ7_zl*Z2S82;7xh<oo;icePQ@jaahg&DMt@qusTD<9PK%WmQViS
zu=DgvE}?s7rx?mssObiZ+>Dzna47Fqg>Z&eR>PB3Ju?{emntw>H@@G!K+u3^2iqfV
zZ;=yA`q+<TOq}pm<sSdm+Vc(vvmGC`zq_>L@rt;B^W86>ZqwuatzDF9JWcc1xjQ_?
zmicG4KRk6$;z&Z(LmoM;2h6Tzx8Kb7dLVrA-7^pSYX`nhjfquwQ}~SCX<}Z}pVc-h
Pp#16S>gTe~DWM4fbpg^=

literal 0
HcmV?d00001

diff --git a/graphics/trade/pokeball_symbol_map.bin b/graphics/trade/pokeball_symbol_map.bin
new file mode 100644
index 0000000000000000000000000000000000000000..8355c2f5ca1a903c8e07632380710eab6a819712
GIT binary patch
literal 256
zcmXAi*Fr);3`9p+1YM;{Q<{b1VnLcTrGo_#vC$O~{Qo~7<mTbbnLH!_u(7EVLce7o
zr7>>rNS@t26IHWCYin9<fSv2UgTo1zo5XW)==J$Y0>LBV@d-{t2uDbxXG*CU&Mz*n
z5GTFn7m1{lsWdAib0cLo$C?*H6i~dqE1^tUsnU^J9gQYh_oNSxPsH|f=cW5f(tE=@
jg_Iwk9A7|xz{VJk=;nAb)i&QhGwtQ?{7<RH@_*e{m}?o7

literal 0
HcmV?d00001

diff --git a/graphics/trade/shadow.pal b/graphics/trade/shadow.pal
new file mode 100644
index 000000000..a4bec6478
--- /dev/null
+++ b/graphics/trade/shadow.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+222 230 238
+189 205 230
+156 180 222
+0 16 172
+32 32 106
+16 16 90
+0 0 74
+255 255 189
+230 230 164
+205 205 148
+189 180 115
+139 139 90
+74 74 57
+32 32 32
diff --git a/graphics/trade/shadow_map.bin b/graphics/trade/shadow_map.bin
new file mode 100644
index 0000000000000000000000000000000000000000..8846e2d7d702adda5f8f0f6bb79dd6341bbe25b4
GIT binary patch
literal 4096
zcmeIyxedTD2nA4&^b3k#Fr4q&_q<ubMT$tlv_^<0z`<FVz-s~?0TBrq1r=3_WJwYw
zh?kp5Yv>r5SlBo?vSrDXAzj*CK05~|7dH=&Ze2QcXxFAU^*sY46Eh1ds}{|gG-^<P
mm48#i{(MNl*)xG33%qvuKeW@<lL?rB3ET+$`1D)rCh!0k3lGQu

literal 0
HcmV?d00001

diff --git a/graphics/trade/unknown_3308C0.pal b/graphics/trade/unknown_3308C0.pal
new file mode 100644
index 000000000..72cf8b7c9
--- /dev/null
+++ b/graphics/trade/unknown_3308C0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 57 8
+255 90 8
+255 131 8
+255 172 8
+255 213 8
+255 255 8
+255 255 131
+255 255 255
+255 255 0
+65 0 0
+115 16 0
+172 32 0
+230 57 8
+0 0 0
+0 0 0
diff --git a/graphics/trade/unknown_3379A0.bin b/graphics/trade/unknown_3379A0.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d1e364a2911bf8eafd93e6e3df048f9ee39ec4d4
GIT binary patch
literal 2048
gcmazyh#!TcAut*OqaiRF0s{~N45MH)1O_k!02WS(Pyhe`

literal 0
HcmV?d00001

diff --git a/graphics/trade/unknown_338EA4.pal b/graphics/trade/unknown_338EA4.pal
new file mode 100644
index 000000000..346db3df8
--- /dev/null
+++ b/graphics/trade/unknown_338EA4.pal
@@ -0,0 +1,15 @@
+JASC-PAL
+0100
+12
+148 197 255
+148 197 255
+148 197 255
+255 255 255
+255 255 255
+255 255 255
+148 197 255
+148 197 255
+148 197 255
+255 255 255
+255 255 255
+255 255 255
diff --git a/graphics/trade/wireless_signal.bin b/graphics/trade/wireless_signal.bin
new file mode 100644
index 0000000000000000000000000000000000000000..4ce5d18b89d6b4ff38d6e2d3e73a7c7fd4872ab8
GIT binary patch
literal 2048
zcmaLU_g{{E7{>AYHnKAtl+4W1frAblGRw@KWk)1YA~U;bWrvK2tSBV@yC-*q9xt!&
zFV_#(`*WVx_X;5JufxE<&tGg1ozNLw&=p|_V^?-zXLe%n@0||58@i(hdZHJ4qYuIn
z&OYqTUhK&p?9OigZ~Wo=q96KW00v?ZA`povL@|;P9K?Yf!2ayVz8wqgK8R=x#t_6H
z7DEw-VHl1P7{TEj#yAdTEMqu?gBktjm;CTSjKnC6Mm)w~EXH9xCSW2GkidzY!0{Z%
zu^hvAj^-$i{JrqQC${QINCGe!Q!o|8G)zY_k~y8zNKWMxP9~VdNv(y%UtbaO!VJvB
zEEuzqf;pIrd6<s{ScrvO!1<iVxtzlk&ZaqwGdY9$S!ngCNW&s5#u6;WGAu_rR$wJo
zVKvrZ4Oep&S8@f@xtz<mluNjni<rjLwnD34i*;C!4cLfH*o+KhVhgrn8@6Kyc5pkl
zaVxhllNsF1P29*0T+ek}`@;vZ6T6Uw-PnU{?8QFhU_Wwk0C_lwgUsUr=5jxCxQ~08
z%{|=BEbijYwp+v@<f8zGQHUcriXt4tah$+OoWf}oqnM|8iYIx3$9arJJjx?1<Y5*t
zpNGD0fHOFYb2yI+xQI(AK`F{mjtW%bGOpkXFSC*rEN2-@S;9-a$O}Brb3Ds4A%7Lu
za2-{+ft$F6+qi?fxQA-o#{)dXLq6brR`VY3@(yqF7H{$ft9YH)cs1l}@Cc9b1W!?m
zXLyb}yueG;;}u@x4c_oIU$LGq`GR$P&S$LUQ$FEiK4MMCzr{N=;5|N|5l#4rPxy>x
zd_fDo;v2s4D_i)5&HT(y{KzIY@&n(qf$#XX&Fh^S^j;s-s3v{XCw*44zNkfC^-bUW
z)h+(wW`Fi4e{_=@{lV|u;CFuOfCH$}BR$p=Jyorq>AC9kLN8UXS9+~CdgIrA<$AyL
z3)lI%pSjjg{lt&`$TcB<Ro8S~Rl1>@x~1E?qr1ANYTefZJ=8-#@O@YNp6~jOZ~K;S
z`i84~-Pe3I<j?4=&gr}^=%OyEM5QWIxhhnt%etZ~zU)d@xZGtfb%`(eqA&Qo&-tv+
zg#01pt3ZcUs3SV6A|2ClozO|0(rFc|*r$EUCw;=leauBZ>LV`nVHY^xheAH6o!X@=
z?baS;Yp?bxNBfnl1Ip7u9dw=#IM@4~<9*)iZ13@IXL*-*IvDZ+t<^fM*9L9WCT&)R
zGPOlpwN2Z#Lp!|P+q~6Voaqd2_9k!i2Cw%zul=rD??0earD>5CYl)U>nU*VEE3{Ip
zv|4Ml#;d)`E4{+$UhZXH>Lp(6MNV^SyAMd3p_!T`YqnA}M{_k#^R++=wa^PZ-}5}z
zbDZMYwr6>!XIO1IG(Vt#5;aPblq6`frf90DX_~HNC40K3nV#w?o@_YDlRV0aKXtng
zYGi9+wBj{JV>M3WH9-@Vpaf6!1dsPPkM$VGdvvQF*>-ck?f-p)prSQcLlmP}4ON_m
zX}Cscgok^W<2=-{j`0u=cJ%MMeg5}CKz-Fu{WU-XHAoSPRFt9|=?D+<Ko4+#_jBK0
zn|GMsR_Lbg>Y<+MrQYhJaD}^%d%Kr=x`(^FTSwhtep@4`PU@^K>Z&k>xvRUlvpfB{
R^{-Cr|NrOt_2%E7@E`BJ<oo~t

literal 0
HcmV?d00001

diff --git a/graphics/trade/wireless_signal.png b/graphics/trade/wireless_signal.png
new file mode 100644
index 0000000000000000000000000000000000000000..a48c70ae71caaded2d650fdce302ea8d93a29570
GIT binary patch
literal 1307
zcmV+$1?2jPP)<h;3K|Lk000e1NJLTq004jh003YF00000HQ~sV000EyNkl<ZScRpR
zJ#HH@6oh#LAtw-^3#jk`(zsXU+MU~!F5Rk2t;)R{AHYQ}AiyUua)U&YB|CC{nC1JO
zM{<=QA&?;Q@|!m^<QhuK-L*+&`RDMVtaoM6lQB35ME;$wu0YMQ;>12|nVs7H4&FL4
zej8wVSmTpit&J;g)pzgV2##ACJe0HP;=pfPeBiBvO&15g$}UeQMF97N=d-eC&_tfI
z#BMg5y9wl{6)Xa>W9z){d$#0T;CIZ<-RKDae0J91cL0X~H9z2kfbnP^n~<y0@PzA4
zbbeRiYCr-w&$tR0AI;N-G{(zw<lFITfOi-_*nh9jJ&l<aFU{Vdo5|B|md<2(ThodM
z?3`B-;5oB-I`cHa?7ZRk=jSG{Nn!wgA8eql4o~>Pn-K#bAO<ji^Lugb!^A*_*O?7u
zc@X%B>oD?};?F_=<Pq1p`AstcHy{C&-$Qm0n7Gd*X5V-A9xjGu?%3SirT4TqReYpb
zfE{b?WjhC3m;*8E{J~%|K<U^ukCV+Q@C)EC%?uluMgtrmACd*|`GJ-MtpVmQlK#N>
zgL{VrtpS;ptdjHYcuNosNPuBfdJdK3dORio1HAn(%u0p9kypd2ox@<|WNYz<{1vZ`
za~Z70%X+!`P__Y2@P`rSXaM*@;1Y19v)uQR0ICxMm&}V%;a?)I6=b>olpq)oUf;%-
z3a=Bm0clYA*Q9)oD<%K~+@KVYU$2wIulPDaF|c1i0Ohak7s~MOYl+lzuFdIQpJX%%
zaP-#s0gXHVZMjT_SJBNmSBK3Rzg&`l(Goo-km@cyfbJf~F9+fkaH(LL`TlbPuTBHp
z==hI?xR%eHAZ0wfSRoq#o=3uXtsqMUmH-WiUml<9@5-S9O3)gJd`?tFj84v}Iv9Kt
zxtv$46@^}^fJKkaaqu_ekE<06q_ni|EP8bA28<{CmJ_7Vokx!e*nsq&WjF|UcTz!}
zKn!4bUh-u;yZ}^zB|rlog}==%Ffjpp0lb1}Kmr6l2-FpD0y7{D9s^$ly7ApT53kv~
zyE|!a%6~WU)x8WC^Ny1M1-Je%KDc)S%D)Zty$8qsJbsk`11KH@w7*zEOyIosR|#l`
zu>wnQT#5gCKLDyf!6B3mtpZDc27qUQDGAsigbFkP7<e=PK_K*3;)8o1ZtTOuL$<@8
zn}GGF2WakfxZy=W&W^vW+W{<sfVvk0_sW0D8LLkt{c(Is00tQE3N-!21Z+V0D9{`L
zbx0Lh0ybd$CJM+~V0W;pzzlp>Uhk0nk3~<>It&$10x_VxUI9W=Jb)0N+|%&k<an*u
z2p7}^4l3aBb-0>eug3)F1g$@b&+hNt{D42^R)DU69)R^%;(G$&AFKQ#kl`)B{<s24
z;QT3pECSY{RzL}UFpuw%3)pLPr2<+(NgxK8$M=W@;uU~HI9dWWkU=2(8<Zlf2XKq-
zW%$ph088=|uK@J-rv1zCr>7GF;R<Mf8lMdeeC`U^9g-8Y1EBsW0sH@)M+7nm+`uK)
z3OGUG|6br|0;PgSGSHmBNdY+ouYe4U3taRBumU#F7icaZz!aZ`|N4?gR>BLotOdwD
z@qZzZ{SK8Ad=LS0KhAdqay)>apHBt&gTPt^zW%E~<_^F7m%#AnM1ubp_zhwpp|T})
R_pbl|002ovPDHLkV1l#qW#a$<

literal 0
HcmV?d00001

diff --git a/graphics/trade/wireless_signal_receive.pal b/graphics/trade/wireless_signal_receive.pal
new file mode 100644
index 000000000..218390aa2
--- /dev/null
+++ b/graphics/trade/wireless_signal_receive.pal
@@ -0,0 +1,259 @@
+JASC-PAL
+0100
+256
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
diff --git a/graphics/trade/wireless_signal_send.pal b/graphics/trade/wireless_signal_send.pal
new file mode 100644
index 000000000..a5da8a543
--- /dev/null
+++ b/graphics/trade/wireless_signal_send.pal
@@ -0,0 +1,259 @@
+JASC-PAL
+0100
+256
+0 0 0
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172
+255 255 255
+0 0 0
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+172 172 172