summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gfx/trade/arrow.2bppbin0 -> 32 bytes
-rw-r--r--gfx/trade/ball.2bppbin0 -> 96 bytes
-rw-r--r--gfx/trade/bubble.2bppbin0 -> 64 bytes
-rw-r--r--gfx/trade/cable.2bppbin0 -> 32 bytes
-rw-r--r--gfx/trade/game_boy.lzbin0 -> 320 bytes
-rw-r--r--gfx/trade/poof.2bppbin0 -> 192 bytes
-rw-r--r--main.asm35
7 files changed, 21 insertions, 14 deletions
diff --git a/gfx/trade/arrow.2bpp b/gfx/trade/arrow.2bpp
new file mode 100644
index 000000000..637ea13c9
--- /dev/null
+++ b/gfx/trade/arrow.2bpp
Binary files differ
diff --git a/gfx/trade/ball.2bpp b/gfx/trade/ball.2bpp
new file mode 100644
index 000000000..b90cac274
--- /dev/null
+++ b/gfx/trade/ball.2bpp
Binary files differ
diff --git a/gfx/trade/bubble.2bpp b/gfx/trade/bubble.2bpp
new file mode 100644
index 000000000..c4a7abf4f
--- /dev/null
+++ b/gfx/trade/bubble.2bpp
Binary files differ
diff --git a/gfx/trade/cable.2bpp b/gfx/trade/cable.2bpp
new file mode 100644
index 000000000..1f9974e99
--- /dev/null
+++ b/gfx/trade/cable.2bpp
Binary files differ
diff --git a/gfx/trade/game_boy.lz b/gfx/trade/game_boy.lz
new file mode 100644
index 000000000..832164306
--- /dev/null
+++ b/gfx/trade/game_boy.lz
Binary files differ
diff --git a/gfx/trade/poof.2bpp b/gfx/trade/poof.2bpp
new file mode 100644
index 000000000..c50e69e68
--- /dev/null
+++ b/gfx/trade/poof.2bpp
Binary files differ
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