Rename many music related symbols

src/include/game/chr/chraicommands.h

@@ -249,8 +249,8 @@
 /*0x00f6*/ bool ai00f6(void);
 /*0x00f7*/ bool aiIfAllObjectivesComplete(void);
 /*0x00f8*/ bool aiIfPlayerIsInvincible(void);
-/*0x00f9*/ bool aiAudioPlayXMusic(void);
-/*0x00fa*/ bool aiAudioStopChannel(void);
+/*0x00f9*/ bool aiPlayXTrack(void);
+/*0x00fa*/ bool aiStopXTrack(void);
 /*0x00fb*/ bool aiChrExplosions(void);
 /*0x00fc*/ bool aiIfKillCountGreaterThan(void);
 /*0x00fd*/ bool ai00fd(void);
@@ -332,8 +332,8 @@
 /*0x014b*/ bool aiIfNotListening(void);
 /*0x0152*/ bool aiIfNumChrsInSquadronGreaterThan(void);
 /*0x0157*/ bool aiSetTintedGlassEnabled(void);
-/*0x015b*/ bool aiAudioPlayMusic(void);
-/*0x015c*/ bool aiAudioRestartMusic(void);
+/*0x015b*/ bool aiPlayTrackIsolated(void);
+/*0x015c*/ bool aiPlayDefaultTracks(void);
 /*0x0165*/ bool aiIfChrInjured(void);
 /*0x0166*/ bool aiIfAction(void);
 /*0x0167*/ bool aiHovercopterFireRocket(void);
@@ -358,10 +358,10 @@
 /*0x017a*/ bool aiIfCanSeeAttackTarget(void);
 /*0x017b*/ bool aiIfChrKnockedOut(void);
 /*0x017c*/ bool aiAssignSound(void);
-/*0x017d*/ bool aiAudioSetMusicTrack(void);
-/*0x017e*/ bool aiAudioRestartDefaultMusic(void);
-/*0x017f*/ bool aiAudioSetSfxTrack(void);
-/*0x0180*/ bool aiAudioRestartSfx(void);
+/*0x017d*/ bool aiPlayCutsceneTrack(void);
+/*0x017e*/ bool aiStopCutsceneTrack(void);
+/*0x017f*/ bool aiPlayTemporaryTrack(void);
+/*0x0180*/ bool aiStopAmbientTrack(void);
 /*0x0181*/ bool aiIfPlayerLookingAtObject(void);
 /*0x0182*/ bool aiPunchOrKick(void);
 /*0x0183*/ bool aiIfTargetIsPlayer(void);
@@ -437,7 +437,7 @@
 /*0x01d7*/ bool aiIfDistanceToTarget2LessThan(void);
 /*0x01d8*/ bool aiIfDistanceToTarget2GreaterThan(void);
 /*0x01d9*/ bool aiPlaySoundFromProp(void);
-/*0x01da*/ bool aiPlayMusicContinuously(void);
+/*0x01da*/ bool aiPlayTemporaryPrimaryTrack(void);
 /*0x01db*/ bool aiChrKill(void);
 /*0x01dc*/ bool aiRemoveWeaponFromInventory(void);
 /*0x01dd*/ bool ai01dd(void);

src/include/game/data/data_02a0e0.h

@@ -2,10 +2,10 @@
 #define IN_GAME_DATA_02A0E0_H
 #include <ultra64.h>
 
-extern s32 g_AudioCurrentBgMusicNum;
+extern s32 g_MenuTrack;
 extern u32 var800840c4;
-extern s32 var800840c8;
-extern s32 var800840cc;
+extern s32 g_TemporaryPrimaryTrack;
+extern s32 g_TemporaryAmbientTrack;
 extern s32 var800840d0;
 extern u32 var800840d4;
 extern u32 var800840d8;

src/include/game/game_16cfa0.h

@@ -3,42 +3,42 @@
 #include <ultra64.h>
 #include "types.h"
 
-u16 audioGetVolume(void);
-void func0f16cfe8(u16 volume);
-bool func0f16d0a8(s32 arg0, s32 arg1);
-s32 func0f16d124(s32 arg0);
-void func0f16d1bc(u32 arg0, u32 tracknum, f32 arg2, u16 volume);
-void func0f16d240(s32 arg0);
-void func0f16d2ac(s32 arg0, f32 arg1, s32 arg2);
+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 func0f16d430(void);
 void func0f16d44c(void);
-void func0f16d4b8(f32 arg0);
-void func0f16d548(f32 arg0);
-bool audioIsAnyPlayerInRoomWithFlag4000(void);
-void func0f16d89c(f32 arg0);
-void audioSetBgMusic(s32 tracknum);
-void func0f16d9a8(s32 stagenum);
-void func0f16d9f0(s32 stagenum);
+void musicStartPrimary(f32 arg0);
+void musicStartAmbient(f32 arg0);
+bool musicIsAnyPlayerInAmbientRoom(void);
+void musicStartX(f32 arg0);
+void musicStartMenu2(s32 tracknum);
+void musicSetStageAndStartMusic(s32 stagenum);
+void musicSetStage(s32 stagenum);
 void func0f16d9fc(void);
 void func0f16da2c(void);
 void func0f16daa4(void);
-void audioSetBgMusicForMenu(void);
+void musicStartForMenu(void);
 void func0f16db3c(void);
-void audioPlaySoloDeathTrack(void);
-void audioPlayMpDeathTrack(f32 arg0);
+void musicStartSoloDeath(void);
+void musicStartMpDeath(f32 arg0);
 void func0f16dd14(void);
 void func0f16ddb0(void);
-void audioPlayTrack(s32 tracknum);
-void audioRestartTrack(void);
-void func0f16deb8(s32 tracknum);
-void audioSetTrack(s32 tracknum);
-void audioRestartDefaultTrack(void);
-void audioSetAuxTrack(s32 tracknum);
-void audioRestartAuxTrack(void);
-void audioPlayXTrack(s32 index, u32 arg1, u32 duration);
-void audioStopTrack(s32 index);
+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 musicSetXReason(s32 index, u32 arg1, u32 duration);
+void musicUnsetXReason(s32 reason);
 void func0f16e138(void);
 
 #endif