Separate splash screen, intro, and credits (like pokegold/pokecrystal)

22 files changed, 28 insertions, 28 deletions

diff --git a/Makefile b/Makefile
index 7a8f8ac3..6d432ec9 100644
--- a/Makefile
+++ b/Makefile
@@ -114,16 +114,16 @@ pokeblue_debug_opt = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON BLUE"
 gfx/battle/attack_anim_1.2bpp: tools/gfx += --trim-whitespace
 gfx/battle/attack_anim_2.2bpp: tools/gfx += --trim-whitespace
 
-gfx/intro_credits/blue_jigglypuff_1.2bpp: rgbgfx += -h
-gfx/intro_credits/blue_jigglypuff_2.2bpp: rgbgfx += -h
-gfx/intro_credits/blue_jigglypuff_3.2bpp: rgbgfx += -h
-gfx/intro_credits/red_nidorino_1.2bpp: rgbgfx += -h
-gfx/intro_credits/red_nidorino_2.2bpp: rgbgfx += -h
-gfx/intro_credits/red_nidorino_3.2bpp: rgbgfx += -h
-gfx/intro_credits/gengar.2bpp: rgbgfx += -h
-gfx/intro_credits/gengar.2bpp: tools/gfx += --remove-duplicates --preserve=0x19,0x76
-
-gfx/intro_credits/the_end.2bpp: tools/gfx += --interleave --png=$<
+gfx/intro/blue_jigglypuff_1.2bpp: rgbgfx += -h
+gfx/intro/blue_jigglypuff_2.2bpp: rgbgfx += -h
+gfx/intro/blue_jigglypuff_3.2bpp: rgbgfx += -h
+gfx/intro/red_nidorino_1.2bpp: rgbgfx += -h
+gfx/intro/red_nidorino_2.2bpp: rgbgfx += -h
+gfx/intro/red_nidorino_3.2bpp: rgbgfx += -h
+gfx/intro/gengar.2bpp: rgbgfx += -h
+gfx/intro/gengar.2bpp: tools/gfx += --remove-duplicates --preserve=0x19,0x76
+
+gfx/credits/the_end.2bpp: tools/gfx += --interleave --png=$<
 
 gfx/slots/red_slots_1.2bpp: tools/gfx += --trim-whitespace
 gfx/slots/blue_slots_1.2bpp: tools/gfx += --trim-whitespace
diff --git a/data/tilemaps.asm b/data/tilemaps.asm
index c7efb222..97e687fd 100644
--- a/data/tilemaps.asm
+++ b/data/tilemaps.asm
@@ -31,13 +31,13 @@ SlideDownMonTiles_7x3:
 	INCBIN "gfx/pokemon/slide_down_7x3.tilemap"
 
 GengarIntroTiles1:
-	INCBIN "gfx/intro_credits/gengar_1.tilemap"
+	INCBIN "gfx/intro/gengar_1.tilemap"
 
 GengarIntroTiles2:
-	INCBIN "gfx/intro_credits/gengar_2.tilemap"
+	INCBIN "gfx/intro/gengar_2.tilemap"
 
 GengarIntroTiles3:
-	INCBIN "gfx/intro_credits/gengar_3.tilemap"
+	INCBIN "gfx/intro/gengar_3.tilemap"
 
 GameBoyTiles:
 	INCBIN "gfx/trade/game_boy.tilemap"
diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm
index 6fb0598e..0410de21 100755
--- a/engine/movie/credits.asm
+++ b/engine/movie/credits.asm
@@ -266,5 +266,5 @@ INCLUDE "data/credits/credits_order.asm"
 INCLUDE "data/credits/credits_text.asm"
 
 TheEndGfx:
-	INCBIN "gfx/intro_credits/the_end.2bpp"
+	INCBIN "gfx/credits/the_end.2bpp"
 TheEndGfxEnd:
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index d8ec8e6e..040d643d 100755
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -433,32 +433,32 @@ IntroNidorinoAnimation7:
 	db ANIMATION_END
 
 GameFreakIntro:
