summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-06-21 23:45:01 -0400
committeryenatch <yenatch@gmail.com>2017-06-21 23:45:01 -0400
commit647f9b4452fb166fedbbb987808bb0dae9623db2 (patch)
treeef2c72de74d2708cfd41e00da2236143a59fe63e
parent967b0898a9f1cd4d31fb6ecc5a95f0a72ba33941 (diff)
pngs in gfx/title
-rw-r--r--Makefile5
-rw-r--r--engine/title.asm6
-rw-r--r--gfx/title/crystal.2bpp.lz.cd5aabdd (renamed from gfx/title/crystal.w48.interleave.2bpp.lz)bin496 -> 496 bytes
-rw-r--r--gfx/title/crystal.pngbin0 -> 507 bytes
-rw-r--r--gfx/title/logo.2bpp.lz.f22013e3 (renamed from gfx/title/logo.w160.t4.2bpp.lz)bin2504 -> 2504 bytes
-rw-r--r--gfx/title/logo.pngbin0 -> 1044 bytes
-rw-r--r--gfx/title/old_bg.2bppbin4096 -> 0 bytes
-rw-r--r--gfx/title/old_bg.pngbin0 -> 1770 bytes
-rw-r--r--gfx/title/old_fg.2bppbin4096 -> 0 bytes
-rw-r--r--gfx/title/old_fg.pngbin0 -> 691 bytes
-rw-r--r--gfx/title/suicune.2bpp.lz.30e490d0 (renamed from gfx/title/suicune.w128.2bpp.lz)bin992 -> 992 bytes
-rw-r--r--gfx/title/suicune.pngbin0 -> 809 bytes
12 files changed, 8 insertions, 3 deletions
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
index 9dcbafc86..9dcbafc86 100644
--- a/gfx/title/crystal.w48.interleave.2bpp.lz
+++ b/gfx/title/crystal.2bpp.lz.cd5aabdd
Binary files differ
diff --git a/gfx/title/crystal.png b/gfx/title/crystal.png
new file mode 100644
index 000000000..6f430cf1f
--- /dev/null
+++ b/gfx/title/crystal.png
Binary files differ
diff --git a/gfx/title/logo.w160.t4.2bpp.lz b/gfx/title/logo.2bpp.lz.f22013e3
index 0fa7d7744..0fa7d7744 100644
--- a/gfx/title/logo.w160.t4.2bpp.lz
+++ b/gfx/title/logo.2bpp.lz.f22013e3
Binary files differ
diff --git a/gfx/title/logo.png b/gfx/title/logo.png
new file mode 100644
index 000000000..2bfff59c9
--- /dev/null
+++ b/gfx/title/logo.png
Binary files differ
diff --git a/gfx/title/old_bg.2bpp b/gfx/title/old_bg.2bpp
deleted file mode 100644
index 0f2375ec2..000000000
--- a/gfx/title/old_bg.2bpp
+++ /dev/null
Binary files differ
diff --git a/gfx/title/old_bg.png b/gfx/title/old_bg.png
new file mode 100644
index 000000000..2b6d5db20
--- /dev/null
+++ b/gfx/title/old_bg.png
Binary files differ
diff --git a/gfx/title/old_fg.2bpp b/gfx/title/old_fg.2bpp
deleted file mode 100644
index 5e291ac33..000000000
--- a/gfx/title/old_fg.2bpp
+++ /dev/null
Binary files differ
diff --git a/gfx/title/old_fg.png b/gfx/title/old_fg.png
new file mode 100644
index 000000000..1a7351d58
--- /dev/null
+++ b/gfx/title/old_fg.png
Binary files differ
diff --git a/gfx/title/suicune.w128.2bpp.lz b/gfx/title/suicune.2bpp.lz.30e490d0
index 359fd93ca..359fd93ca 100644
--- a/gfx/title/suicune.w128.2bpp.lz
+++ b/gfx/title/suicune.2bpp.lz.30e490d0
Binary files differ
diff --git a/gfx/title/suicune.png b/gfx/title/suicune.png
new file mode 100644
index 000000000..074a8ebf7
--- /dev/null
+++ b/gfx/title/suicune.png
Binary files differ