From 926e2318492341b108d5591e752babc87975a7fc Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sat, 22 Aug 2020 01:10:17 +0200 Subject: Move all splash screen files to gfx/splash --- engine/gfx/cgb_layouts.asm | 8 ++++---- engine/movie/intro.asm | 20 ++++++++++---------- gfx/intro/gamefreak_logo.pal | 23 ----------------------- gfx/intro/logo.png | Bin 944 -> 0 bytes gfx/lz.mk | 3 ++- gfx/splash/ditto.pal | 4 ++++ gfx/splash/ditto.png | Bin 0 -> 944 bytes gfx/splash/ditto_fade.pal | 20 ++++++++++++++++++++ gfx/splash/gamefreak_logo.png | Bin 0 -> 172 bytes gfx/splash/gamefreak_presents.png | Bin 0 -> 364 bytes gfx/splash/logo.pal | 4 ---- gfx/splash/logo1.png | Bin 364 -> 0 bytes gfx/splash/logo2.png | Bin 172 -> 0 bytes main.asm | 4 ++-- 14 files changed, 42 insertions(+), 44 deletions(-) delete mode 100644 gfx/intro/gamefreak_logo.pal delete mode 100644 gfx/intro/logo.png create mode 100644 gfx/splash/ditto.pal create mode 100644 gfx/splash/ditto.png create mode 100644 gfx/splash/ditto_fade.pal create mode 100644 gfx/splash/gamefreak_logo.png create mode 100644 gfx/splash/gamefreak_presents.png delete mode 100644 gfx/splash/logo.pal delete mode 100644 gfx/splash/logo1.png delete mode 100644 gfx/splash/logo2.png diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index c58b27cd9..d9bd9a915 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -886,10 +886,10 @@ _CGB_GamefreakLogo: ld a, PREDEFPAL_GAMEFREAK_LOGO_BG call GetPredefPal call LoadHLPaletteIntoDE - ld hl, .GamefreakLogoOBPalette + ld hl, .GamefreakDittoPalette ld de, wOBPals1 call LoadHLPaletteIntoDE - ld hl, .GamefreakLogoOBPalette + ld hl, .GamefreakDittoPalette ld de, wOBPals1 palette 1 call LoadHLPaletteIntoDE call WipeAttrmap @@ -897,8 +897,8 @@ _CGB_GamefreakLogo: call ApplyPals ret -.GamefreakLogoOBPalette: -INCLUDE "gfx/splash/logo.pal" +.GamefreakDittoPalette: +INCLUDE "gfx/splash/ditto.pal" _CGB_PlayerOrMonFrontpicPals: ld de, wBGPals1 diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm index c05d1202c..fff4b6436 100644 --- a/engine/movie/intro.asm +++ b/engine/movie/intro.asm @@ -52,9 +52,9 @@ Copyright_GameFreakPresents: ret .GetGFLogoGFX: - ld de, GameFreakLogo + ld de, GameFreakLogoGFX ld hl, vTiles2 - lb bc, BANK(GameFreakLogo), 28 + lb bc, BANK(GameFreakLogoGFX), 28 call Get1bpp ldh a, [rSVBK] @@ -62,9 +62,9 @@ Copyright_GameFreakPresents: ld a, BANK(wDecompressScratch) ldh [rSVBK], a - ld hl, IntroLogoGFX + ld hl, GameFreakDittoGFX ld de, wDecompressScratch - ld a, BANK(IntroLogoGFX) + ld a, BANK(GameFreakDittoGFX) call FarDecompress ld hl, vTiles0 @@ -295,7 +295,7 @@ GameFreakLogoScene4: srl a ld e, a ld d, $0 - ld hl, GameFreakLogoPalettes + ld hl, GameFreakDittoPaletteFade add hl, de add hl, de ldh a, [rSVBK] @@ -320,12 +320,12 @@ GameFreakLogoScene4: GameFreakLogoScene5: ret -GameFreakLogoPalettes: -INCLUDE "gfx/intro/gamefreak_logo.pal" +GameFreakDittoPaletteFade: +INCLUDE "gfx/splash/ditto_fade.pal" -GameFreakLogo: -INCBIN "gfx/splash/logo1.1bpp" -INCBIN "gfx/splash/logo2.1bpp" +GameFreakLogoGFX: +INCBIN "gfx/splash/gamefreak_presents.1bpp" +INCBIN "gfx/splash/gamefreak_logo.1bpp" CrystalIntro: ldh a, [rSVBK] diff --git a/gfx/intro/gamefreak_logo.pal b/gfx/intro/gamefreak_logo.pal deleted file mode 100644 index c3a526b82..000000000 --- a/gfx/intro/gamefreak_logo.pal +++ /dev/null @@ -1,23 +0,0 @@ -; Ditto's color as it turns into the Game Freak logo. -; Fade from pink to orange. -; One color per step. - - RGB 23, 12, 28 - 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 - RGB 26, 19, 00 diff --git a/gfx/intro/logo.png b/gfx/intro/logo.png deleted file mode 100644 index 0ed4094cf..000000000 Binary files a/gfx/intro/logo.png and /dev/null differ 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/ditto.pal b/gfx/splash/ditto.pal new file mode 100644 index 000000000..b1712efc1 --- /dev/null +++ b/gfx/splash/ditto.pal @@ -0,0 +1,4 @@ + RGB 31, 31, 31 + RGB 13, 11, 00 + RGB 23, 12, 28 + RGB 00, 00, 00 diff --git a/gfx/splash/ditto.png b/gfx/splash/ditto.png new file mode 100644 index 000000000..0ed4094cf Binary files /dev/null and b/gfx/splash/ditto.png differ diff --git a/gfx/splash/ditto_fade.pal b/gfx/splash/ditto_fade.pal new file mode 100644 index 000000000..91e2641d7 --- /dev/null +++ b/gfx/splash/ditto_fade.pal @@ -0,0 +1,20 @@ +; Ditto's color as it turns into the Game Freak logo. +; Fade from pink to orange. +; One color per step. + + RGB 23, 12, 28 + 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 + RGB 26, 19, 00 diff --git a/gfx/splash/gamefreak_logo.png b/gfx/splash/gamefreak_logo.png new file mode 100644 index 000000000..7038efb54 Binary files /dev/null and b/gfx/splash/gamefreak_logo.png differ diff --git a/gfx/splash/gamefreak_presents.png b/gfx/splash/gamefreak_presents.png new file mode 100644 index 000000000..a02eb08f6 Binary files /dev/null and b/gfx/splash/gamefreak_presents.png differ diff --git a/gfx/splash/logo.pal b/gfx/splash/logo.pal deleted file mode 100644 index b1712efc1..000000000 --- a/gfx/splash/logo.pal +++ /dev/null @@ -1,4 +0,0 @@ - RGB 31, 31, 31 - RGB 13, 11, 00 - RGB 23, 12, 28 - RGB 00, 00, 00 diff --git a/gfx/splash/logo1.png b/gfx/splash/logo1.png deleted file mode 100644 index a02eb08f6..000000000 Binary files a/gfx/splash/logo1.png and /dev/null differ diff --git a/gfx/splash/logo2.png b/gfx/splash/logo2.png deleted file mode 100644 index 7038efb54..000000000 Binary files a/gfx/splash/logo2.png and /dev/null differ diff --git a/main.asm b/main.asm index 3a83ccbbe..12549157f 100644 --- a/main.asm +++ b/main.asm @@ -540,8 +540,8 @@ INCLUDE "mobile/mobile_42.asm" SECTION "Intro Logo", ROMX -IntroLogoGFX: -INCBIN "gfx/intro/logo.2bpp.lz" +GameFreakDittoGFX: +INCBIN "gfx/splash/ditto.2bpp.lz" SECTION "Title", ROMX -- cgit v1.2.3