diff options
Diffstat (limited to 'src/title_screen.c')
| -rw-r--r-- | src/title_screen.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/title_screen.c b/src/title_screen.c index d5cfa032b..ffa803d2e 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -1,17 +1,18 @@ #include "global.h" +#include "title_screen.h" +#include "asm.h" +#include "clear_save_data_menu.h" +#include "m4a.h" +#include "main_menu.h" +#include "intro.h" #include "gba/m4a_internal.h" #include "main.h" #include "palette.h" #include "sound.h" #include "sprite.h" #include "task.h" - -extern void m4aSongNumStart(u16); -extern void LoadCompressedObjectPic(void *); -extern void CB2_InitCopyrightScreen(void); -extern void CB2_InitMainMenu(void); -extern void CB2_InitClearSaveDataScreen(void); -extern void CB2_InitResetRtcScreen(void); +#include "decompress.h" +#include "event_data.h" extern u8 gReservedSpritePaletteCount; extern struct MusicPlayerInfo gMPlay_BGM; @@ -25,12 +26,12 @@ extern u8 gUnknown_08393BF8[]; extern u16 gUnknown_08393E64[]; extern struct SpriteTemplate gSpriteTemplate_8393ECC; extern struct SpriteTemplate gSpriteTemplate_8393EE4; -extern u8 gUnknown_08393EFC[]; +extern struct SpriteSheet gUnknown_08393EFC; extern struct SpriteTemplate gSpriteTemplate_8393F74; -extern u8 gUnknown_08393F8C[]; -extern u8 gUnknown_08393F9C[]; +extern struct SpriteSheet gUnknown_08393F8C; +extern const struct SpritePalette gUnknown_08393F9C[]; extern struct SpriteTemplate gSpriteTemplate_8393FC0; -extern u8 gUnknown_08393FD8[]; +extern struct SpriteSheet gUnknown_08393FD8; extern u8 gUnknown_08E9D8CC[]; extern u8 gUnknown_08E9F624[]; extern u8 gUnknown_08E9F7E4[]; @@ -253,11 +254,11 @@ void CB2_InitTitleScreen(void) ResetSpriteData(); FreeAllSpritePalettes(); gReservedSpritePaletteCount = 14; - LoadCompressedObjectPic(gUnknown_08393EFC); - LoadCompressedObjectPic(gUnknown_08393F8C); - LoadCompressedObjectPic(gUnknown_08393FD8); + LoadCompressedObjectPic(&gUnknown_08393EFC); + LoadCompressedObjectPic(&gUnknown_08393F8C); + LoadCompressedObjectPic(&gUnknown_08393FD8); LoadPalette(gUnknown_08E9F624, 0x100, 0x1C0); - LoadSpritePalette(gUnknown_08393F9C); + LoadSpritePalette(&gUnknown_08393F9C[0]); gMain.state = 2; break; case 2: @@ -427,7 +428,7 @@ static void Task_TitleScreenPhase3(u8 taskId) if ((gMain.heldKeys & CLEAR_SAVE_BUTTON_COMBO) == CLEAR_SAVE_BUTTON_COMBO) SetMainCallback2(CB2_GoToClearSaveDataScreen); if ((gMain.heldKeys & RESET_RTC_BUTTON_COMBO) == RESET_RTC_BUTTON_COMBO - && sub_80691DC() == 1) + && CanResetRTC() == 1) { FadeOutBGM(4); BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); |