Move all splash screen files to gfx/splash

7 files changed, 11 insertions, 12 deletions

diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index c9f9ac11..c255879a 100644
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -47,14 +47,14 @@ Copyright_GameFreakPresents:
 .GetGFLogoGFX:
 ; Load gfx and initialize variables
 
-	ld de, GameFreakPresentsGFX1
+	ld de, GameFreakLogoGFX
 	ld hl, vTiles1
-	lb bc, BANK(GameFreakPresentsGFX1), 28
+	lb bc, BANK(GameFreakLogoGFX), 28
 	call Get1bpp
 
-	ld de, GameFreakPresentsGFX2
+	ld de, GameFreakLogoStarsGFX
 	ld hl, vTiles1 tile 28
-	lb bc, BANK(GameFreakPresentsGFX2), 5
+	lb bc, BANK(GameFreakLogoStarsGFX), 5
 	call Request2bpp
 
 	farcall ClearSpriteAnims
@@ -333,14 +333,13 @@ GameFreakPresents_Sparkle:
 	db $34, $02
 	db $3c, $04
 
-GameFreakPresentsGFX1:
-INCBIN "gfx/intro/gamefreak_presents.1bpp"
-INCBIN "gfx/intro/gamefreak_logo.1bpp"
-
-GameFreakPresentsGFX2:
-INCBIN "gfx/intro/logo_star.2bpp"
-INCBIN "gfx/intro/logo_sparkle.2bpp"
+GameFreakLogoGFX:
+INCBIN "gfx/splash/gamefreak_presents.1bpp"
+INCBIN "gfx/splash/gamefreak_logo.1bpp"
 
+GameFreakLogoStarsGFX:
+INCBIN "gfx/splash/logo_star.2bpp"
+INCBIN "gfx/splash/logo_sparkle.2bpp"
 
 GoldSilverIntro:
 	call .Init
diff --git a/gfx/intro/copyright.png b/gfx/splash/copyright.png
index 0ad7c2ef..0ad7c2ef 100644
--- a/gfx/intro/copyright.png
+++ b/gfx/splash/copyright.png
diff --git a/gfx/intro/gamefreak_logo.png b/gfx/splash/gamefreak_logo.png
index 7038efb5..7038efb5 100644
--- a/gfx/intro/gamefreak_logo.png
+++ b/gfx/splash/gamefreak_logo.png
diff --git a/gfx/intro/gamefreak_presents.png b/gfx/splash/gamefreak_presents.png
index d5ff5c43..d5ff5c43 100644
--- a/gfx/intro/gamefreak_presents.png
+++ b/gfx/splash/gamefreak_presents.png
diff --git a/gfx/intro/logo_sparkle.png b/gfx/splash/logo_sparkle.png
index feaa9c1f..feaa9c1f 100644
--- a/gfx/intro/logo_sparkle.png
+++ b/gfx/splash/logo_sparkle.png
diff --git a/gfx/intro/logo_star.png b/gfx/splash/logo_star.png
index 8fc2f734..8fc2f734 100644
--- a/gfx/intro/logo_star.png
+++ b/gfx/splash/logo_star.png
diff --git a/main.asm b/main.asm
index 31197dbc..b4308706 100644
--- a/main.asm
+++ b/main.asm
@@ -327,7 +327,7 @@ INCLUDE "engine/pokemon/bills_pc.asm"
 SECTION "bank39", ROMX
 
 CopyrightGFX::
-INCBIN "gfx/intro/copyright.2bpp"
+INCBIN "gfx/splash/copyright.2bpp"
 
 IF DEF(_GOLD)
 TitleScreenGFX3: