aboutsummaryrefslogtreecommitdiffstats
path: root/engine
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2018-11-19 13:50:07 -0600
committerGitHub <noreply@github.com>2018-11-19 13:50:07 -0600
commit90430e6dee9e207dc0b618d07566f83617343f60 (patch)
treea7bb211dbc174b5ad9a9866ca163f4bd00c5341e /engine
parentMerge pull request #190 from Pokeglitch/master (diff)
parentSpriteImageBaseOffset -> ImageBaseOffset (diff)
downloadpokeyellow-90430e6dee9e207dc0b618d07566f83617343f60.tar.gz
pokeyellow-90430e6dee9e207dc0b618d07566f83617343f60.tar.xz
pokeyellow-90430e6dee9e207dc0b618d07566f83617343f60.zip
Merge pull request #193 from luckytyphlosion/master
Fix spritestatedata macros and clean up pre-linkerscript remnants.
Diffstat (limited to 'engine')
-rwxr-xr-xengine/intro.asm4
1 files changed, 3 insertions, 1 deletions
diff --git a/engine/intro.asm b/engine/intro.asm
index 4acab5a6..a016b365 100755
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -440,7 +440,9 @@ IntroNidorinoAnimation7:
GameFreakIntro:
INCBIN "gfx/gamefreak_intro.2bpp"
INCBIN "gfx/gamefreak_logo.2bpp"
- ds $10 ; blank tile
+ rept 16
+ db $00 ; blank tile
+ endr
GameFreakIntroEnd:
FightIntroBackMon: