From 2b882b1ef941a8d17e871b970fe3de360530177c Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Sun, 23 Feb 2014 22:25:11 -0500
Subject: [PATCH] Trade graphics in gfx/trade.

---
 gfx/trade/arrow.2bpp  | Bin 0 -> 32 bytes
 gfx/trade/ball.2bpp   | Bin 0 -> 96 bytes
 gfx/trade/bubble.2bpp | Bin 0 -> 64 bytes
 gfx/trade/cable.2bpp  | Bin 0 -> 32 bytes
 gfx/trade/game_boy.lz | Bin 0 -> 320 bytes
 gfx/trade/poof.2bpp   | Bin 0 -> 192 bytes
 main.asm              |  35 +++++++++++++++++++++--------------
 7 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 gfx/trade/arrow.2bpp
 create mode 100644 gfx/trade/ball.2bpp
 create mode 100644 gfx/trade/bubble.2bpp
 create mode 100644 gfx/trade/cable.2bpp
 create mode 100644 gfx/trade/game_boy.lz
 create mode 100644 gfx/trade/poof.2bpp

diff --git a/gfx/trade/arrow.2bpp b/gfx/trade/arrow.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..637ea13c9937cea270d54541de05977cbff1f7eb
GIT binary patch
literal 32
gcmZQDV6b4YVXy;28z9Sofrmi`$f^NC8z74Z062gHg#Z8m

literal 0
HcmV?d00001

diff --git a/gfx/trade/ball.2bpp b/gfx/trade/ball.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..b90cac27464a8756dca807bfbe1201de5374f264
GIT binary patch
literal 96
zcmZQzfB<G@9)3YNK{*9`1$zs1dj)v`c>#VNW@e}~13SBfyt0k54UFH=knlj@gTM!e
fdJuH118P%{mtbe-_#yGa;=~UQpp?LagoXwHJMa_z

literal 0
HcmV?d00001

diff --git a/gfx/trade/bubble.2bpp b/gfx/trade/bubble.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..c4a7abf4ff2ae2189052bee6a997fb6e33609eae
GIT binary patch
literal 64
zcmZQzfB;4YMrLMqK6VBMb_R3){q?{9+<#Et@Sj1Jk6*@G#$H0+qTHh1px)p=11ban
Du_6-0

literal 0
HcmV?d00001

diff --git a/gfx/trade/cable.2bpp b/gfx/trade/cable.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..1f9974e99903d934eb8cc0a2c357c0991487cfe6
GIT binary patch
literal 32
mcmZQzU|^7!|NsBNe}@0efBrMDv&+j@)Ia!t0LYUE3IYJvLk{-<

literal 0
HcmV?d00001

diff --git a/gfx/trade/game_boy.lz b/gfx/trade/game_boy.lz
new file mode 100644
index 0000000000000000000000000000000000000000..83216430624f7216ee460daf1bcb89be2113eb59
GIT binary patch
literal 320
zcmWlUF-yZh9L4XhtxX}4(H05^J*9P!tOWx%h~QG|DD7aeLk0)?1+=NPg0yl|ElwE(
z(Wy>?+m)y>ICOG9@B^653^jk_8{YExJ>JW3-t8*IB=$V!GdO&6vH)QiMaANp&PJw>
z0k%P5uKeCEAOtm_=4cNTLN!2jpc{UI?tof_i{Fo4@RNo(jv_V+kcoBOlr{@J=L8#u
zsh8(viCvc+Cw4hc8AhSNRxqWvSN&mjGI3oY9H%W%Xs4n??Xk!aqG^OwDue`&gTcCd
zMVTW88BHsdG_8#>X5gW6E}ySfI~}E@96p?*&n5J~6v6x{M``j8B+Ozlt$B<7by`u$
zXZK>uTcp1h0NuOisYu1KZL`zBS>~uk>->Q4^QP6XlB8iZt(P0ZTeOeAr-CHK?_?9f
JnOkpI@CP8kj_3dY

literal 0
HcmV?d00001

diff --git a/gfx/trade/poof.2bpp b/gfx/trade/poof.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..c50e69e68456d9bacbb1bc900e2306d3498b5392
GIT binary patch
literal 192
zcmZQzzzNvcEbSeDvW$#OAjr(Z%)-c2-|&y|2m2594}1sg4%jplz~q@_WR>I<>>Ppo
z4<9&wu>WQH!2dwbVUL}oOfo|~5ZW`y1ECDVA0Yg}@Bj!80M&v3BO@C-2cMvvqKuM(
i4?{sg&j-GS8lY?gNYcP3VFnORU?^ZnU{C;wpaK8`<s$3=

literal 0
HcmV?d00001

diff --git a/main.asm b/main.asm
index 26713da2a..b46188f7b 100644
--- a/main.asm
+++ b/main.asm
@@ -34470,18 +34470,18 @@ Function28fdb: ; 28fdb
 	ld bc, $0800
 	ld a, $7f
 	call ByteFill
-	ld hl, $599b
+	ld hl, TradeGameBoyLZ
 	ld de, $9310
 	call Decompress
-	ld hl, $591b
+	ld hl, TradeArrowGFX
 	ld de, $8ed0
 	ld bc, $0010
-	ld a, $a
+	ld a, BANK(TradeArrowGFX)
 	call FarCopyBytes
-	ld hl, $592b
+	ld hl, TradeArrowGFX + $10
 	ld de, $8ee0
 	ld bc, $0010
-	ld a, $a
+	ld a, BANK(TradeArrowGFX)
 	call FarCopyBytes
 	xor a
 	ld [hSCX], a
@@ -35732,17 +35732,17 @@ Function2981d: ; 2981d
 
 Function2982b: ; 2982b
 	call DelayFrame
-	ld de, $5adb
+	ld de, TradeBallGFX
 	ld hl, $8620
-	ld bc, $0a06
+	lb bc, BANK(TradeBallGFX), $6
 	call Request2bpp
-	ld de, $5b3b
+	ld de, TradePoofGFX
 	ld hl, $8680
-	ld bc, $0a0c
+	lb bc, BANK(TradePoofGFX), $c
 	call Request2bpp
-	ld de, $593b
+	ld de, TradeCableGFX
 	ld hl, $8740
-	ld bc, $0a04
+	lb bc, BANK(TradeCableGFX), $4
 	call Request2bpp
 	xor a
 	ld hl, $c300
@@ -35755,9 +35755,9 @@ Function2985a: ; 2985a
 	call DelayFrame
 	ld e, $3
 	callab Function8e83f
-	ld de, $595b
+	ld de, TradeBubbleGFX
 	ld hl, $8720
-	ld bc, $0a04
+	lb bc, BANK(TradeBubbleGFX), $4
 	call Request2bpp
 	xor a
 	ld hl, $c300
@@ -35792,7 +35792,14 @@ Function29886: ; 29886
 	ret
 ; 29893
 
-INCBIN "baserom.gbc", $29893, $29bfb - $29893
+INCBIN "baserom.gbc", $29893, $2991b - $29893
+
+TradeArrowGFX:  INCBIN "gfx/trade/arrow.2bpp"
+TradeCableGFX:  INCBIN "gfx/trade/cable.2bpp"
+TradeBubbleGFX: INCBIN "gfx/trade/bubble.2bpp"
+TradeGameBoyLZ: INCBIN "gfx/trade/game_boy.lz"
+TradeBallGFX:   INCBIN "gfx/trade/ball.2bpp"
+TradePoofGFX:   INCBIN "gfx/trade/poof.2bpp"
 
 Function29bfb: ; 29bfb
 	ld hl, PartySpecies