diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-20 19:54:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-20 19:54:16 -0500 |
| commit | 7b7f4bb7d6f5d29b40e15aa4c6285c6885359e0d (patch) | |
| tree | 8da3f8fae8c1c165e3435ee079f48631479b7611 /src/berry_blender.c | |
| parent | c6207577802db057298917089e427a6ab9e6edf9 (diff) | |
| parent | 8bf4b1a917786c683ac30278108f74d31961274d (diff) | |
Merge pull request #636 from huderlem/assets
Map organization
Diffstat (limited to 'src/berry_blender.c')
| -rw-r--r-- | src/berry_blender.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c index 4531ea546..8bf669a92 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1245,7 +1245,7 @@ static void sub_804E9F8(void) { gBerryBlenderData->field_178 = GetCurrentMapMusic(); } - PlayBGM(BGM_CYCLING); + PlayBGM(MUS_CYCLING); break; case 100: Menu_DrawStdWindowFrame(0, 13, 29, 19); @@ -1507,7 +1507,7 @@ static void sub_804F378(void) { gBerryBlenderData->field_178 = GetCurrentMapMusic(); } - PlayBGM(BGM_CYCLING); + PlayBGM(MUS_CYCLING); PlaySE(SE_MOTER); Blender_ControlHitPitch(); break; @@ -3524,7 +3524,7 @@ static void sub_8052BD0(u8 taskID) { if (gTasks[taskID].data[0] == 0) { - PlayFanfare(BGM_FANFA1); + PlayFanfare(MUS_FANFA1); gTasks[taskID].data[0]++; } if (IsFanfareTaskInactive()) |