-	INCBIN "gfx/intro_credits/gamefreak_presents.2bpp"
-	INCBIN "gfx/intro_credits/gamefreak_logo.2bpp"
+	INCBIN "gfx/splash/gamefreak_presents.2bpp"
+	INCBIN "gfx/splash/gamefreak_logo.2bpp"
 	ds 16, $00 ; blank tile
 GameFreakIntroEnd:
 
 FightIntroBackMon:
-	INCBIN "gfx/intro_credits/gengar.2bpp"
+	INCBIN "gfx/intro/gengar.2bpp"
 	ds 16, $00 ; blank tile
 FightIntroBackMonEnd:
 
-FightIntroFrontMon:
-
 IF DEF(_RED)
-	INCBIN "gfx/intro_credits/red_nidorino_1.2bpp"
+FightIntroFrontMon:
+	INCBIN "gfx/intro/red_nidorino_1.2bpp"
 FightIntroFrontMon2:
-	INCBIN "gfx/intro_credits/red_nidorino_2.2bpp"
+	INCBIN "gfx/intro/red_nidorino_2.2bpp"
 FightIntroFrontMon3:
-	INCBIN "gfx/intro_credits/red_nidorino_3.2bpp"
+	INCBIN "gfx/intro/red_nidorino_3.2bpp"
 ENDC
 
 IF DEF(_BLUE)
-	INCBIN "gfx/intro_credits/blue_jigglypuff_1.2bpp"
+FightIntroFrontMon:
+	INCBIN "gfx/intro/blue_jigglypuff_1.2bpp"
 FightIntroFrontMon2:
-	INCBIN "gfx/intro_credits/blue_jigglypuff_2.2bpp"
+	INCBIN "gfx/intro/blue_jigglypuff_2.2bpp"
 FightIntroFrontMon3:
-	INCBIN "gfx/intro_credits/blue_jigglypuff_3.2bpp"
+	INCBIN "gfx/intro/blue_jigglypuff_3.2bpp"
 ENDC
 
 FightIntroFrontMonEnd:
diff --git a/engine/movie/gamefreak.asm b/engine/movie/splash.asm
index 1f837443..be97b8e5 100755
--- a/engine/movie/gamefreak.asm
+++ b/engine/movie/splash.asm
@@ -239,5 +239,5 @@ GameFreakShootingStarOAMData:
 GameFreakShootingStarOAMDataEnd:
 
 FallingStar:
-	INCBIN "gfx/intro_credits/falling_star.2bpp"
+	INCBIN "gfx/splash/falling_star.2bpp"
 FallingStarEnd:
diff --git a/gfx/intro_credits/the_end.png b/gfx/credits/the_end.png
index 025ebb61..025ebb61 100644
--- a/gfx/intro_credits/the_end.png
+++ b/gfx/credits/the_end.png
diff --git a/gfx/font.asm b/gfx/font.asm
index b3dda1e7..fc2aff4f 100644
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -13,7 +13,7 @@ BattleHudTiles2: INCBIN "gfx/battle/battle_hud_2.1bpp"
 BattleHudTiles3: INCBIN "gfx/battle/battle_hud_3.1bpp"
 BattleHudTiles3End:
 
-NintendoCopyrightLogoGraphics: INCBIN "gfx/intro_credits/copyright.2bpp"
+NintendoCopyrightLogoGraphics: INCBIN "gfx/splash/copyright.2bpp"
 
 GamefreakLogoGraphics: INCBIN "gfx/title/gamefreak_inc.2bpp"
 GamefreakLogoGraphicsEnd:
