diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-10 08:34:28 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-10 08:39:00 +0800 |
| commit | 89a377cdd3a24956ff549b0fa69a5a1cc26fe128 (patch) | |
| tree | a5279d2d7224d04f5e39b213d4c18deda54a438e /src/title_screen.c | |
| parent | 7b28a3ecfd7c6a7ae73283b298b2f04bbbcc72f0 (diff) | |
| parent | c61603fb3812011981e22478bce93aba8b7ec183 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'src/title_screen.c')
| -rw-r--r-- | src/title_screen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/title_screen.c b/src/title_screen.c index f4086b2ff..44bdc7c0f 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -285,7 +285,7 @@ void CB2_InitTitleScreen(void) sTitleScreenTimerTaskId = CreateTask(Task_TitleScreenTimer, 2); SetVBlankCallback(VBlankCB); SetMainCallback2(CB2_TitleScreenRun); - m4aSongNumStart(BGM_FRLG_TITLE); + m4aSongNumStart(MUS_TITLE); } return; } @@ -513,7 +513,7 @@ static void SetTitleScreenScene_Run(s16 * data) CreateTask(Task_FlameOrLeafSpawner, 5); SetGpuRegsForTitleScreenRun(); data[6] = CreateSlashSprite(); - sub_812B484(); + HelpSystem_Enable(); data[1]++; // fallthrough case 1: @@ -583,7 +583,7 @@ static void SetTitleScreenScene_Restart(s16 * data) } break; case 4: - sub_812B478(); + HelpSystem_Disable(); DestroyTask(FindTaskIdByFunc(Task_TitleScreenMain)); SetMainCallback2(sub_80EC864); break; @@ -626,7 +626,7 @@ static void SetTitleScreenScene_Cry(s16 * data) Sav2_ClearSetDefault(); SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound); InitHeap(gHeap, HEAP_SIZE); - SetMainCallback2(sub_800C300); + SetMainCallback2(CB2_InitMainMenu); DestroyTask(FindTaskIdByFunc(Task_TitleScreenMain)); } break; |