From 647f9b4452fb166fedbbb987808bb0dae9623db2 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 21 Jun 2017 23:45:01 -0400 Subject: pngs in gfx/title --- Makefile | 5 +++++ engine/title.asm | 6 +++--- gfx/title/crystal.2bpp.lz.cd5aabdd | Bin 0 -> 496 bytes gfx/title/crystal.png | Bin 0 -> 507 bytes gfx/title/crystal.w48.interleave.2bpp.lz | Bin 496 -> 0 bytes gfx/title/logo.2bpp.lz.f22013e3 | Bin 0 -> 2504 bytes gfx/title/logo.png | Bin 0 -> 1044 bytes gfx/title/logo.w160.t4.2bpp.lz | Bin 2504 -> 0 bytes gfx/title/old_bg.2bpp | Bin 4096 -> 0 bytes gfx/title/old_bg.png | Bin 0 -> 1770 bytes gfx/title/old_fg.2bpp | Bin 4096 -> 0 bytes gfx/title/old_fg.png | Bin 0 -> 691 bytes gfx/title/suicune.2bpp.lz.30e490d0 | Bin 0 -> 992 bytes gfx/title/suicune.png | Bin 0 -> 809 bytes gfx/title/suicune.w128.2bpp.lz | Bin 992 -> 0 bytes 15 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 gfx/title/crystal.2bpp.lz.cd5aabdd create mode 100644 gfx/title/crystal.png delete mode 100644 gfx/title/crystal.w48.interleave.2bpp.lz create mode 100644 gfx/title/logo.2bpp.lz.f22013e3 create mode 100644 gfx/title/logo.png delete mode 100644 gfx/title/logo.w160.t4.2bpp.lz delete mode 100644 gfx/title/old_bg.2bpp create mode 100644 gfx/title/old_bg.png delete mode 100644 gfx/title/old_fg.2bpp create mode 100644 gfx/title/old_fg.png create mode 100644 gfx/title/suicune.2bpp.lz.30e490d0 create mode 100644 gfx/title/suicune.png delete mode 100644 gfx/title/suicune.w128.2bpp.lz diff --git a/Makefile b/Makefile index 380c61324..9227fc660 100644 --- a/Makefile +++ b/Makefile @@ -122,6 +122,11 @@ gfx/mail/0b9cfe.1bpp: tools/gfx += --remove-whitespace gfx/pokedex/%.2bpp: tools/gfx += --trim-whitespace +gfx/title/crystal.2bpp: tools/gfx += --interleave --width=48 +gfx/title/old_fg.2bpp: tools/gfx += --interleave --width=64 +gfx/title/logo.2bpp: rgbgfx += -x 4 + + %.bin: ; %.blk: ; diff --git a/engine/title.asm b/engine/title.asm index 787872939..36e2851d3 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -387,15 +387,15 @@ AnimateTitleCrystal: ; 10ef32 ; 10ef46 TitleSuicuneGFX: ; 10ef46 -INCBIN "gfx/title/suicune.w128.2bpp.lz" +INCBIN "gfx/title/suicune.2bpp.lz" ; 10f326 TitleLogoGFX: ; 10f326 -INCBIN "gfx/title/logo.w160.t4.2bpp.lz" +INCBIN "gfx/title/logo.2bpp.lz" ; 10fcee TitleCrystalGFX: ; 10fcee -INCBIN "gfx/title/crystal.w48.interleave.2bpp.lz" +INCBIN "gfx/title/crystal.2bpp.lz" ; 10fede TitleScreenPalettes: diff --git a/gfx/title/crystal.2bpp.lz.cd5aabdd b/gfx/title/crystal.2bpp.lz.cd5aabdd new file mode 100644 index 000000000..9dcbafc86 Binary files /dev/null and b/gfx/title/crystal.2bpp.lz.cd5aabdd differ diff --git a/gfx/title/crystal.png b/gfx/title/crystal.png new file mode 100644 index 000000000..6f430cf1f Binary files /dev/null and b/gfx/title/crystal.png differ diff --git a/gfx/title/crystal.w48.interleave.2bpp.lz b/gfx/title/crystal.w48.interleave.2bpp.lz deleted file mode 100644 index 9dcbafc86..000000000 Binary files a/gfx/title/crystal.w48.interleave.2bpp.lz and /dev/null differ diff --git a/gfx/title/logo.2bpp.lz.f22013e3 b/gfx/title/logo.2bpp.lz.f22013e3 new file mode 100644 index 000000000..0fa7d7744 Binary files /dev/null and b/gfx/title/logo.2bpp.lz.f22013e3 differ diff --git a/gfx/title/logo.png b/gfx/title/logo.png new file mode 100644 index 000000000..2bfff59c9 Binary files /dev/null and b/gfx/title/logo.png differ diff --git a/gfx/title/logo.w160.t4.2bpp.lz b/gfx/title/logo.w160.t4.2bpp.lz deleted file mode 100644 index 0fa7d7744..000000000 Binary files a/gfx/title/logo.w160.t4.2bpp.lz and /dev/null differ diff --git a/gfx/title/old_bg.2bpp b/gfx/title/old_bg.2bpp deleted file mode 100644 index 0f2375ec2..000000000 Binary files a/gfx/title/old_bg.2bpp and /dev/null differ diff --git a/gfx/title/old_bg.png b/gfx/title/old_bg.png new file mode 100644 index 000000000..2b6d5db20 Binary files /dev/null and b/gfx/title/old_bg.png differ diff --git a/gfx/title/old_fg.2bpp b/gfx/title/old_fg.2bpp deleted file mode 100644 index 5e291ac33..000000000 Binary files a/gfx/title/old_fg.2bpp and /dev/null differ diff --git a/gfx/title/old_fg.png b/gfx/title/old_fg.png new file mode 100644 index 000000000..1a7351d58 Binary files /dev/null and b/gfx/title/old_fg.png differ diff --git a/gfx/title/suicune.2bpp.lz.30e490d0 b/gfx/title/suicune.2bpp.lz.30e490d0 new file mode 100644 index 000000000..359fd93ca Binary files /dev/null and b/gfx/title/suicune.2bpp.lz.30e490d0 differ diff --git a/gfx/title/suicune.png b/gfx/title/suicune.png new file mode 100644 index 000000000..074a8ebf7 Binary files /dev/null and b/gfx/title/suicune.png differ diff --git a/gfx/title/suicune.w128.2bpp.lz b/gfx/title/suicune.w128.2bpp.lz deleted file mode 100644 index 359fd93ca..000000000 Binary files a/gfx/title/suicune.w128.2bpp.lz and /dev/null differ -- cgit v1.2.3