diff --git a/src/audio/audio.c b/src/audio/audio.c
index 9dc0bb10c8..57429f7cdf 100644
--- a/src/audio/audio.c
+++ b/src/audio/audio.c
@@ -1561,7 +1561,7 @@ void start_title_music()
 			&& RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TITLE_DEMO) {
 		if (!RCT2_GLOBAL(0x009AF600, uint8)) {
 #ifdef USE_MIXER
-			gTitleMusicChannel = Mixer_Play_Music(musicPathId, true);
+			gTitleMusicChannel = Mixer_Play_Music(musicPathId, MIXER_LOOP_INFINITE, true);
 #else
 			RCT2_GLOBAL(0x014241BC, uint32) = 1;
 			int result = sound_channel_load_file2(3, (char*)get_file_path(musicPathId), 0);
@@ -1702,7 +1702,7 @@ void audio_init1()
 	audio_init2(devicenum);
 	int m = 0;
 	do {
-		rct_ride_music_info* ride_music_info = &RCT2_GLOBAL(0x009AF1C8, rct_ride_music_info*)[m];
+		rct_ride_music_info* ride_music_info = ride_music_info_list[m];
 		const char* path = get_file_path(ride_music_info->pathid);
 		FILE *file = fopen(path, "rb");
 		if (file != NULL) {
@@ -1710,7 +1710,7 @@ void audio_init1()
 			fclose(file);
 			RCT2_GLOBAL(0x014241BC, uint32) = 0;
 			if (RCT2_GLOBAL(0x009AF47E, uint32) == 0x78787878) {
-				ride_music_info->var_0 = 0;
+				ride_music_info->length = 0;
 			}
 		}
 		m++;
diff --git a/src/audio/audio.h b/src/audio/audio.h
index 3bea50adfd..037206227a 100644
--- a/src/audio/audio.h
+++ b/src/audio/audio.h
@@ -141,12 +141,13 @@ typedef struct {
 } rct_ride_music;
 
 typedef struct {
-	uint32 var_0;
-	uint32 var_4;
+	uint32 length;
+	uint32 offset;
 	uint8 pathid;	//0x8
 	uint8 var_9;
 } rct_ride_music_info;
 
+extern rct_ride_music_info* ride_music_info_list[];
 extern rct_vehicle_sound gVehicleSoundList[AUDIO_MAX_VEHICLE_SOUNDS];
 extern rct_vehicle_sound_params gVehicleSoundParamsList[AUDIO_MAX_VEHICLE_SOUNDS];
 extern rct_vehicle_sound_params *gVehicleSoundParamsListEnd;
diff --git a/src/audio/mixer.cpp b/src/audio/mixer.cpp
index 87105a355c..d2de4a6f70 100644
--- a/src/audio/mixer.cpp
+++ b/src/audio/mixer.cpp
@@ -836,7 +836,7 @@ int Mixer_Channel_SetOffset(void* channel, unsigned long offset)
 	return ((Channel*)channel)->SetOffset(offset);
 }
 
-void* Mixer_Play_Music(int pathid, int streaming)
+void* Mixer_Play_Music(int pathid, int loop, int streaming)
 {
 	if (streaming) {
 		const char* filename = get_file_path(pathid);
@@ -850,7 +850,7 @@ void* Mixer_Play_Music(int pathid, int streaming)
 		}
 		Source_SampleStream* source_samplestream = new Source_SampleStream;
 		if (source_samplestream->LoadWAV(rw)) {
-			Channel* channel = gMixer.Play(*source_samplestream, MIXER_LOOP_INFINITE, false, true);
+			Channel* channel = gMixer.Play(*source_samplestream, loop, false, true);
 			if (!channel) {
 				delete source_samplestream;
 			}
diff --git a/src/audio/mixer.h b/src/audio/mixer.h
index 6575401262..b313bde76b 100644
--- a/src/audio/mixer.h
+++ b/src/audio/mixer.h
@@ -188,7 +188,7 @@ void Mixer_Channel_Rate(void* channel, double rate);
 int Mixer_Channel_IsPlaying(void* channel);
 unsigned long Mixer_Channel_GetOffset(void* channel);
 int Mixer_Channel_SetOffset(void* channel, unsigned long offset);
-void* Mixer_Play_Music(int pathid, int streaming);
+void* Mixer_Play_Music(int pathid, int loop, int streaming);
 
 static int DStoMixerVolume(int volume) { return (int)(SDL_MIX_MAXVOLUME * (SDL_pow(10, (float)volume / 2000))); };
 static float DStoMixerPan(int pan) { return (((float)pan + -DSBPAN_LEFT) / DSBPAN_RIGHT) / 2; };
diff --git a/src/peep/peep.c b/src/peep/peep.c
index a468b8dd6a..08376afd04 100644
--- a/src/peep/peep.c
+++ b/src/peep/peep.c
@@ -4577,7 +4577,7 @@ void peep_update_crowd_noise()
 			// Load and play crowd noise
 #ifdef USE_MIXER
 			if (!gCrowdSoundChannel) {
-				gCrowdSoundChannel = Mixer_Play_Music(PATH_ID_CSS2, false);
+				gCrowdSoundChannel = Mixer_Play_Music(PATH_ID_CSS2, MIXER_LOOP_INFINITE, false);
 			}
 			if (gCrowdSoundChannel) {
 				Mixer_Channel_Volume(gCrowdSoundChannel, DStoMixerVolume(volume));
diff --git a/src/ride/ride.c b/src/ride/ride.c
index be93c5dc0a..df3d5ad06e 100644
--- a/src/ride/ride.c
+++ b/src/ride/ride.c
@@ -21,6 +21,7 @@
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../audio/mixer.h"
+#include "../common.h"
 #include "../config.h"
 #include "../game.h"
 #include "../input.h"
@@ -1940,6 +1941,45 @@ rct_peep *ride_get_assigned_mechanic(rct_ride *ride)
 
 #pragma region Music functions
 
+#define MAKE_TUNEID_LIST(...) (uint8[]){(countof(((uint8[]){__VA_ARGS__}))), __VA_ARGS__}
+
+//0x009AEF28
+uint8 *ride_music_style_tuneids[] = {
+	MAKE_TUNEID_LIST(13), // MUSIC_STYLE_DODGEMS_BEAT
+	MAKE_TUNEID_LIST(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12), // MUSIC_STYLE_FAIRGROUND_ORGAN
+	MAKE_TUNEID_LIST(15), // MUSIC_STYLE_ROMAN_FANFARE
+	MAKE_TUNEID_LIST(16), // MUSIC_STYLE_ORIENTAL
+	MAKE_TUNEID_LIST(17), // MUSIC_STYLE_MARTIAN
+	MAKE_TUNEID_LIST(18), // MUSIC_STYLE_JUNGLE_DRUMS
+	MAKE_TUNEID_LIST(19), // MUSIC_STYLE_EGYPTIAN
+	MAKE_TUNEID_LIST(20), // MUSIC_STYLE_TOYLAND
+	MAKE_TUNEID_LIST(21), // MUSIC_STYLE_8
+	MAKE_TUNEID_LIST(22), // MUSIC_STYLE_SPACE
+	MAKE_TUNEID_LIST(23), // MUSIC_STYLE_HORROR
+	MAKE_TUNEID_LIST(24), // MUSIC_STYLE_TECHNO
+	MAKE_TUNEID_LIST(25), // MUSIC_STYLE_GENTLE
+	MAKE_TUNEID_LIST(26), // MUSIC_STYLE_SUMMER
+	MAKE_TUNEID_LIST(27), // MUSIC_STYLE_WATER
+	MAKE_TUNEID_LIST(28), // MUSIC_STYLE_WILD_WEST
+	MAKE_TUNEID_LIST(29), // MUSIC_STYLE_JURASSIC
+	MAKE_TUNEID_LIST(30), // MUSIC_STYLE_ROCK
+	MAKE_TUNEID_LIST(31), // MUSIC_STYLE_RAGTIME
+	MAKE_TUNEID_LIST(32), // MUSIC_STYLE_FANTASY
+	MAKE_TUNEID_LIST(33), // MUSIC_STYLE_ROCK_STYLE_2
+	MAKE_TUNEID_LIST(34), // MUSIC_STYLE_ICE
+	MAKE_TUNEID_LIST(35), // MUSIC_STYLE_SNOW
+	MAKE_TUNEID_LIST(36), // MUSIC_STYLE_CUSTOM_MUSIC_1
+	MAKE_TUNEID_LIST(37), // MUSIC_STYLE_CUSTOM_MUSIC_2
+	MAKE_TUNEID_LIST(38), // MUSIC_STYLE_MEDIEVAL
+	MAKE_TUNEID_LIST(39), // MUSIC_STYLE_URBAN
+	MAKE_TUNEID_LIST(40), // MUSIC_STYLE_ORGAN
+	MAKE_TUNEID_LIST(41), // MUSIC_STYLE_MECHANICAL
+	MAKE_TUNEID_LIST(42), // MUSIC_STYLE_MODERN
+	MAKE_TUNEID_LIST(43), // MUSIC_STYLE_PIRATES
+	MAKE_TUNEID_LIST(44), // MUSIC_STYLE_ROCK_STYLE_3
+	MAKE_TUNEID_LIST(45), // MUSIC_STYLE_CANDY_STYLE
+};
+
 /**
  *
  *  rct2: 0x006ABE85
@@ -1991,7 +2031,7 @@ static void ride_music_update(int rideIndex)
 
 	// Select random tune from available tunes for a music style (of course only merry-go-rounds have more than one tune)
 	if (ride->music_tune_id == 255) {
-		uint8 *musicStyleTunes = RCT2_ADDRESS(0x009AEF28, uint8*)[ride->music];
+		uint8 *musicStyleTunes = ride_music_style_tuneids[ride->music];
 		uint8 numTunes = *musicStyleTunes++;
 		ride->music_tune_id = musicStyleTunes[scenario_rand() % numTunes];
 		ride->music_position = 0;
@@ -2672,8 +2712,8 @@ int ride_music_params_update(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint
 				ride_music++;
 				channel++;
 				if (channel >= AUDIO_MAX_RIDE_MUSIC) {
-					rct_ride_music_info* ride_music_info = &RCT2_GLOBAL(0x009AF1C8, rct_ride_music_info*)[*tuneId];
-					a1 = position + ride_music_info->var_4;
+					rct_ride_music_info* ride_music_info = ride_music_info_list[*tuneId];
+					a1 = position + ride_music_info->offset;
 					goto label51;
 				}
 			}
@@ -2696,7 +2736,7 @@ int ride_music_params_update(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint
 			RCT2_GLOBAL(0x014241BC, uint32) = 0;
 #endif
 		label51:
-			if (a1 < RCT2_GLOBAL(0x009AF1C8, rct_ride_music_info*)[*tuneId].var_0) {
+			if (a1 < ride_music_info_list[*tuneId]->length) {
 				position = a1;
 				rct_ride_music_params* ride_music_params = gRideMusicParamsListEnd;//RCT2_GLOBAL(0x009AF42C, rct_ride_music_params*);
 				if (ride_music_params < &gRideMusicParamsList[AUDIO_MAX_RIDE_MUSIC]/*(rct_ride_music_params*)0x009AF46C*/) {
@@ -2715,9 +2755,9 @@ int ride_music_params_update(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint
 		} else {
 		label58:
 			;
-			rct_ride_music_info* ride_music_info = &RCT2_GLOBAL(0x009AF1C8, rct_ride_music_info*)[*tuneId];
-			position += ride_music_info->var_4;
-			if (position < ride_music_info->var_0) {
+			rct_ride_music_info* ride_music_info = ride_music_info_list[*tuneId];
+			position += ride_music_info->offset;
+			if (position < ride_music_info->length) {
 				return position;
 			} else {
 				*tuneId = 0xFF;
@@ -2728,6 +2768,58 @@ int ride_music_params_update(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint
 	return position;
 }
 
+#define INIT_MUSIC_INFO(pathid, offset, length, unknown) (rct_ride_music_info[]){length, offset, pathid, unknown}
+
+//0x009AF1C8
+rct_ride_music_info* ride_music_info_list[] = {
+	INIT_MUSIC_INFO(PATH_ID_CSS4, 1378, 8139054, 0),
+	INIT_MUSIC_INFO(PATH_ID_CSS5, 1378, 7796656, 0),
+	INIT_MUSIC_INFO(PATH_ID_CSS6, 1378, 15787850, 0),
+	INIT_MUSIC_INFO(PATH_ID_CSS7, 1378, 15331658, 0),
+	INIT_MUSIC_INFO(PATH_ID_CSS8, 1378, 17503414, 0),
+	INIT_MUSIC_INFO(PATH_ID_CSS9, 1378, 7005802, 0),
+	INIT_MUSIC_INFO(PATH_ID_CSS10, 1378, 0, 0),
+	INIT_MUSIC_INFO(PATH_ID_CSS11, 1378, 7023288, 0),
+	INIT_MUSIC_INFO(PATH_ID_CSS12, 1378, 2767948, 0),
+	INIT_MUSIC_INFO(PATH_ID_CSS13, 1378, 3373390, 0),
+	INIT_MUSIC_INFO(PATH_ID_CSS14, 1378, 20783042, 0),
+	INIT_MUSIC_INFO(PATH_ID_CSS15, 1378, 10009312, 0),
+	INIT_MUSIC_INFO(PATH_ID_CSS16, 1378, 0, 0),
+	INIT_MUSIC_INFO(PATH_ID_CSS3, 689, 1244886, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS17, 2756, -1, 0),
+	INIT_MUSIC_INFO(PATH_ID_CSS18, 2756, 8429568, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS19, 2756, 10143784, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS20, 2756, 12271656, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS21, 2756, 9680968, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS22, 2756, 10062056, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS23, 2756, 11067432, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS24, 2756, 12427456, 0),
+	INIT_MUSIC_INFO(PATH_ID_CSS25, 2756, 15181512, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS26, 2756, 10694816, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS27, 2756, 10421232, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS28, 2756, 13118376, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS29, 2756, 15310892, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS30, 2756, 10215464, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS31, 2756, 11510316, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS32, 2756, 11771944, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS33, 2756, 10759724, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS34, 2756, 14030716, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS35, 2756, 11642576, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS36, 2756, 8953764, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS37, 2756, 13303852, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS38, 2756, 10093888, 1),
+	INIT_MUSIC_INFO(PATH_ID_CUSTOM1, 2756, 16620, 1),
+	INIT_MUSIC_INFO(PATH_ID_CUSTOM2, 2756, 13055722, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS39, 2756, 7531564, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS40, 1378, 5291306, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS41, 2756, 27860700, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS42, 2756, 6774090, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS43, 2756, 15630412, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS44, 2756, 8209704, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS45, 2756, 10006740, 1),
+	INIT_MUSIC_INFO(PATH_ID_CSS46, 2756, 6772776, 1),
+};
+
 /**
 *  Play/update ride music based on structs updated in 0x006BC3AC
 *  rct2: 0x006BC6D8
@@ -2746,7 +2838,7 @@ void ride_music_update_final()
 					rct_ride_music_params* ride_music_params = &gRideMusicParamsList[0];//&RCT2_GLOBAL(0x009AF430, rct_ride_music_params);
 					while (ride_music_params < gRideMusicParamsListEnd/*RCT2_GLOBAL(0x009AF42C, rct_ride_music_params*)*/) {
 						if (ride_music_params->rideid != (uint8)-1) {
-							rct_ride_music_info* ride_music_info = &RCT2_GLOBAL(0x009AF1C8, rct_ride_music_info*)[ride_music_params->tuneid];
+							rct_ride_music_info* ride_music_info = ride_music_info_list[ride_music_params->tuneid];
 							if (RCT2_ADDRESS(0x009AA0B1, uint8*)[ride_music_info->pathid]) { // file_on_cdrom[]
 								v8++;
 								if (v9 >= ride_music_params->volume) {
@@ -2829,10 +2921,10 @@ void ride_music_update_final()
 							ride_music++;
 							channel++;
 							if (channel >= AUDIO_MAX_RIDE_MUSIC) {
-								rct_ride_music_info* ride_music_info = &RCT2_GLOBAL(0x009AF1C8, rct_ride_music_info*)[ride_music_params->tuneid];
+								rct_ride_music_info* ride_music_info = ride_music_info_list[ride_music_params->tuneid];
 #ifdef USE_MIXER
 								rct_ride_music* ride_music = &gRideMusicList[ebx];
-								ride_music->sound_channel = Mixer_Play_Music(ride_music_info->pathid, true);
+								ride_music->sound_channel = Mixer_Play_Music(ride_music_info->pathid, MIXER_LOOP_NONE, true);
 								if (ride_music->sound_channel) {
 									ride_music->volume = ride_music_params->volume;
 									ride_music->pan = ride_music_params->pan;