Rename many music functions and symbols

src/include/constants.h

@@ -3765,7 +3765,7 @@
 
 #define TRACKTYPE_NONE    0
 #define TRACKTYPE_PRIMARY 1
-#define TRACKTYPE_X       2
+#define TRACKTYPE_NRG     2 // NRG = "energy" (the high-energy X track)
 #define TRACKTYPE_MENU    3
 #define TRACKTYPE_DEATH   4
 #define TRACKTYPE_AMBIENT 5

src/include/data.h

@@ -457,13 +457,13 @@ extern s32 var80082050;
 extern u32 g_GfxNumSwaps;
 extern s32 g_NumReasonsToEndMpMatch;
 extern s32 g_MusicEventQueueLength;
-extern u32 g_MusicNrgIsPlaying;
+extern bool g_MusicNrgIsActive;
 extern s32 var800840e0;
 extern s32 var800840e4;
 extern s32 g_MusicDeathTimer240;
-extern s32 var800840f4;
-extern s32 var800840f8;
-extern s32 var800840fc;
+extern s32 g_MusicAge60;
+extern s32 g_MusicLife60;
+extern s32 g_MusicSilenceTimer60;
 extern bool g_Jpn;
 #if VERSION >= VERSION_PAL_FINAL
 extern s32 g_LanguageId;
@@ -509,7 +509,7 @@ extern struct mpscenariooverview g_MpScenarioOverviews[];
 extern struct menudialog g_MpScenarioMenuDialog;
 extern struct menudialog g_MpQuickTeamScenarioMenuDialog;
 extern s32 var80087260;
-extern u32 var80087264;
+extern bool g_MpEnableMusicSwitching;
 extern struct mpweapon g_MpWeapons[0x27];
 extern struct mphead g_MpHeads[75];
 extern struct mpsimulanttype g_MpSimulantTypes[];

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

src/include/lib/snd.h

@@ -25,7 +25,7 @@ bool sndIsMp3(u16 soundnum);
 bool snd0000fbc4(s16 arg0);
 u32 snd0000fc48(void);
 u32 snd0000fd74(void);
-void snd0000fd9c(struct var80094ed8 *arg0, u16 volume);
+void sndSetMusicChannelVolume(struct var80094ed8 *arg0, u16 volume);
 void snd0000fe18(void);
 void snd0000fe20(void);
 void snd0000fe50(void);

src/include/types.h

@@ -6129,7 +6129,7 @@ struct optiongroup {
 struct musicevent {
 	s32 tracktype;
 	s32 tracknum;
-	s32 unk08;
+	bool fadetopause;
 	f32 unk0c;
 	s16 volume;
 	u16 eventtype;
@@ -6259,7 +6259,7 @@ struct var80094ed8 {
 	/*0x0f4*/ u32 unk0f4;
 	/*0x0f8*/ N_ALCSPlayer *seqp;
 	/*0x0fc*/ void *unk0fc;
-	/*0x100*/ u16 unk100;
+	/*0x100*/ u16 volume;
 	/*0x104*/ u32 unk104;
 };