diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-05 09:38:27 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-05 09:38:27 -0400 |
| commit | 3d3ec3150a7d297efe8b1dffe28a28275692f819 (patch) | |
| tree | e86983f4601dc74a8113dae471fa12315effb02f /src/berry_blender.c | |
| parent | 78535eea89e8b71f37e188289793e3e18c9bb985 (diff) | |
| parent | f89f80daec6d1e9ec85fdc898f1b7914a126612e (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'src/berry_blender.c')
| -rw-r--r-- | src/berry_blender.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c index 219e65994..3ccc4ab5d 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -180,8 +180,8 @@ s8 GetFirstFreePokeblockSlot(void); extern void de_sub_8073110(); #endif -extern struct MusicPlayerInfo gMPlay_SE2; -extern struct MusicPlayerInfo gMPlay_BGM; +extern struct MusicPlayerInfo gMPlayInfo_SE2; +extern struct MusicPlayerInfo gMPlayInfo_BGM; extern u16 gSpecialVar_ItemId; extern u8 gUnknown_020297ED; extern u8 byte_3002A68; @@ -778,7 +778,7 @@ static const u8 sNewLineString_2[] = _("\n"); static void Blender_ControlHitPitch(void) { - m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, (gBerryBlenderData->field_56 - 128) * 2); + m4aMPlayPitchControl(&gMPlayInfo_SE2, 0xFFFF, (gBerryBlenderData->field_56 - 128) * 2); } static void VBlankCB0_BerryBlender(void) @@ -1793,9 +1793,9 @@ static void sub_804FE70(void) if (gRecvCmds[2][i] == 0x2345 || gRecvCmds[2][i] == 0x4523 || gRecvCmds[2][i] == 0x5432) { if (gBerryBlenderData->field_56 > 1500) - m4aMPlayTempoControl(&gMPlay_BGM, ((gBerryBlenderData->field_56 - 750) / 20) + 256); + m4aMPlayTempoControl(&gMPlayInfo_BGM, ((gBerryBlenderData->field_56 - 750) / 20) + 256); else - m4aMPlayTempoControl(&gMPlay_BGM, 256); + m4aMPlayTempoControl(&gMPlayInfo_BGM, 256); } } } @@ -2164,7 +2164,7 @@ static void sub_8050954(void) { case 1: ClearLinkCallback(); - m4aMPlayTempoControl(&gMPlay_BGM, 256); + m4aMPlayTempoControl(&gMPlayInfo_BGM, 256); for (i = 0; i < gSpecialVar_0x8004; i++) { DestroyTask(gBerryBlenderData->field_148[i]); @@ -2181,7 +2181,7 @@ static void sub_8050954(void) else gBerryBlenderData->field_6F = 5; gBerryBlenderData->field_0 = 0; - m4aMPlayStop(&gMPlay_SE2); + m4aMPlayStop(&gMPlayInfo_SE2); } Blender_ControlHitPitch(); break; |