aboutsummaryrefslogtreecommitdiffstats
path: root/main.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-08-29 01:04:24 -0400
committerGitHub <noreply@github.com>2020-08-29 01:04:24 -0400
commit4ef305907206bdb90c3c9259f6d527a90b26629c (patch)
treeed116b29979bb2aeb3a02789aa92d3769278361a /main.asm
parentAlign warp and sign coordinates (diff)
parentUse decimal, not hex, for sprite (object) coordinates in map scripts (diff)
downloadpokeyellow-4ef305907206bdb90c3c9259f6d527a90b26629c.tar.gz
pokeyellow-4ef305907206bdb90c3c9259f6d527a90b26629c.tar.xz
pokeyellow-4ef305907206bdb90c3c9259f6d527a90b26629c.zip
Merge pull request #290 from Rangi42/master
Separate splash screen, intro, and credits (like pokegold/pokecrystal)
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm2
1 files changed, 1 insertions, 1 deletions
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"