diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-12 10:23:45 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-12 10:23:45 -0400 |
| commit | bd5c36e0f376518a8fbeac0cc178ea60b9e2b274 (patch) | |
| tree | 481a51a758479833ff3486e280428552bbec1f73 /src | |
| parent | 02974254affdcffb0cf8f44bd094ba5c9d320d4a (diff) | |
Split data_835B488.s to sound.s; correct FRLG music constants
Diffstat (limited to 'src')
| -rw-r--r-- | src/oak_speech.c | 8 | ||||
| -rw-r--r-- | src/sound.c | 18 |
2 files changed, 21 insertions, 5 deletions
diff --git a/src/oak_speech.c b/src/oak_speech.c index 2e58e801d..b24faee0e 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -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); diff --git a/src/sound.c b/src/sound.c index f94e44506..ba6511d1c 100644 --- a/src/sound.c +++ b/src/sound.c @@ -40,7 +40,23 @@ extern struct MusicPlayerInfo gMPlayInfo_SE2; extern struct MusicPlayerInfo gMPlayInfo_SE3; extern struct ToneData gCryTable[]; extern struct ToneData gCryTable2[]; -extern const struct Fanfare sFanfares[]; + +static const struct Fanfare sFanfares[] = { + { MUS_FANFA1, 80 }, + { MUS_FANFA4, 160 }, + { MUS_FANFA5, 220 }, + { MUS_ME_WAZA, 220 }, + { MUS_ME_ASA, 160 }, + { MUS_ME_BACHI, 340 }, + { MUS_ME_WASURE, 180 }, + { MUS_ME_KINOMI, 120 }, + { MUS_ME_B_BIG, 250 }, + { MUS_ME_B_SMALL, 150 }, + { MUS_ME_ZANNEN, 160 }, + { BGM_FRLG_FLUTE, 450 }, + { BGM_FRLG_ME_KEYITEM, 170 }, + { BGM_FRLG_ME_POKEDEX_EVAL, 196 } +}; extern u16 SpeciesToCryId(u16); |