diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 3b108df36..3e173607b 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Map042.rxdata b/Data/Map042.rxdata
index f7a9c1948..61206383a 100644
Binary files a/Data/Map042.rxdata and b/Data/Map042.rxdata differ
diff --git a/Data/Map077.rxdata b/Data/Map077.rxdata
index ed89faebf..e96031143 100644
Binary files a/Data/Map077.rxdata and b/Data/Map077.rxdata differ
diff --git a/Data/Map254.rxdata b/Data/Map254.rxdata
index 66e679e0b..4b971c4d4 100644
Binary files a/Data/Map254.rxdata and b/Data/Map254.rxdata differ
diff --git a/Data/Map433.rxdata b/Data/Map433.rxdata
index 99ea338db..d9554b7cc 100644
Binary files a/Data/Map433.rxdata and b/Data/Map433.rxdata differ
diff --git a/Data/Map460.rxdata b/Data/Map460.rxdata
index bff22a09c..92562bf35 100644
Binary files a/Data/Map460.rxdata and b/Data/Map460.rxdata differ
diff --git a/Data/Map491.rxdata b/Data/Map491.rxdata
index 3677fe6dc..2fc61e8ac 100644
Binary files a/Data/Map491.rxdata and b/Data/Map491.rxdata differ
diff --git a/Data/Map600.rxdata b/Data/Map600.rxdata
index d2d33f296..3dbe38dd0 100644
Binary files a/Data/Map600.rxdata and b/Data/Map600.rxdata differ
diff --git a/Data/Map659.rxdata b/Data/Map659.rxdata
index d1efc57d3..fc30a07b6 100644
Binary files a/Data/Map659.rxdata and b/Data/Map659.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index e9d803e3b..609c5d5f8 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts b/Data/Scripts
index 056503a81..a0a3f1706 160000
--- a/Data/Scripts
+++ b/Data/Scripts
@@ -1 +1 @@
-Subproject commit 056503a814bf4ee0b261230d519d6ef098ed99cf
+Subproject commit a0a3f1706609eb69548383a9191bab4da051fb56
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 13955681a..6cfb7d1be 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index e7a8acf8b..e758ae722 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/encounters_randomized.dat b/Data/encounters_randomized.dat
index 12f95834b..5ef62d9e0 100644
Binary files a/Data/encounters_randomized.dat and b/Data/encounters_randomized.dat differ
diff --git a/Graphics/Pictures/Trades/FRONTrightball.png b/Graphics/Pictures/Trades/FRONTrightball.png
new file mode 100644
index 000000000..cdf114581
Binary files /dev/null and b/Graphics/Pictures/Trades/FRONTrightball.png differ
diff --git a/Graphics/Pictures/Trades/hoenn_starter_bag_bg.png b/Graphics/Pictures/Trades/hoenn_starter_bag_bg.png
new file mode 100644
index 000000000..437a06f70
Binary files /dev/null and b/Graphics/Pictures/Trades/hoenn_starter_bag_bg.png differ
diff --git a/Graphics/Pictures/Trades/hoenn_starter_bag_foreground.png b/Graphics/Pictures/Trades/hoenn_starter_bag_foreground.png
new file mode 100644
index 000000000..d412cb438
Binary files /dev/null and b/Graphics/Pictures/Trades/hoenn_starter_bag_foreground.png differ
diff --git a/Graphics/Pictures/Trades/obtain_trade_bg_protoype.png b/Graphics/Pictures/Trades/obtain_trade_bg_protoype.png
new file mode 100644
index 000000000..fd8f4eac0
Binary files /dev/null and b/Graphics/Pictures/Trades/obtain_trade_bg_protoype.png differ
diff --git a/Graphics/Pictures/Trades/trade_pokeball_closed.png b/Graphics/Pictures/Trades/trade_pokeball_closed.png
new file mode 100644
index 000000000..5920425ea
Binary files /dev/null and b/Graphics/Pictures/Trades/trade_pokeball_closed.png differ
diff --git a/Graphics/Pictures/Trades/trade_pokeball_closed_1.png b/Graphics/Pictures/Trades/trade_pokeball_closed_1.png
new file mode 100644
index 000000000..b5cfcc242
Binary files /dev/null and b/Graphics/Pictures/Trades/trade_pokeball_closed_1.png differ
diff --git a/Graphics/Pictures/Trades/trade_pokeball_closed_2.png b/Graphics/Pictures/Trades/trade_pokeball_closed_2.png
new file mode 100644
index 000000000..14e88b90a
Binary files /dev/null and b/Graphics/Pictures/Trades/trade_pokeball_closed_2.png differ
diff --git a/Graphics/Pictures/Trades/trade_pokeball_closed_3.png b/Graphics/Pictures/Trades/trade_pokeball_closed_3.png
new file mode 100644
index 000000000..6c9ccb3c1
Binary files /dev/null and b/Graphics/Pictures/Trades/trade_pokeball_closed_3.png differ
diff --git a/Graphics/Pictures/Trades/trade_pokeball_closed_old.png b/Graphics/Pictures/Trades/trade_pokeball_closed_old.png
new file mode 100644
index 000000000..9079befcc
Binary files /dev/null and b/Graphics/Pictures/Trades/trade_pokeball_closed_old.png differ
diff --git a/Graphics/Pictures/Trades/trade_pokeball_open_back.png b/Graphics/Pictures/Trades/trade_pokeball_open_back.png
new file mode 100644
index 000000000..8cde6948c
Binary files /dev/null and b/Graphics/Pictures/Trades/trade_pokeball_open_back.png differ
diff --git a/Graphics/Pictures/Trades/trade_pokeball_open_back_old.png b/Graphics/Pictures/Trades/trade_pokeball_open_back_old.png
new file mode 100644
index 000000000..bf905d676
Binary files /dev/null and b/Graphics/Pictures/Trades/trade_pokeball_open_back_old.png differ
diff --git a/Graphics/Pictures/Trades/trade_pokeball_open_front.png b/Graphics/Pictures/Trades/trade_pokeball_open_front.png
new file mode 100644
index 000000000..5230fa147
Binary files /dev/null and b/Graphics/Pictures/Trades/trade_pokeball_open_front.png differ
diff --git a/Graphics/Pictures/Trades/trade_pokeball_open_front_old.png b/Graphics/Pictures/Trades/trade_pokeball_open_front_old.png
new file mode 100644
index 000000000..a80afb7ea
Binary files /dev/null and b/Graphics/Pictures/Trades/trade_pokeball_open_front_old.png differ
diff --git a/Graphics/Tilesets/Outdoor.png b/Graphics/Tilesets/Outdoor.png
index 478b16838..731cfdc0e 100644
Binary files a/Graphics/Tilesets/Outdoor.png and b/Graphics/Tilesets/Outdoor.png differ