ref: 926e2318492341b108d5591e752babc87975a7fc
parent: c5a3429314e26c4a26a1a5ddd5fe4d2d59294b71
author: mid-kid <[email protected]>
date: Fri Aug 21 21:10:17 EDT 2020
Move all splash screen files to gfx/splash
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -886,10 +886,10 @@
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 @@
call ApplyPals
ret
-.GamefreakLogoOBPalette:
-INCLUDE "gfx/splash/logo.pal"
+.GamefreakDittoPalette:
+INCLUDE "gfx/splash/ditto.pal"
_CGB_PlayerOrMonFrontpicPals:
ld de, wBGPals1
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -52,9 +52,9 @@
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 @@
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 @@
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 @@
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]
--- a/gfx/intro/gamefreak_logo.pal
+++ /dev/null
@@ -1,23 +1,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
binary files a/gfx/intro/logo.png /dev/null differ
--- a/gfx/lz.mk
+++ b/gfx/lz.mk
@@ -11,7 +11,6 @@
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
@@ -47,6 +46,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
--- /dev/null
+++ b/gfx/splash/ditto.pal
@@ -1,0 +1,4 @@
+ RGB 31, 31, 31
+ RGB 13, 11, 00
+ RGB 23, 12, 28
+ RGB 00, 00, 00
binary files /dev/null b/gfx/splash/ditto.png differ
--- /dev/null
+++ b/gfx/splash/ditto_fade.pal
@@ -1,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
binary files /dev/null b/gfx/splash/gamefreak_logo.png differ
binary files /dev/null b/gfx/splash/gamefreak_presents.png differ
--- a/gfx/splash/logo.pal
+++ /dev/null
@@ -1,4 +1,0 @@
- RGB 31, 31, 31
- RGB 13, 11, 00
- RGB 23, 12, 28
- RGB 00, 00, 00
binary files a/gfx/splash/logo1.png /dev/null differ
binary files a/gfx/splash/logo2.png /dev/null differ
--- a/main.asm
+++ b/main.asm
@@ -540,8 +540,8 @@
SECTION "Intro Logo", ROMX
-IntroLogoGFX:
-INCBIN "gfx/intro/logo.2bpp.lz"
+GameFreakDittoGFX:
+INCBIN "gfx/splash/ditto.2bpp.lz"
SECTION "Title", ROMX