diff --git a/gfx/intro_credits/blue_jigglypuff_1.png b/gfx/intro/blue_jigglypuff_1.png
index 0e53582c..0e53582c 100644
--- a/gfx/intro_credits/blue_jigglypuff_1.png
+++ b/gfx/intro/blue_jigglypuff_1.png
diff --git a/gfx/intro_credits/blue_jigglypuff_2.png b/gfx/intro/blue_jigglypuff_2.png
index 21107af0..21107af0 100644
--- a/gfx/intro_credits/blue_jigglypuff_2.png
+++ b/gfx/intro/blue_jigglypuff_2.png
diff --git a/gfx/intro_credits/blue_jigglypuff_3.png b/gfx/intro/blue_jigglypuff_3.png
index 1c30a0e8..1c30a0e8 100644
--- a/gfx/intro_credits/blue_jigglypuff_3.png
+++ b/gfx/intro/blue_jigglypuff_3.png
diff --git a/gfx/intro_credits/gengar.png b/gfx/intro/gengar.png
index 9558d1a1..9558d1a1 100644
--- a/gfx/intro_credits/gengar.png
+++ b/gfx/intro/gengar.png
diff --git a/gfx/intro_credits/gengar_1.tilemap b/gfx/intro/gengar_1.tilemap
index c962326a..c962326a 100644
--- a/gfx/intro_credits/gengar_1.tilemap
+++ b/gfx/intro/gengar_1.tilemap
diff --git a/gfx/intro_credits/gengar_2.tilemap b/gfx/intro/gengar_2.tilemap
index a909ba5e..a909ba5e 100644
--- a/gfx/intro_credits/gengar_2.tilemap
+++ b/gfx/intro/gengar_2.tilemap
diff --git a/gfx/intro_credits/gengar_3.tilemap b/gfx/intro/gengar_3.tilemap
index 231106d8..231106d8 100644
--- a/gfx/intro_credits/gengar_3.tilemap
+++ b/gfx/intro/gengar_3.tilemap
diff --git a/gfx/intro_credits/red_nidorino_1.png b/gfx/intro/red_nidorino_1.png
index 4c7804a1..4c7804a1 100644
--- a/gfx/intro_credits/red_nidorino_1.png
+++ b/gfx/intro/red_nidorino_1.png
diff --git a/gfx/intro_credits/red_nidorino_2.png b/gfx/intro/red_nidorino_2.png
index a29a4814..a29a4814 100644
--- a/gfx/intro_credits/red_nidorino_2.png
+++ b/gfx/intro/red_nidorino_2.png
diff --git a/gfx/intro_credits/red_nidorino_3.png b/gfx/intro/red_nidorino_3.png
index e920d55d..e920d55d 100644
--- a/gfx/intro_credits/red_nidorino_3.png
+++ b/gfx/intro/red_nidorino_3.png
diff --git a/gfx/intro_credits/copyright.png b/gfx/splash/copyright.png
index 49174349..49174349 100644
--- a/gfx/intro_credits/copyright.png
+++ b/gfx/splash/copyright.png
diff --git a/gfx/intro_credits/falling_star.png b/gfx/splash/falling_star.png
index 9093bef4..9093bef4 100644
--- a/gfx/intro_credits/falling_star.png
+++ b/gfx/splash/falling_star.png
diff --git a/gfx/intro_credits/gamefreak_logo.png b/gfx/splash/gamefreak_logo.png
index 1671943b..1671943b 100644
--- a/gfx/intro_credits/gamefreak_logo.png
+++ b/gfx/splash/gamefreak_logo.png
diff --git a/gfx/intro_credits/gamefreak_presents.png b/gfx/splash/gamefreak_presents.png
index f65c64ed..f65c64ed 100644
--- a/gfx/intro_credits/gamefreak_presents.png
+++ b/gfx/splash/gamefreak_presents.png
diff --git a/main.asm b/main.asm
index 8e8ee1a1..31506a29 100755
--- a/main.asm
+++ b/main.asm
@@ -314,7 +314,7 @@ INCLUDE "gfx/version.asm"
 
 SECTION "bank1C", ROMX
 
-INCLUDE "engine/movie/gamefreak.asm"
+INCLUDE "engine/movie/splash.asm"
 INCLUDE "engine/movie/hall_of_fame.asm"
 INCLUDE "engine/overworld/healing_machine.asm"
 INCLUDE "engine/overworld/player_animations.asm"