diff options
author | scnorton <scnorton@biociphers.org> | 2017-06-21 12:43:59 -0400 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2017-06-21 12:43:59 -0400 |
commit | 99f9d40be14633630503ebcd75787fc7fdfe1486 (patch) | |
tree | c3962867c76bca0f06311bc39791aa42889e877d /src/title_screen.c | |
parent | 294cbd8beb08b14a24385a78f1a8435f5fbe2f8c (diff) | |
parent | 42ae04c74fe07d05175efb4df143dbcf1b2752bc (diff) |
Merge remote-tracking branch 'origin/master' into field_specials
Diffstat (limited to 'src/title_screen.c')
-rw-r--r-- | src/title_screen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/title_screen.c b/src/title_screen.c index 12c31d10a..dd06956c3 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -152,7 +152,7 @@ static const struct SpriteTemplate sVersionBannerRightSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallback_VersionBannerRight, }; -static const struct SpriteSheet gUnknown_08393EFC[] = +static const struct CompressedSpriteSheet gUnknown_08393EFC[] = { {gVersionTiles, 0x1000, 1000}, {NULL}, @@ -234,7 +234,7 @@ static const struct SpriteTemplate sStartCopyrightBannerSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallback_PressStartCopyrightBanner, }; -static const struct SpriteSheet gUnknown_08393F8C[] = +static const struct CompressedSpriteSheet gUnknown_08393F8C[] = { {gTitleScreenPressStart_Gfx, 0x520, 1001}, {NULL}, @@ -279,7 +279,7 @@ static const struct SpriteTemplate sPokemonLogoShineSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallback_PokemonLogoShine, }; -static const struct SpriteSheet sPokemonLogoShineSpriteSheet[] = +static const struct CompressedSpriteSheet sPokemonLogoShineSpriteSheet[] = { {sLogoShineTiles, 0x800, 1002}, {NULL}, |