diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-20 20:41:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 20:41:33 -0400 |
| commit | 4ba573ed1eba7c37160ce6107d95447f42902385 (patch) | |
| tree | 5973f1e72156bb75cb6561a11dd7f333b90fcb3f /src/title_screen.c | |
| parent | 13b02fc8232ce61062afe46ca13a1930a3bbc286 (diff) | |
| parent | b22e5219ba01c70da9a03397430bff10d0b99060 (diff) | |
Merge branch 'master' into patch-1
Diffstat (limited to 'src/title_screen.c')
| -rw-r--r-- | src/title_screen.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/title_screen.c b/src/title_screen.c index 241e5489e..dd06956c3 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -1,7 +1,6 @@ #include "global.h" #include "gba/m4a_internal.h" #include "title_screen.h" -#include "asm.h" #include "clear_save_data_menu.h" #include "decompress.h" #include "event_data.h" @@ -10,9 +9,11 @@ #include "main.h" #include "main_menu.h" #include "palette.h" +#include "reset_rtc_screen.h" #include "sound.h" #include "sprite.h" #include "task.h" +#include "unknown_task.h" extern u8 gReservedSpritePaletteCount; extern struct MusicPlayerInfo gMPlay_BGM; @@ -151,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}, @@ -233,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}, @@ -278,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}, |