diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-08-29 01:04:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-29 01:04:24 -0400 |
| commit | 4ef305907206bdb90c3c9259f6d527a90b26629c (patch) | |
| tree | ed116b29979bb2aeb3a02789aa92d3769278361a /engine/movie/intro.asm | |
| parent | Align warp and sign coordinates (diff) | |
| parent | Use decimal, not hex, for sprite (object) coordinates in map scripts (diff) | |
| download | pokeyellow-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 'engine/movie/intro.asm')
| -rwxr-xr-x | engine/movie/intro.asm | 22 |
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: |