diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-28 16:14:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 16:14:21 -0400 |
| commit | 09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (patch) | |
| tree | d90353c1a06b199c585fdc258c049583392dc09f /src/intro.c | |
| parent | eb4bcc89cd149ae1a5e43f2aef0dddf5a69bb23c (diff) | |
| parent | ee72696b5340b5578941aeb5d03bca6099e26538 (diff) | |
Merge pull request #1146 from GriffinRichards/rename-songs
Give songs meaningful english names
Diffstat (limited to 'src/intro.c')
| -rw-r--r-- | src/intro.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/intro.c b/src/intro.c index 72aefd737..eca8b84b1 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1129,7 +1129,7 @@ static void Task_IntroFadeIn(u8 taskId) SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON); gTasks[taskId].func = Task_IntroWaterDrops; gIntroFrameCounter = 0; - m4aSongNumStart(MUS_DEMO1); + m4aSongNumStart(MUS_INTRO); ResetSerial(); } @@ -1563,7 +1563,7 @@ static void Task_IntroLoadPart3Graphics(u8 taskId) SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG2_ON | DISPCNT_OBJ_ON); gTasks[taskId].func = Task_IntroSpinAndZoomPokeball; gIntroFrameCounter = 0; - m4aSongNumStart(MUS_T_BATTLE); + m4aSongNumStart(MUS_INTRO_BATTLE); } static void Task_IntroSpinAndZoomPokeball(u8 taskId) @@ -2355,7 +2355,7 @@ static void Task_IntroRayquazaGlowScene_1(u8 taskId) if (data[1] == 6) { spriteId = CreateSprite(&gIntroRayquazaHyperbeamSprite, 120, 88, 15); - PlaySE(SE_OP_BASYU); + PlaySE(SE_INTRO_BLAST); gSprites[spriteId].invisible = TRUE; gSprites[spriteId].data[3] = data[4]; data[0]++; |