Rename many music functions and symbols

src/include/game/game_0b69d0.h

@@ -29,7 +29,7 @@ void currentPlayerUpdateZoom(void);
 void func0f0bace0(void);
 void currentPlayerTickPauseMenu(void);
 void currentPlayerPause(s32 root);
-void func0f0baf38(void);
+void currentPlayerUnpause(void);
 Gfx *func0f0baf84(Gfx *gdl);
 Gfx *fadeDraw(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac);
 Gfx *currentPlayerDrawFade(Gfx *gdl);

src/include/game/game_176080.h

@@ -14,6 +14,6 @@ void *func0f176668(s32 arg0);
 Gfx *func0f1766b4(Gfx *gdl);
 s32 stageGetPrimaryTrack(s32 stagenum);
 s32 stageGetAmbientTrack(s32 stagenum);
-s32 stageGetXTrack(s32 stagenum);
+s32 stageGetNrgTrack(s32 stagenum);
 
 #endif

src/include/game/mplayer/mplayer.h

@@ -79,7 +79,7 @@ void mpDisableAllMultiTracks(void);
 void mpRandomiseMultiTracks(void);
 void mpSetTrackToRandom(void);
 s32 mpGetCurrentTrackSlotNum(void);
-u32 func0f18c4c0(void);
+u32 mpChooseRandomTrack(void);
 struct mpchr *func0f18c794(s32 index);
 u32 func0f18c828(void);
 s32 mpGetNumChrs(void);

src/include/game/music.h

@@ -8,38 +8,38 @@ u16 musicGetVolume(void);
 void musicSetVolume(u16 volume);
 bool func0f16d0a8(s32 tracktype, s32 arg1);
 s32 func0f16d124(s32 tracktype);
-void musicStart(u32 tracktype, u32 tracknum, f32 arg2, u16 volume);
-void musicEnd(s32 tracktype);
-void func0f16d2ac(s32 tracktype, f32 arg1, s32 arg2);
-void func0f16d324(void);
-void func0f16d3d0(void);
+void musicQueueStartEvent(u32 tracktype, u32 tracknum, f32 arg2, u16 volume);
+void musicQueueStopEvent(s32 tracktype);
+void musicQueueFadeEvent(s32 tracktype, f32 arg1, bool fadetopause);
+void musicInit(void);
+void musicQueueStopAllEvent(void);
 void func0f16d430(void);
-void func0f16d44c(void);
+void musicQueueType5Event(void);
 void musicStartPrimary(f32 arg0);
 void musicStartAmbient(f32 arg0);
 bool musicIsAnyPlayerInAmbientRoom(void);
-void musicStartX(f32 arg0);
-void musicStartMenu2(s32 tracknum);
+void musicStartNrg(f32 arg0);
+void musicStartTrackAsMenu(s32 tracknum);
 void musicSetStageAndStartMusic(s32 stagenum);
 void musicSetStage(s32 stagenum);
 void musicReset(void);
-void musicStartNrg(void);
-void musicStopNrg(void);
-void musicStartForMenu(void);
-void musicResumeAfterUnpause(void);
+void musicActivateNrg(void);
+void musicDeactivateNrg(void);
+void musicStartMenu(void);
+void musicEndMenu(void);
 void musicStartSoloDeath(void);
-void musicStartMpDeath(f32 arg0);
-void func0f16dd14(void);
-void func0f16ddb0(void);
+void _musicStartMpDeath(f32 arg0);
+void musicStartMpDeath(void);
+void musicEndDeath(void);
 void musicPlayTrackIsolated(s32 tracknum);
 void musicPlayDefaultTracks(void);
 void musicStartTemporaryPrimary(s32 tracknum);
 void musicStartCutscene(s32 tracknum);
 void musicEndCutscene(void);
-void musicStartTemporary(s32 tracknum);
-void musicEndAmbient(void);
+void musicStartTemporaryAmbient(s32 tracknum);
+void musicEndTemporaryAmbient(void);
 void musicSetXReason(s32 reason, u32 minsecs, u32 maxsecs);
 void musicUnsetXReason(s32 reason);
-void func0f16e138(void);
+void musicTickAmbient(void);
 
 #endif