gMPlay to gMPlayInfo

19 files changed, 113 insertions, 113 deletions

diff --git a/src/battle_anim.c b/src/battle_anim.c
index 3e7e8fe7c..3be28dd77 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -1313,9 +1313,9 @@ u16 gSoundAnimFramesToWait;
 s16 gBattleAnimArgs[ANIM_ARGS_COUNT];
 u16 gAnimSpriteIndexArray[ANIM_SPRITE_INDEX_COUNT];
 
-extern struct MusicPlayerInfo gMPlay_BGM;
-extern struct MusicPlayerInfo gMPlay_SE1;
-extern struct MusicPlayerInfo gMPlay_SE2;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_SE1;
+extern struct MusicPlayerInfo gMPlayInfo_SE2;
 
 extern const u16 gSingingMoves[];
 extern const u8 *const gBattleAnims_Moves[];
@@ -1516,7 +1516,7 @@ void LaunchBattleAnimation(const u8 *const moveAnims[], u16 move, u8 isMoveAnim)
             if (move == gSingingMoves[i])
             {
                 // Lower the volume for the short song that gets played.
-                m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 128);
+                m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 128);
                 break;
             }
         }
@@ -1772,8 +1772,8 @@ static void ScriptCmd_end(void)
         }
         else
         {
-            m4aMPlayStop(&gMPlay_SE1);
-            m4aMPlayStop(&gMPlay_SE2);
+            m4aMPlayStop(&gMPlayInfo_SE1);
+            m4aMPlayStop(&gMPlayInfo_SE2);
         }
     }
 
@@ -1792,7 +1792,7 @@ static void ScriptCmd_end(void)
 
     if (!continuousAnim) // may have been used for debug?
     {
-        m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256);
         if (IsContest() == 0)
         {
             UpdateBattlerSpritePriorities();
@@ -3037,8 +3037,8 @@ static void ScriptCmd_waitsound(void)
     {
         if (++gSoundAnimFramesToWait > 90)
         {
-            m4aMPlayStop(&gMPlay_SE1);
-            m4aMPlayStop(&gMPlay_SE2);
+            m4aMPlayStop(&gMPlayInfo_SE1);
+            m4aMPlayStop(&gMPlayInfo_SE2);
             gSoundAnimFramesToWait = 0;
         }
         else
@@ -3230,7 +3230,7 @@ static void ScriptCmd_doublebattle_2E(void)
 // Cease playing sounds.
 static void ScriptCmd_stopsound(void)
 {
-    m4aMPlayStop(&gMPlay_SE1);
-    m4aMPlayStop(&gMPlay_SE2);
+    m4aMPlayStop(&gMPlayInfo_SE1);
+    m4aMPlayStop(&gMPlayInfo_SE2);
     sBattleAnimScriptPtr++;
 }
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 0a0bacb0e..d99b4fe27 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -52,7 +52,7 @@ extern struct Window gUnknown_03004210;
 extern u8 gUnknown_0300434C[];
 extern u32 gBattleControllerExecFlags;
 extern MainCallback gPreBattleCallback1;
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
 extern u8 sub_8077F68();
 extern u8 GetBattlerSubpriority();
@@ -323,11 +323,11 @@ void sub_8037680(void)
         if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
         {
             if (GetBattlerPosition(gActiveBattler) == 1)
-                m4aMPlayContinue(&gMPlay_BGM);
+                m4aMPlayContinue(&gMPlayInfo_BGM);
         }
         else
         {
-            m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256);
+            m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256);
         }
         ewram17810[gActiveBattler].unk9 = 3;
         gBattlerControllerFuncs[gActiveBattler] = sub_8037644;
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 189bacdee..2cc42ca2a 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -60,9 +60,9 @@ extern u16 gUnknown_02024DE8;
 extern u8 gUnknown_02024E68[];
 extern MainCallback gPreBattleCallback1;
 extern void (*const gOpponentBufferCommands[])(void);
-extern struct MusicPlayerInfo gMPlay_SE1;
-extern struct MusicPlayerInfo gMPlay_SE2;
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_SE1;
+extern struct MusicPlayerInfo gMPlayInfo_SE2;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern u32 gBattleControllerExecFlags;
 
 extern u8 GetBattlerSpriteCoord();
