Split data_835B488.s to sound.s; correct FRLG music constants
This commit is contained in:
+4
-4
@@ -561,7 +561,7 @@ static void Task_OaksSpeech1(u8 taskId)
|
||||
ShowBg(0);
|
||||
ShowBg(1);
|
||||
SetVBlankCallback(VBlankCB_NewGameOaksSpeech);
|
||||
PlayBGM(323);
|
||||
PlayBGM(BGM_FRLG_GAME_EXPLANATION_START);
|
||||
gTasks[taskId].func = Task_OaksSpeech2;
|
||||
gMain.state = 0;
|
||||
return;
|
||||
@@ -715,7 +715,7 @@ static void Task_OakSpeech6(u8 taskId)
|
||||
data[3]--;
|
||||
else
|
||||
{
|
||||
PlayBGM(324);
|
||||
PlayBGM(BGM_FRLG_GAME_EXPLANATION_MIDDLE);
|
||||
sub_810F71C();
|
||||
PrintTextOnRightSnappedWindow(gText_ABUTTONNext, 0, 1);
|
||||
sOakSpeechResources->unk_0008 = malloc_and_decompress(sNewGameAdventureIntroTilemap, &sp14);
|
||||
@@ -817,7 +817,7 @@ static void Task_OakSpeech7(u8 taskId)
|
||||
break;
|
||||
case 4:
|
||||
sub_8006398(gTasks[taskId].data[5]);
|
||||
PlayBGM(325);
|
||||
PlayBGM(BGM_FRLG_GAME_EXPLANATION_END);
|
||||
data[15] = 24;
|
||||
gMain.state++;
|
||||
break;
|
||||
@@ -876,7 +876,7 @@ static void Task_OakSpeech9(u8 taskId)
|
||||
CreateNidoranFSprite(taskId);
|
||||
LoadOaksSpeechTrainerPic(3, 0);
|
||||
CreatePikaOrGrassPlatformSpriteAndLinkToCurrentTask(taskId, 1);
|
||||
PlayBGM(292);
|
||||
PlayBGM(BGM_FRLG_ROUTE_24);
|
||||
BeginNormalPaletteFade(0xFFFFFFFF, 5, 16, 0, RGB_BLACK);
|
||||
data[3] = 80;
|
||||
ShowBg(2);
|
||||
|
||||
Reference in New Issue
Block a user