diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
| commit | 1b895ff52c011d51a9516791148cd5088ba411b5 (patch) | |
| tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /src/title_screen.c | |
| parent | be33878b94cc38913447682d3e34e674df68619f (diff) | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
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[] = { |