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 | |
| parent | 48da6c53be768e85b8ba47430e2fc0f3dd4de61e (diff) | |
| parent | 637f38b139c43c15eb1f4a67562a78389d4f42a7 (diff) | |
Merge pull request #290 from Rangi42/master
Separate splash screen, intro, and credits (like pokegold/pokecrystal)
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/movie/credits.asm | 2 | ||||
| -rwxr-xr-x | engine/movie/intro.asm | 22 | ||||
| -rwxr-xr-x | engine/movie/splash.asm (renamed from engine/movie/gamefreak.asm) | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index 6fb0598e..0410de21 100755 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -266,5 +266,5 @@ INCLUDE "data/credits/credits_order.asm" INCLUDE "data/credits/credits_text.asm" TheEndGfx: - INCBIN "gfx/intro_credits/the_end.2bpp" + INCBIN "gfx/credits/the_end.2bpp" TheEndGfxEnd: 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: diff --git a/engine/movie/gamefreak.asm b/engine/movie/splash.asm index 1f837443..be97b8e5 100755 --- a/engine/movie/gamefreak.asm +++ b/engine/movie/splash.asm @@ -239,5 +239,5 @@ GameFreakShootingStarOAMData: GameFreakShootingStarOAMDataEnd: FallingStar: - INCBIN "gfx/intro_credits/falling_star.2bpp" + INCBIN "gfx/splash/falling_star.2bpp" FallingStarEnd: |