From a594f5e55749adf6c55b981b1d570e1df65a1879 Mon Sep 17 00:00:00 2001 From: entrpntr Date: Fri, 1 May 2020 21:17:42 -0400 Subject: Add PNGs. --- Makefile | 2 +- gfx/battle/balls.png | Bin 0 -> 115 bytes gfx/trade/arrow_left.png | Bin 0 -> 83 bytes gfx/trade/arrow_right.png | Bin 0 -> 83 bytes gfx/trade/ball.png | Bin 0 -> 136 bytes gfx/trade/border_tiles.png | Bin 0 -> 175 bytes gfx/trade/bubble.png | Bin 0 -> 123 bytes gfx/trade/cable.png | Bin 0 -> 100 bytes gfx/trade/game_boy.png | Bin 0 -> 360 bytes gfx/trade/poof.png | Bin 0 -> 191 bytes tools/gfx.py | 15 +++++++++++++++ 11 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 gfx/battle/balls.png create mode 100644 gfx/trade/arrow_left.png create mode 100644 gfx/trade/arrow_right.png create mode 100644 gfx/trade/ball.png create mode 100644 gfx/trade/border_tiles.png create mode 100644 gfx/trade/bubble.png create mode 100644 gfx/trade/cable.png create mode 100644 gfx/trade/game_boy.png create mode 100644 gfx/trade/poof.png 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 Binary files /dev/null and b/gfx/battle/balls.png differ diff --git a/gfx/trade/arrow_left.png b/gfx/trade/arrow_left.png new file mode 100644 index 00000000..71520e90 Binary files /dev/null and b/gfx/trade/arrow_left.png differ diff --git a/gfx/trade/arrow_right.png b/gfx/trade/arrow_right.png new file mode 100644 index 00000000..eefc41d6 Binary files /dev/null and b/gfx/trade/arrow_right.png differ diff --git a/gfx/trade/ball.png b/gfx/trade/ball.png new file mode 100644 index 00000000..b42f2f3d Binary files /dev/null and b/gfx/trade/ball.png differ diff --git a/gfx/trade/border_tiles.png b/gfx/trade/border_tiles.png new file mode 100644 index 00000000..d3ac169f Binary files /dev/null and b/gfx/trade/border_tiles.png differ diff --git a/gfx/trade/bubble.png b/gfx/trade/bubble.png new file mode 100644 index 00000000..a6b17ebe Binary files /dev/null and b/gfx/trade/bubble.png differ diff --git a/gfx/trade/cable.png b/gfx/trade/cable.png new file mode 100644 index 00000000..d06d8a87 Binary files /dev/null and b/gfx/trade/cable.png differ diff --git a/gfx/trade/game_boy.png b/gfx/trade/game_boy.png new file mode 100644 index 00000000..64c92260 Binary files /dev/null and b/gfx/trade/game_boy.png differ diff --git a/gfx/trade/poof.png b/gfx/trade/poof.png new file mode 100644 index 00000000..1b09874b Binary files /dev/null and b/gfx/trade/poof.png 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 -- cgit v1.2.3