@@ -337,9 +337,9 @@ void sub_8032C88(void)
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
         if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
-            m4aMPlayContinue(&gMPlay_BGM);
+            m4aMPlayContinue(&gMPlayInfo_BGM);
         else
-            m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256);
+            m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256);
         ewram17810[gActiveBattler].unk9 = 3;
         gBattlerControllerFuncs[gActiveBattler] = sub_8032C4C;
     }
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 86105cb54..7de3ada41 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -148,7 +148,7 @@ extern u8 gUnknown_03004348;
 extern struct BattlePokemon gBattleMons[];
 extern MainCallback gPreBattleCallback1;
 extern u8 gHealthboxSpriteIds[];
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern u8 gUnknown_0300434C[];
 extern u8 gUnknown_0202E8F4;
 extern u8 gUnknown_0202E8F5;
@@ -1209,9 +1209,9 @@ void sub_802D31C(void)
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
         if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
-            m4aMPlayContinue(&gMPlay_BGM);
+            m4aMPlayContinue(&gMPlayInfo_BGM);
         else
-            m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256);
+            m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256);
         HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
         if (IsDoubleBattle())
             HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ 2]], gActiveBattler ^ 2);
@@ -1269,7 +1269,7 @@ void sub_802D730(void)
 {
     if (!ewram17810[gActiveBattler].unk0_6 && !IsCryPlayingOrClearCrySongs())
     {
-        m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
         HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
         PlayerBufferExecCompleted();
     }
@@ -1295,7 +1295,7 @@ void c3_0802FDF4(u8 taskId)
 {
     if (!IsCryPlayingOrClearCrySongs())
     {
-        m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
         DestroyTask(taskId);
     }
 }
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index d644313db..45f2c30c0 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -36,9 +36,9 @@ extern struct Window gUnknown_03004210;
 extern void (*gBattlerControllerFuncs[])(void);
 extern u8 gHealthboxSpriteIds[];
 extern u8 gUnknown_0300434C[];
-extern struct MusicPlayerInfo gMPlay_SE1;
-extern struct MusicPlayerInfo gMPlay_SE2;
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_SE1;
+extern struct MusicPlayerInfo gMPlayInfo_SE2;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern u32 gBitTable[];
 extern u16 gBattleTypeFlags;
 extern u8 gBattleMonForms[];
@@ -276,8 +276,8 @@ bool8 mplay_80342A4(u8 a)
         ewram17810[a].unk8++;
         if (ewram17810[gActiveBattler].unk8 < 30)
             return TRUE;
-        m4aMPlayStop(&gMPlay_SE1);
-        m4aMPlayStop(&gMPlay_SE2);
+        m4aMPlayStop(&gMPlayInfo_SE1);
+        m4aMPlayStop(&gMPlayInfo_SE2);
     }
     if (zero == 0)
     {
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 85c992d8d..70cb34809 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;
diff --git a/src/contest.c b/src/contest.c
index 34718ac49..b66a0ed93 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -40,7 +40,7 @@ extern void sub_80C8A38(u8);
 extern void sub_80C8AD0(u8);
 extern void sub_80C8C80(u8);
 
-extern struct MusicPlayerInfo gMPlay_SE1;
+extern struct MusicPlayerInfo gMPlayInfo_SE1;
 extern u8 gBattleMonForms[];
 extern u8 gDisplayedStringBattle[];
 extern u16 gBattleTypeFlags;
@@ -3366,8 +3366,8 @@ void sub_80AFC74(u8 taskId)
         if (r1 > 0)
         {
             PlaySE(SE_C_GAJI);
-            m4aMPlayImmInit(&gMPlay_SE1);
-            m4aMPlayPitchControl(&gMPlay_SE1, 0xFFFF, r10 * 256);
+            m4aMPlayImmInit(&gMPlayInfo_SE1);
+            m4aMPlayPitchControl(&gMPlayInfo_SE1, 0xFFFF, r10 * 256);
         }
         else
         {
diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c
index ba2439a64..1ead5ae1b 100644
--- a/src/debug/sound_check_menu.c
+++ b/src/debug/sound_check_menu.c
@@ -60,7 +60,7 @@ extern u8 gUnknown_03005E98;
 
 struct MusicPlayerInfo *gUnknown_03005D30;
 
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
 void Task_InitSoundCheckMenu(u8);
 void sub_80BA384(u8);
@@ -1249,7 +1249,7 @@ void Task_InitCryTest(u8 taskId)
     REG_BG2CNT = 0xF01;
     REG_BG3CNT = 0x1D03;
     REG_DISPCNT = 0x1d40;
-    m4aMPlayFadeOutTemporarily(&gMPlay_BGM, 2);
+    m4aMPlayFadeOutTemporarily(&gMPlayInfo_BGM, 2);
     gTasks[taskId].func = Task_ProcessCryTestInput;
 }
 
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 74db6ac26..93532d396 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -27,7 +27,7 @@ static EWRAM_DATA u32 sUnknown_0203931C = 0;
 
 extern bool8 gUnknown_02039324; // has hall of fame records
 extern void (*gGameContinueCallback)(void);
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern u8 gReservedSpritePaletteCount;
 extern struct SpriteTemplate gUnknown_02024E8C;
 
@@ -983,7 +983,7 @@ static void sub_8142DF4(u8 taskID)
             if (IsCryPlayingOrClearCrySongs())
             {
                 StopCryAndClearCrySongs();
-                m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+                m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
             }
             gTasks[taskID].func = sub_8142F78;
         }
