diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 20:20:56 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 20:20:56 -0600 |
| commit | 18839a4872057fde33be45c5d2c4ecf4274bcc8d (patch) | |
| tree | 5f48809915af5d02c2f75efc790bd598ed9f3975 /src/title_screen.c | |
| parent | 054a015c950ca9869ce28245a2f13c3f72cddb37 (diff) | |
| parent | 93ff71fcfdf8b71a7b4899f271a5214503bcd510 (diff) | |
Merge remote-tracking branch 'pret/master' into script_menu
Diffstat (limited to 'src/title_screen.c')
| -rw-r--r-- | src/title_screen.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/title_screen.c b/src/title_screen.c index 8a2c01192..40e0f5b2f 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -18,6 +18,7 @@ #include "scanline_effect.h" #include "gpu_regs.h" #include "trig.h" +#include "graphics.h" #include "constants/rgb.h" #include "constants/songs.h" @@ -39,15 +40,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM; extern u16 gBattle_BG1_X; extern u16 gBattle_BG1_Y; -extern const u8 gTitleScreenEmeraldVersionGfx[]; -extern const u8 gTitleScreenPressStartGfx[]; -extern const u8 gTitleScreenPokemonLogoGfx[]; -extern const u8 gUnknown_08DE0644[]; -extern const u8 gUnknown_08DDE458[]; -extern const u16 gTitleScreenBgPalettes[]; -extern const u16 gTitleScreenPressStartPal[]; -extern const u16 gTitleScreenEmeraldVersionPal[]; - // this file's functions static void MainCB2(void); static void Task_TitleScreenPhase1(u8); @@ -68,10 +60,10 @@ static void SpriteCB_PokemonLogoShine(struct Sprite *sprite); // const rom data static const u16 sUnusedUnknownPal[] = INCBIN_U16("graphics/title_screen/unk_853EF78.gbapal"); -static const u8 sTitleScreenRayquazaGfx[] = INCBIN_U8("graphics/title_screen/rayquaza.4bpp.lz"); -static const u8 sTitleScreenRayquazaTilemap[] = INCBIN_U8("graphics/title_screen/rayquaza.bin.lz"); -static const u8 sTitleScreenLogoShineGfx[] = INCBIN_U8("graphics/title_screen/logo_shine.4bpp.lz"); -static const u8 sTitleScreenCloudsGfx[] = INCBIN_U8("graphics/title_screen/clouds.4bpp.lz"); +static const u32 sTitleScreenRayquazaGfx[] = INCBIN_U32("graphics/title_screen/rayquaza.4bpp.lz"); +static const u32 sTitleScreenRayquazaTilemap[] = INCBIN_U32("graphics/title_screen/rayquaza.bin.lz"); +static const u32 sTitleScreenLogoShineGfx[] = INCBIN_U32("graphics/title_screen/logo_shine.4bpp.lz"); +static const u32 sTitleScreenCloudsGfx[] = INCBIN_U32("graphics/title_screen/clouds.4bpp.lz"); const u16 gUnknown_0853FF70[] = { |