Merge pull request #290 from Rangi42/master

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

16 files changed, 1 insertions, 1 deletions

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