@@ -993,7 +993,7 @@ static void sub_8142DF4(u8 taskID)
         if (IsCryPlayingOrClearCrySongs())
         {
             StopCryAndClearCrySongs();
-            m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+            m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
         }
         gTasks[taskID].func = sub_8142F78;
     }
diff --git a/src/mauville_man.c b/src/mauville_man.c
index bfdfe9cf1..7eab67823 100644
--- a/src/mauville_man.c
+++ b/src/mauville_man.c
@@ -20,7 +20,7 @@
 
 #define MACRO1(a) (((a) % 4) + (((a) / 8) & 1))
 
-extern struct MusicPlayerInfo gMPlay_SE2;
+extern struct MusicPlayerInfo gMPlayInfo_SE2;
 
 extern u16 gSpecialVar_Result;
 extern u16 gSpecialVar_0x8004;
@@ -651,8 +651,8 @@ static void BardSing(struct Task *task, struct BardSong *song)
                         song->pitch += 64;
                     else
                         song->pitch -= 64;
-                    m4aMPlayVolumeControl(&gMPlay_SE2, 0xFFFF, song->volume);
-                    m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, song->pitch);
+                    m4aMPlayVolumeControl(&gMPlayInfo_SE2, 0xFFFF, song->volume);
+                    m4aMPlayPitchControl(&gMPlayInfo_SE2, 0xFFFF, song->pitch);
                     song->voiceInflection++;
                 }
                 song->phonemeTimer--;
@@ -663,13 +663,13 @@ static void BardSing(struct Task *task, struct BardSong *song)
                 if (phoneme->sound <= 50)
                 {
                     song->volume = 0x100 + phoneme->volume * 16;
-                    m4aMPlayVolumeControl(&gMPlay_SE2, 0xFFFF, song->volume);
+                    m4aMPlayVolumeControl(&gMPlayInfo_SE2, 0xFFFF, song->volume);
                     song->pitch = 0x200 + phoneme->pitch;
-                    m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, song->pitch);
+                    m4aMPlayPitchControl(&gMPlayInfo_SE2, 0xFFFF, song->pitch);
                 }
                 break;
             case 0xFE:
-                m4aMPlayStop(&gMPlay_SE2);
+                m4aMPlayStop(&gMPlayInfo_SE2);
                 song->state = 0xFF;
                 break;
             }
@@ -746,7 +746,7 @@ static void Task_BardSong(u8 taskId)
         if (gStringVar4[task->tCharIndex] == EOS)
         {
             FadeInNewBGM(MUS_POKECEN, 6);
-            m4aMPlayFadeOutTemporarily(&gMPlay_SE2, 2);
+            m4aMPlayFadeOutTemporarily(&gMPlayInfo_SE2, 2);
             EnableBothScriptContexts();
             DestroyTask(taskId);
         }
