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/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 similarity index 100% rename from gfx/splash/logo.pal rename to gfx/splash/ditto.pal diff --git a/gfx/intro/logo.png b/gfx/splash/ditto.png similarity index 100% rename from gfx/intro/logo.png rename to gfx/splash/ditto.png diff --git a/gfx/intro/gamefreak_logo.pal b/gfx/splash/ditto_fade.pal similarity index 99% rename from gfx/intro/gamefreak_logo.pal rename to 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 similarity index 100% rename from gfx/splash/logo2.png rename to gfx/splash/gamefreak_logo.png diff --git a/gfx/splash/logo1.png b/gfx/splash/gamefreak_presents.png similarity index 100% rename from gfx/splash/logo1.png rename to gfx/splash/gamefreak_presents.png 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