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.w48.interleave.2bpp.lz b/gfx/title/crystal.2bpp.lz.cd5aabdd similarity index 100% rename from gfx/title/crystal.w48.interleave.2bpp.lz rename to gfx/title/crystal.2bpp.lz.cd5aabdd 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/logo.w160.t4.2bpp.lz b/gfx/title/logo.2bpp.lz.f22013e3 similarity index 100% rename from gfx/title/logo.w160.t4.2bpp.lz rename to gfx/title/logo.2bpp.lz.f22013e3 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/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.w128.2bpp.lz b/gfx/title/suicune.2bpp.lz.30e490d0 similarity index 100% rename from gfx/title/suicune.w128.2bpp.lz rename to gfx/title/suicune.2bpp.lz.30e490d0 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