diff --git a/src/pokeball.c b/src/pokeball.c
index 794201a0c..8a11440ff 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -17,7 +17,7 @@
 #include "util.h"
 #include "ewram.h"
 
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern u16 gBattleTypeFlags;
 extern u8 gBattlerTarget;
 extern u8 gActiveBattler;
@@ -732,11 +732,11 @@ static void sub_8046C78(struct Sprite *sprite)
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
             {
                 if (IsBGMPlaying())
-                    m4aMPlayStop(&gMPlay_BGM);
+                    m4aMPlayStop(&gMPlayInfo_BGM);
             }
             else
             {
-                m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 128);
+                m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 128);
             }
         }
 
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index a4614f52d..cb3d8789e 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -21,7 +21,7 @@
 #include "trig.h"
 #include "ewram.h"
 
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern u8 gPokeblockMonID;
 extern s16 gPokeblockGain;
 
@@ -743,7 +743,7 @@ static void Task_ReturnAfterPaletteFade(u8 taskID)
 {
     if (!gPaletteFade.active)
     {
-        m4aMPlayVolumeControl(&gMPlay_BGM, -1, 256);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, -1, 256);
         SetMainCallback2(gMain.savedCallback);
         DestroyTask(taskID);
     }
diff --git a/src/pokedex.c b/src/pokedex.c
index caa6a1565..ad02efc1e 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -126,7 +126,7 @@ struct UnknownStruct4
     u8 unk9;
 };
 
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern u8 gReservedSpritePaletteCount;
 extern struct SpriteTemplate gUnknown_02024E8C;
 extern u8 gUnknown_03005E98;
@@ -1448,7 +1448,7 @@ void CB2_InitPokedex(void)
             SetVBlankCallback(sub_808C0B8);
             SetMainCallback2(MainCB);
             SortPokedex(gPokedexView->dexMode, gPokedexView->dexOrder);
-            m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x80);
+            m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x80);
         }
         break;
     }
@@ -1679,7 +1679,7 @@ static void Task_ClosePokedex(u8 taskId)
         gSaveBlock2.pokedex.order = gPokedexView->dexOrder;
         DestroyTask(taskId);
         SetMainCallback2(c2_exit_to_overworld_1_sub_8080DEC);
-        m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
     }
 }
 
@@ -3150,7 +3150,7 @@ static void Task_InitCryScreenMultistep(u8 taskId)
     default:
         if (!gPaletteFade.active)
         {
-            m4aMPlayStop(&gMPlay_BGM);
+            m4aMPlayStop(&gMPlayInfo_BGM);
             gPokedexView->unk64A = 6;
             gUnknown_03005CEC = gMain.vblankCallback;
             SetVBlankCallback(NULL);
@@ -3260,7 +3260,7 @@ static void Task_CryScreenProcessInput(u8 taskId)
         if (gMain.newKeys & B_BUTTON)
         {
             BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0));
-            m4aMPlayContinue(&gMPlay_BGM);
+            m4aMPlayContinue(&gMPlayInfo_BGM);
             gPokedexView->unk64F = 1;
             gTasks[taskId].func = sub_808FFBC;
             PlaySE(SE_PC_OFF);
@@ -3270,7 +3270,7 @@ static void Task_CryScreenProcessInput(u8 taskId)
          || ((gMain.newKeys & L_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
         {
             BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0));
-            m4aMPlayContinue(&gMPlay_BGM);
+            m4aMPlayContinue(&gMPlayInfo_BGM);
             gPokedexView->unk64F = 2;
             gTasks[taskId].func = sub_808FFBC;
             PlaySE(SE_Z_PAGE);
@@ -3286,7 +3286,7 @@ static void Task_CryScreenProcessInput(u8 taskId)
             else
             {
                 BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0));
-                m4aMPlayContinue(&gMPlay_BGM);
+                m4aMPlayContinue(&gMPlayInfo_BGM);
                 gPokedexView->unk64F = 3;
                 gTasks[taskId].func = sub_808FFBC;
                 PlaySE(SE_Z_PAGE);
diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c
index e07b5e1c0..0574ca45b 100644
--- a/src/pokedex_cry_screen.c
+++ b/src/pokedex_cry_screen.c
@@ -9,7 +9,7 @@
 #include "sound.h"
 
 extern struct SoundInfo gSoundInfo;
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
 struct Unk201C800 {
     s8 unk_0;
@@ -474,7 +474,7 @@ void sub_8119F88(u8 a0)
 
 void sub_811A050(u16 species)
 {
-    if (gMPlay_BGM.status & MUSICPLAYER_STATUS_PAUSE && !gPokedexCryScreenPtr->unk001A)
+    if (gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_PAUSE && !gPokedexCryScreenPtr->unk001A)
     {
         if (!gPokedexCryScreenPtr->unk001B)
         {
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 134b2b753..e970cc3bc 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -122,7 +122,7 @@ static void SummaryScreen_PrintColoredText(const u8 *, u8, u8, u8);
 
 extern u8 StorageSystemGetNextMonIndex(struct BoxPokemon *, u8, u8, u8);
 
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern u8 gPPUpReadMasks[];
 extern TaskFunc gUnknown_03005CF0;
 extern struct SpriteTemplate gUnknown_02024E8C;
@@ -929,7 +929,7 @@ static void SummaryScreen_DestroyTask(u8 taskId)
         ResetSpriteData();
         FreeAllSpritePalettes();
         StopCryAndClearCrySongs();
-        m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
         SetMainCallback2(pssData.callback);
         DestroyTask(taskId);
     }
diff --git a/src/roulette.c b/src/roulette.c
index 418482394..c4f6067a1 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -544,9 +544,9 @@ void sub_8115634(u8 taskId)
     if (unk_203955C[0] != 0 && (gMain.newKeys & START_BUTTON))
     {
         gTasks[eRoulette->varA4].func = sub_81157AC;
-        m4aMPlayStop(&gMPlay_SE1);
-        m4aMPlayStop(&gMPlay_SE2);
-        m4aMPlayStop(&gMPlay_SE3);
+        m4aMPlayStop(&gMPlayInfo_SE1);
+        m4aMPlayStop(&gMPlayInfo_SE2);
+        m4aMPlayStop(&gMPlayInfo_SE3);
     }
 #endif
 }
diff --git a/src/roulette_gfx.c b/src/roulette_gfx.c
index 1cac00daf..afcb94df6 100644
--- a/src/roulette_gfx.c
+++ b/src/roulette_gfx.c
@@ -1160,8 +1160,8 @@ void sub_8118724(struct Sprite *sprite)
     sprite->pos2.y = -cos * sprite->data[4] >> 12;
     if (IsSEPlaying())
     {
-        m4aMPlayPanpotControl(&gMPlay_SE1, 0xffff, sprite->pos2.x);
-        m4aMPlayPanpotControl(&gMPlay_SE2, 0xffff, sprite->pos2.x);
+        m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xffff, sprite->pos2.x);
+        m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xffff, sprite->pos2.x);
     }
 }
 
@@ -2221,8 +2221,8 @@ void sub_8119BCC(struct Sprite *sprite)
         if (IsSEPlaying())
         {
             s8 u =  -((116 - sprite->pos1.x) / 2);
-            m4aMPlayPanpotControl(&gMPlay_SE1, 0xffff, u);
-            m4aMPlayPanpotControl(&gMPlay_SE2, 0xffff, u);
+            m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xffff, u);
+            m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xffff, u);
         }
     }
     else
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;
 }
diff --git a/src/title_screen.c b/src/title_screen.c
index df737fd06..b4aa9f8ed 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -41,7 +41,7 @@
 #endif
 
 extern u8 gReservedSpritePaletteCount;
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern u16 gBattle_BG1_Y;
 extern u16 gBattle_BG1_X;
 extern const u8 gUnknown_08E9D8CC[];
@@ -851,7 +851,7 @@ static void Task_TitleScreenPhase3(u8 taskId)
                 gBattle_BG1_X = 0;
             }
             UpdateLegendaryMarkingColor(gTasks[taskId].tCounter);
-            if ((gMPlay_BGM.status & 0xFFFF) == 0)
+            if ((gMPlayInfo_BGM.status & 0xFFFF) == 0)
             {
                 BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, FADE_COLOR_WHITE);
                 SetMainCallback2(CB2_GoToCopyrightScreen);