summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--gfx/battle/balls.pngbin0 -> 115 bytes
-rw-r--r--gfx/trade/arrow_left.pngbin0 -> 83 bytes
-rw-r--r--gfx/trade/arrow_right.pngbin0 -> 83 bytes
-rw-r--r--gfx/trade/ball.pngbin0 -> 136 bytes
-rw-r--r--gfx/trade/border_tiles.pngbin0 -> 175 bytes
-rw-r--r--gfx/trade/bubble.pngbin0 -> 123 bytes
-rw-r--r--gfx/trade/cable.pngbin0 -> 100 bytes
-rw-r--r--gfx/trade/game_boy.pngbin0 -> 360 bytes
-rw-r--r--gfx/trade/poof.pngbin0 -> 191 bytes
-rw-r--r--tools/gfx.py15
11 files changed, 16 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a413ae1a..fb1e67e8 100644
--- a/Makefile
+++ b/Makefile
@@ -113,4 +113,4 @@ pngs:
find gfx -iname "*.[12]bpp" -exec touch {} +
find gfx -iname "*.lz" -exec touch {} +
find gfx/pokemon gfx/trainers -iname "*.[1,2]bpp" -delete
- rm gfx/battle/dude.2bpp gfx/player/chris_back.2bpp
+ rm gfx/battle/dude.2bpp gfx/player/chris_back.2bpp gfx/trade/game_boy.2bpp
diff --git a/gfx/battle/balls.png b/gfx/battle/balls.png
new file mode 100644
index 00000000..21bb5e37
--- /dev/null
+++ b/gfx/battle/balls.png
Binary files differ
diff --git a/gfx/trade/arrow_left.png b/gfx/trade/arrow_left.png
new file mode 100644
index 00000000..71520e90
--- /dev/null
+++ b/gfx/trade/arrow_left.png
Binary files differ
diff --git a/gfx/trade/arrow_right.png b/gfx/trade/arrow_right.png
new file mode 100644
index 00000000..eefc41d6
--- /dev/null
+++ b/gfx/trade/arrow_right.png
Binary files differ
diff --git a/gfx/trade/ball.png b/gfx/trade/ball.png
new file mode 100644
index 00000000..b42f2f3d
--- /dev/null
+++ b/gfx/trade/ball.png
Binary files differ
diff --git a/gfx/trade/border_tiles.png b/gfx/trade/border_tiles.png
new file mode 100644
index 00000000..d3ac169f
--- /dev/null
+++ b/gfx/trade/border_tiles.png
Binary files differ
diff --git a/gfx/trade/bubble.png b/gfx/trade/bubble.png
new file mode 100644
index 00000000..a6b17ebe
--- /dev/null
+++ b/gfx/trade/bubble.png
Binary files differ
diff --git a/gfx/trade/cable.png b/gfx/trade/cable.png
new file mode 100644
index 00000000..d06d8a87
--- /dev/null
+++ b/gfx/trade/cable.png
Binary files differ
diff --git a/gfx/trade/game_boy.png b/gfx/trade/game_boy.png
new file mode 100644
index 00000000..64c92260
--- /dev/null
+++ b/gfx/trade/game_boy.png
Binary files differ
diff --git a/gfx/trade/poof.png b/gfx/trade/poof.png
new file mode 100644
index 00000000..1b09874b
--- /dev/null
+++ b/gfx/trade/poof.png
Binary files differ
diff --git a/tools/gfx.py b/tools/gfx.py
index fcdc3f8a..2a3c8891 100644
--- a/tools/gfx.py
+++ b/tools/gfx.py
@@ -104,6 +104,8 @@ def filepath_rules(filepath):
elif 'gfx/battle' in filedir:
if name == 'dude':
args['pic_dimensions'] = 6, 6
+ elif name == 'balls':
+ args['width'] = 32
elif 'gfx/icons' in filedir:
if name == 'mail_big':
@@ -180,6 +182,19 @@ def filepath_rules(filepath):
elif name == 'leaders':
args['width'] = 80
+ elif 'gfx/trade' in filedir:
+ if name in ['arrow_left', 'arrow_right', 'cable']:
+ args['width'] = 8
+ elif name in ['bubble', 'poof']:
+ args['width'] = 16
+ elif name == 'ball':
+ args['width'] = 16
+ args['rows'] = [(0, 1), (0, 1), (0, 2), (0, 2)]
+ elif name == 'border_tiles':
+ args['width'] = 24
+ elif name == 'game_boy':
+ args['width'] = 56
+
elif 'gfx/unknown' in filedir:
if name == 'gfx_170f1':
args['width'] = 128