summaryrefslogtreecommitdiff
path: root/gfx
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2020-08-22 01:10:17 +0200
committermid-kid <esteve.varela@gmail.com>2020-08-27 13:58:54 +0200
commit926e2318492341b108d5591e752babc87975a7fc (patch)
tree41c7fb03d7b133ab45a0d7e2dc637abbcee34860 /gfx
parentc5a3429314e26c4a26a1a5ddd5fe4d2d59294b71 (diff)
Move all splash screen files to gfx/splash
Diffstat (limited to 'gfx')
-rw-r--r--gfx/lz.mk3
-rw-r--r--gfx/splash/ditto.pal (renamed from gfx/splash/logo.pal)0
-rw-r--r--gfx/splash/ditto.png (renamed from gfx/intro/logo.png)bin944 -> 944 bytes
-rw-r--r--gfx/splash/ditto_fade.pal (renamed from gfx/intro/gamefreak_logo.pal)3
-rw-r--r--gfx/splash/gamefreak_logo.png (renamed from gfx/splash/logo2.png)bin172 -> 172 bytes
-rw-r--r--gfx/splash/gamefreak_presents.png (renamed from gfx/splash/logo1.png)bin364 -> 364 bytes
6 files changed, 2 insertions, 4 deletions
diff --git a/gfx/lz.mk b/gfx/lz.mk
index 131d242e7..c2c7dc23e 100644
--- a/gfx/lz.mk
+++ b/gfx/lz.mk
@@ -11,7 +11,6 @@ gfx/diploma/diploma.2bpp.lz: LZFLAGS += --method 8 --align 1
gfx/dummy_game/dummy_game.2bpp.lz: LZFLAGS += --method 2 --align 4
gfx/intro/%.lz: LZFLAGS += --align 4
-gfx/intro/logo.2bpp.lz: LZFLAGS += --method 2 --align 4
gfx/intro/suicune_close.2bpp.lz: LZFLAGS += --method 2 --align 4
gfx/intro/unown_back.2bpp.lz: LZFLAGS += --method 2 --align 4
@@ -48,6 +47,8 @@ gfx/slots/slots_1.2bpp.lz: LZFLAGS += --method 2 --align 4
gfx/slots/slots_2.2bpp.lz: LZFLAGS += --align 4
gfx/slots/slots_3.2bpp.lz: LZFLAGS += --align 4
+gfx/splash/ditto.2bpp.lz: LZFLAGS += --method 2 --align 4
+
gfx/tilesets/%.lz: LZFLAGS += --align 4
gfx/tilesets/aerodactyl_word_room.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
gfx/tilesets/battle_tower_outside.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
diff --git a/gfx/splash/logo.pal b/gfx/splash/ditto.pal
index b1712efc1..b1712efc1 100644
--- a/gfx/splash/logo.pal
+++ b/gfx/splash/ditto.pal
diff --git a/gfx/intro/logo.png b/gfx/splash/ditto.png
index 0ed4094cf..0ed4094cf 100644
--- a/gfx/intro/logo.png
+++ b/gfx/splash/ditto.png
Binary files differ
diff --git a/gfx/intro/gamefreak_logo.pal b/gfx/splash/ditto_fade.pal
index c3a526b82..91e2641d7 100644
--- a/gfx/intro/gamefreak_logo.pal
+++ b/gfx/splash/ditto_fade.pal
@@ -6,17 +6,14 @@
RGB 23, 12, 27
RGB 23, 13, 26
RGB 23, 13, 24
-
RGB 24, 14, 22
RGB 24, 14, 20
RGB 24, 15, 18
RGB 24, 15, 16
-
RGB 25, 16, 14
RGB 25, 16, 12
RGB 25, 17, 10
RGB 25, 17, 08
-
RGB 26, 18, 06
RGB 26, 18, 04
RGB 26, 19, 02
diff --git a/gfx/splash/logo2.png b/gfx/splash/gamefreak_logo.png
index 7038efb54..7038efb54 100644
--- a/gfx/splash/logo2.png
+++ b/gfx/splash/gamefreak_logo.png
Binary files differ
diff --git a/gfx/splash/logo1.png b/gfx/splash/gamefreak_presents.png
index a02eb08f6..a02eb08f6 100644
--- a/gfx/splash/logo1.png
+++ b/gfx/splash/gamefreak_presents.png
Binary files differ