aboutsummaryrefslogtreecommitdiffstats
path: root/engine/movie/intro.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-08-27 12:25:34 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-08-28 09:54:57 -0400
commit407b813250a768a85c619e06c3f1f010575f31c4 (patch)
treedef1d8af1fed5e81c611a08b724cef8429db3ea9 /engine/movie/intro.asm
parentAlign warp and sign coordinates (diff)
downloadpokeyellow-407b813250a768a85c619e06c3f1f010575f31c4.tar.gz
pokeyellow-407b813250a768a85c619e06c3f1f010575f31c4.tar.xz
pokeyellow-407b813250a768a85c619e06c3f1f010575f31c4.zip
Separate splash screen, intro, and credits (like pokegold/pokecrystal)
Diffstat (limited to 'engine/movie/intro.asm')
-rwxr-xr-xengine/movie/intro.asm22
1 files changed, 11 insertions, 11 deletions
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: