1 files changed, 37 insertions, 37 deletions

diff --git a/src/sound.c b/src/sound.c
index b9756c1dc..73040c4df 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -27,10 +27,10 @@ static u16 sFanfareCounter;
 
 bool8 gDisableMusic;
 
-extern struct MusicPlayerInfo gMPlay_BGM;
-extern struct MusicPlayerInfo gMPlay_SE1;
-extern struct MusicPlayerInfo gMPlay_SE2;
-extern struct MusicPlayerInfo gMPlay_SE3;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_SE1;
+extern struct MusicPlayerInfo gMPlayInfo_SE2;
+extern struct MusicPlayerInfo gMPlayInfo_SE3;
 
 extern struct ToneData gCryTable[];
 extern struct ToneData gCryTable2[];
@@ -180,7 +180,7 @@ bool8 IsNotWaitingForBGMStop(void)
 void PlayFanfareByFanfareNum(u8 fanfareNum)
 {
     u16 songNum;
-    m4aMPlayStop(&gMPlay_BGM);
+    m4aMPlayStop(&gMPlayInfo_BGM);
     songNum = sFanfares[fanfareNum].songNum;
     sFanfareCounter = sFanfares[fanfareNum].duration;
     m4aSongNumStart(songNum);
@@ -196,7 +196,7 @@ bool8 WaitFanfare(bool8 stop)
     else
     {
         if (!stop)
-            m4aMPlayContinue(&gMPlay_BGM);
+            m4aMPlayContinue(&gMPlayInfo_BGM);
         else
             m4aSongNumStart(SE_STOP);
 
@@ -241,7 +241,7 @@ static void Task_Fanfare(u8 taskId)
     }
     else
     {
-        m4aMPlayContinue(&gMPlay_BGM);
+        m4aMPlayContinue(&gMPlayInfo_BGM);
         DestroyTask(taskId);
     }
 }
@@ -257,46 +257,46 @@ void FadeInNewBGM(u16 songNum, u8 speed)
     if (gDisableMusic)
         songNum = 0;
     m4aSongNumStart(songNum);
-    m4aMPlayImmInit(&gMPlay_BGM);
-    m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0);
+    m4aMPlayImmInit(&gMPlayInfo_BGM);
+    m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0);
     m4aSongNumStop(songNum);
-    m4aMPlayFadeIn(&gMPlay_BGM, speed);
+    m4aMPlayFadeIn(&gMPlayInfo_BGM, speed);
 }
 
 void FadeOutBGMTemporarily(u8 speed)
 {
-    m4aMPlayFadeOutTemporarily(&gMPlay_BGM, speed);
+    m4aMPlayFadeOutTemporarily(&gMPlayInfo_BGM, speed);
 }
 
 bool8 IsBGMPausedOrStopped(void)
 {
-    if (gMPlay_BGM.status & MUSICPLAYER_STATUS_PAUSE)
+    if (gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_PAUSE)
         return TRUE;
-    if (!(gMPlay_BGM.status & MUSICPLAYER_STATUS_TRACK))
+    if (!(gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_TRACK))
         return TRUE;
     return FALSE;
 }
 
 void FadeInBGM(u8 speed)
 {
-    m4aMPlayFadeIn(&gMPlay_BGM, speed);
+    m4aMPlayFadeIn(&gMPlayInfo_BGM, speed);
 }
 
 void FadeOutBGM(u8 speed)
 {
-    m4aMPlayFadeOut(&gMPlay_BGM, speed);
+    m4aMPlayFadeOut(&gMPlayInfo_BGM, speed);
 }
 
 bool8 IsBGMStopped(void)
 {
-    if (!(gMPlay_BGM.status & MUSICPLAYER_STATUS_TRACK))
+    if (!(gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_TRACK))
         return TRUE;
     return FALSE;
 }
 
 void PlayCry1(u16 species, s8 pan)
 {
-    m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85);
+    m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85);
     PlayCryInternal(species, pan, 125, 10, 0);
     gPokemonCryBGMDuckingCounter = 2;
     RestoreBGMVolumeAfterPokemonCry();
@@ -315,7 +315,7 @@ void PlayCry3(u16 species, s8 pan, u8 mode)
     }
     else
     {
-        m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85);
         PlayCryInternal(species, pan, 125, 10, mode);
         gPokemonCryBGMDuckingCounter = 2;
         RestoreBGMVolumeAfterPokemonCry();
@@ -331,14 +331,14 @@ void PlayCry4(u16 species, s8 pan, u8 mode)
     else
     {
         if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
-            m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85);
+            m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85);
         PlayCryInternal(species, pan, 125, 10, mode);
     }
 }
 
 void PlayCry5(u16 species, u8 mode)
 {
-    m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85);
+    m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85);
     PlayCryInternal(species, 0, 125, 10, mode);
     gPokemonCryBGMDuckingCounter = 2;
     RestoreBGMVolumeAfterPokemonCry();
@@ -481,7 +481,7 @@ static void Task_DuckBGMForPokemonCry(u8 taskId)
 
     if (!IsPokemonCryPlaying(gMPlay_PokemonCry))
     {
-        m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256);
         DestroyTask(taskId);
     }
 }
@@ -507,55 +507,55 @@ void PlaySE(u16 songNum)
 void PlaySE12WithPanning(u16 songNum, s8 pan)
 {
     m4aSongNumStart(songNum);
-    m4aMPlayImmInit(&gMPlay_SE1);
-    m4aMPlayImmInit(&gMPlay_SE2);
-    m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan);
-    m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan);
+    m4aMPlayImmInit(&gMPlayInfo_SE1);
+    m4aMPlayImmInit(&gMPlayInfo_SE2);
+    m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, pan);
+    m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, pan);
 }
 
 void PlaySE1WithPanning(u16 songNum, s8 pan)
 {
     m4aSongNumStart(songNum);
-    m4aMPlayImmInit(&gMPlay_SE1);
-    m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan);
+    m4aMPlayImmInit(&gMPlayInfo_SE1);
+    m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, pan);
 }
 
 void PlaySE2WithPanning(u16 songNum, s8 pan)
 {
     m4aSongNumStart(songNum);
-    m4aMPlayImmInit(&gMPlay_SE2);
-    m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan);
+    m4aMPlayImmInit(&gMPlayInfo_SE2);
+    m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, pan);
 }
 
 void SE12PanpotControl(s8 pan)
 {
-    m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan);
-    m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan);
+    m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, pan);
+    m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, pan);
 }
 
 bool8 IsSEPlaying(void)
 {
-    if ((gMPlay_SE1.status & MUSICPLAYER_STATUS_PAUSE) && (gMPlay_SE2.status & MUSICPLAYER_STATUS_PAUSE))
+    if ((gMPlayInfo_SE1.status & MUSICPLAYER_STATUS_PAUSE) && (gMPlayInfo_SE2.status & MUSICPLAYER_STATUS_PAUSE))
         return FALSE;
-    if (!(gMPlay_SE1.status & MUSICPLAYER_STATUS_TRACK) && !(gMPlay_SE2.status & MUSICPLAYER_STATUS_TRACK))
+    if (!(gMPlayInfo_SE1.status & MUSICPLAYER_STATUS_TRACK) && !(gMPlayInfo_SE2.status & MUSICPLAYER_STATUS_TRACK))
         return FALSE;
     return TRUE;
 }
 
 bool8 IsBGMPlaying(void)
 {
-    if (gMPlay_BGM.status & MUSICPLAYER_STATUS_PAUSE)
+    if (gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_PAUSE)
         return FALSE;
-    if (!(gMPlay_BGM.status & MUSICPLAYER_STATUS_TRACK))
+    if (!(gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_TRACK))
         return FALSE;
     return TRUE;
 }
 
 bool8 IsSpecialSEPlaying(void)
 {
-    if (gMPlay_SE3.status & MUSICPLAYER_STATUS_PAUSE)
+    if (gMPlayInfo_SE3.status & MUSICPLAYER_STATUS_PAUSE)
         return FALSE;
-    if (!(gMPlay_SE3.status & MUSICPLAYER_STATUS_TRACK))
+    if (!(gMPlayInfo_SE3.status & MUSICPLAYER_STATUS_TRACK))
         return FALSE;
     return TRUE;
 }