From 2354c41a96bdf80861338add2f0b3a67b18f160e Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 16 Jun 2020 11:44:03 -0400 Subject: [PATCH] crystal_intro.asm -> intro.asm --- engine/movie/{crystal_intro.asm => intro.asm} | 3 +++ main.asm | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) rename engine/movie/{crystal_intro.asm => intro.asm} (99%) diff --git a/engine/movie/crystal_intro.asm b/engine/movie/intro.asm similarity index 99% rename from engine/movie/crystal_intro.asm rename to engine/movie/intro.asm index 9fbd67078..0a88f8ab7 100644 --- a/engine/movie/crystal_intro.asm +++ b/engine/movie/intro.asm @@ -1,4 +1,7 @@ Copyright_GFPresents: +; Play the copyright screen and GameFreak Presents sequence. +; Return carry if user cancels animation by pressing a button. + ld de, MUSIC_NONE call PlayMusic call ClearBGPalettes diff --git a/main.asm b/main.asm index b53649cd5..49fc676ae 100644 --- a/main.asm +++ b/main.asm @@ -493,7 +493,7 @@ CopyrightGFX:: INCBIN "gfx/splash/copyright.2bpp" INCLUDE "engine/menus/options_menu.asm" -INCLUDE "engine/movie/crystal_intro.asm" +INCLUDE "engine/movie/intro.asm" SECTION "bank3E", ROMX