summaryrefslogtreecommitdiff
path: root/engine/intro.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-06-27 16:27:30 -0400
committerRangi <35663410+Rangi42@users.noreply.github.com>2020-06-27 21:43:32 -0400
commitd5089d3c623e2b147b035cf12569810d604bf47d (patch)
tree9d64a8943a11fef8a2b1afe0c4c8eda29e4ecfe1 /engine/intro.asm
parent4b853ad676e061a6c4b0fcc030855a2705776864 (diff)
Organize gfx/
Diffstat (limited to 'engine/intro.asm')
-rwxr-xr-xengine/intro.asm24
1 files changed, 11 insertions, 13 deletions
diff --git a/engine/intro.asm b/engine/intro.asm
index a016b365..9a13c96f 100755
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -438,35 +438,33 @@ IntroNidorinoAnimation7:
db ANIMATION_END
GameFreakIntro:
- INCBIN "gfx/gamefreak_intro.2bpp"
- INCBIN "gfx/gamefreak_logo.2bpp"
- rept 16
- db $00 ; blank tile
- endr
+ INCBIN "gfx/intro_credits/gamefreak_presents.2bpp"
+ INCBIN "gfx/intro_credits/gamefreak_logo.2bpp"
+ ds 16, $00 ; blank tile
GameFreakIntroEnd:
FightIntroBackMon:
- INCBIN "gfx/intro_fight.2bpp"
+ INCBIN "gfx/intro_credits/gengar.2bpp"
FightIntroBackMonEnd:
FightIntroFrontMon:
IF DEF(_RED)
- INCBIN "gfx/red/intro_nido_1.2bpp"
+ INCBIN "gfx/intro_credits/red_nidorino_1.2bpp"
FightIntroFrontMon2:
- INCBIN "gfx/red/intro_nido_2.2bpp"
+ INCBIN "gfx/intro_credits/red_nidorino_2.2bpp"
FightIntroFrontMon3:
- INCBIN "gfx/red/intro_nido_3.2bpp"
+ INCBIN "gfx/intro_credits/red_nidorino_3.2bpp"
ENDC
IF DEF(_BLUE)
- INCBIN "gfx/blue/intro_purin_1.2bpp"
+ INCBIN "gfx/intro_credits/blue_jigglypuff_1.2bpp"
FightIntroFrontMon2:
- INCBIN "gfx/blue/intro_purin_2.2bpp"
+ INCBIN "gfx/intro_credits/blue_jigglypuff_2.2bpp"
FightIntroFrontMon3:
- INCBIN "gfx/blue/intro_purin_3.2bpp"
+ INCBIN "gfx/intro_credits/blue_jigglypuff_3.2bpp"
ENDC
FightIntroFrontMonEnd:
- ds $10 ; blank tile
+ ds 16, $00 ; blank tile