25 files changed, 11987 insertions, 5164 deletions

diff --git a/src/audio/AudioCollision.cpp b/src/audio/AudioCollision.cpp
index 250cd18e..decb73e5 100644
--- a/src/audio/AudioCollision.cpp
+++ b/src/audio/AudioCollision.cpp
@@ -158,7 +158,7 @@ cAudioManager::SetLoopingCollisionRequestedSfxFreqAndGetVol(const cAudioCollisio
 void
 cAudioManager::SetUpLoopingCollisionSound(const cAudioCollision &col, uint8 counter)
 {
-    bool distCalculated = false;
+    bool8 distCalculated = FALSE;
 	if(col.m_fIntensity2 > 0.0016f) {
 		uint8 emittingVol = SetLoopingCollisionRequestedSfxFreqAndGetVol(col);
 		if(emittingVol) {
@@ -168,20 +168,17 @@ cAudioManager::SetUpLoopingCollisionSound(const cAudioCollision &col, uint8 coun
 				m_sQueueSample.m_nCounter = counter;
 				m_sQueueSample.m_vecPos = col.m_vecPosition;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-				m_sQueueSample.m_bIs2D = false;
+				m_sQueueSample.m_bIs2D = FALSE;
 				m_sQueueSample.m_nReleasingVolumeModificator = 7;
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_nLoopStart =
-				    SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd =
-				    SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+				SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 				m_sQueueSample.m_fSpeedMultiplier = 4.0f;
 				m_sQueueSample.m_fSoundIntensity = CollisionSoundIntensity;
-				m_sQueueSample.m_bReleasingSoundFlag = false;
+				m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 				m_sQueueSample.m_nReleasingVolumeDivider = 5;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
+				m_sQueueSample.m_bReverbFlag = TRUE;
+				m_sQueueSample.m_bRequireReflection = FALSE;
 				AddSampleToRequestedQueue();
 			}
 		}
@@ -311,17 +308,16 @@ cAudioManager::SetUpOneShotCollisionSound(const cAudioCollision &col)
 				if(counter >= 255) counter = 28;
 				m_sQueueSample.m_vecPos = col.m_vecPosition;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-				m_sQueueSample.m_bIs2D = false;
+				m_sQueueSample.m_bIs2D = FALSE;
 				m_sQueueSample.m_nReleasingVolumeModificator = 11;
 				m_sQueueSample.m_nLoopCount = 1;
 				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_nLoopStart = 0;
-				m_sQueueSample.m_nLoopEnd = -1;
+				RESET_LOOP_OFFSETS
 				m_sQueueSample.m_fSpeedMultiplier = 4.0f;
 				m_sQueueSample.m_fSoundIntensity = CollisionSoundIntensity;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
+				m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+				m_sQueueSample.m_bReverbFlag = TRUE;
+				m_sQueueSample.m_bRequireReflection = FALSE;
 				AddSampleToRequestedQueue();
 			}
 		}
@@ -332,13 +328,12 @@ void
 cAudioManager::ServiceCollisions()
 {
 	int i, j;
-	bool abRepeatedCollision1[NUMAUDIOCOLLISIONS];
-	bool abRepeatedCollision2[NUMAUDIOCOLLISIONS];
+	bool8 abRepeatedCollision1[NUMAUDIOCOLLISIONS];
+	bool8 abRepeatedCollision2[NUMAUDIOCOLLISIONS];
 
 	m_sQueueSample.m_nEntityIndex = m_nCollisionEntity;
 
-	for (int i = 0; i < NUMAUDIOCOLLISIONS; i++)
-		abRepeatedCollision1[i] = abRepeatedCollision2[i] = false;
+	for (int i = 0; i < NUMAUDIOCOLLISIONS; i++) abRepeatedCollision1[i] = abRepeatedCollision2[i] = FALSE;
 
 	for (i = 0; i < m_sCollisionManager.m_bCollisionsInQueue; i++) {
 		for (j = 0; j < NUMAUDIOCOLLISIONS; j++) {
@@ -348,8 +343,8 @@ cAudioManager::ServiceCollisions()
 				&& (m_sCollisionManager.m_asCollisions1[index].m_bSurface1 == m_sCollisionManager.m_asCollisions2[j].m_bSurface1)
 				&& (m_sCollisionManager.m_asCollisions1[index].m_bSurface2 == m_sCollisionManager.m_asCollisions2[j].m_bSurface2)
 				) {
-				abRepeatedCollision1[index] = true;
-				abRepeatedCollision2[j] = true;
+				abRepeatedCollision1[index] = TRUE;
+				abRepeatedCollision2[j] = TRUE;
 				m_sCollisionManager.m_asCollisions1[index].m_nBaseVolume = ++m_sCollisionManager.m_asCollisions2[j].m_nBaseVolume;
 				SetUpLoopingCollisionSound(m_sCollisionManager.m_asCollisions1[index], j);
 				break;
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index 457e09c0..6685a47d 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -43,9 +43,9 @@
 #include "Script.h"
 #include "Wanted.h"
 
-const int channels = ARRAY_SIZE(AudioManager.m_asActiveSamples);
-const int policeChannel = channels + 1;
-const int allChannels = channels + 2;
+#ifndef GTA_PS2
+#define CHANNEL_PLAYER_VEHICLE_ENGINE m_nActiveSamples
+#endif
 
 enum PLAY_STATUS { PLAY_STATUS_STOPPED = 0, PLAY_STATUS_PLAYING, PLAY_STATUS_FINISHED };
 enum LOADING_STATUS { LOADING_STATUS_NOT_LOADED = 0, LOADING_STATUS_LOADED, LOADING_STATUS_FAILED };
@@ -123,62 +123,62 @@ cAudioManager::PostInitialiseGameSpecificSetup()
 {
 	m_nFireAudioEntity = CreateEntity(AUDIOTYPE_FIRE, &gFireManager);
 	if (m_nFireAudioEntity >= 0)
-		SetEntityStatus(m_nFireAudioEntity, true);
+		SetEntityStatus(m_nFireAudioEntity, TRUE);
 
 	m_nCollisionEntity = CreateEntity(AUDIOTYPE_COLLISION, (void *)1);
 	if (m_nCollisionEntity >= 0)
-		SetEntityStatus(m_nCollisionEntity, true);
+		SetEntityStatus(m_nCollisionEntity, TRUE);
 
 	m_nFrontEndEntity = CreateEntity(AUDIOTYPE_FRONTEND, (void *)1);
 	if (m_nFrontEndEntity >= 0)
-		SetEntityStatus(m_nFrontEndEntity, true);
+		SetEntityStatus(m_nFrontEndEntity, TRUE);
 
 	m_nProjectileEntity = CreateEntity(AUDIOTYPE_PROJECTILE, (void *)1);
 	if (m_nProjectileEntity >= 0)
-		SetEntityStatus(m_nProjectileEntity, true);
+		SetEntityStatus(m_nProjectileEntity, TRUE);
 
 	m_nWaterCannonEntity = CreateEntity(AUDIOTYPE_WATERCANNON, (void *)1);
 	if (m_nWaterCannonEntity >= 0)
-		SetEntityStatus(m_nWaterCannonEntity, true);
+		SetEntityStatus(m_nWaterCannonEntity, TRUE);
 
 	m_nPoliceChannelEntity = CreateEntity(AUDIOTYPE_POLICERADIO, (void *)1);
 	if (m_nPoliceChannelEntity >= 0)
-		SetEntityStatus(m_nPoliceChannelEntity, true);
+		SetEntityStatus(m_nPoliceChannelEntity, TRUE);
 #ifdef GTA_BRIDGE
 	m_nBridgeEntity = CreateEntity(AUDIOTYPE_BRIDGE, (void*)1);
 	if (m_nBridgeEntity >= 0)
-		SetEntityStatus(m_nBridgeEntity, true);
+		SetEntityStatus(m_nBridgeEntity, TRUE);
 #endif // GTA_BRIDGE
 	m_nEscalatorEntity = CreateEntity(AUDIOTYPE_ESCALATOR, (void*)1);
 	if (m_nEscalatorEntity >= 0)
-		SetEntityStatus(m_nEscalatorEntity, true);
+		SetEntityStatus(m_nEscalatorEntity, TRUE);
 
 	m_nExtraSoundsEntity = CreateEntity(AUDIOTYPE_EXTRA_SOUNDS, (void*)1);
 	if (m_nExtraSoundsEntity >= 0)
-		SetEntityStatus(m_nExtraSoundsEntity, true);
+		SetEntityStatus(m_nExtraSoundsEntity, TRUE);
 
 
 	m_sMissionAudio.m_nSampleIndex[0] = NO_SAMPLE;
 	m_sMissionAudio.m_nLoadingStatus[0] = LOADING_STATUS_NOT_LOADED;
 	m_sMissionAudio.m_nPlayStatus[0] = PLAY_STATUS_STOPPED;
-	m_sMissionAudio.m_bIsPlaying[0] = false;
-	m_sMissionAudio.m_bIsPlayed[0] = false;
-	m_sMissionAudio.m_bPredefinedProperties[0] = true;
+	m_sMissionAudio.m_bIsPlaying[0] = FALSE;
+	m_sMissionAudio.m_bIsPlayed[0] = FALSE;
+	m_sMissionAudio.m_bPredefinedProperties[0] = TRUE;
 	m_sMissionAudio.m_nMissionAudioCounter[0] = 0;
-	m_sMissionAudio.m_bIsMobile[0] = false;
+	m_sMissionAudio.m_bIsMobile[0] = FALSE;
 	field_5538 = 127;
 	m_sMissionAudio.m_nSampleIndex[1] = NO_SAMPLE;
 	m_sMissionAudio.m_nLoadingStatus[1] = LOADING_STATUS_NOT_LOADED;
 	m_sMissionAudio.m_nPlayStatus[1] = PLAY_STATUS_STOPPED;
-	m_sMissionAudio.m_bIsPlaying[1] = false;
-	m_sMissionAudio.m_bIsPlayed[1] = false;
-	m_sMissionAudio.m_bPredefinedProperties[1] = true;
+	m_sMissionAudio.m_bIsPlaying[1] = FALSE;
+	m_sMissionAudio.m_bIsPlayed[1] = FALSE;
+	m_sMissionAudio.m_bPredefinedProperties[1] = TRUE;
 	m_sMissionAudio.m_nMissionAudioCounter[1] = 0;
-	m_sMissionAudio.m_bIsMobile[1] = false;
+	m_sMissionAudio.m_bIsMobile[1] = FALSE;
 	field_5538 = 127;
 
 	ResetAudioLogicTimers(CTimer::GetTimeInMilliseconds());
-	m_bIsPlayerShutUp = false;
+	m_bIsPlayerShutUp = FALSE;
 	m_nPlayerMood = PLAYER_MOOD_CALM;
 	m_nPlayerMoodTimer = 0;
 }
@@ -246,23 +246,25 @@ cAudioManager::ResetAudioLogicTimers(uint32 timer)
 	}
 	ClearMissionAudio(0);
 	ClearMissionAudio(1);
-	SampleManager.StopChannel(policeChannel);
+	SampleManager.StopChannel(CHANNEL_POLICE_RADIO);
 }
 
 void
 cAudioManager::ProcessReverb() const
 {
 #ifdef FIX_BUGS
-	const uint32 numChannels = channels;
+	const uint32 numChannels = NUM_CHANNELS_GENERIC;
 #else
-	const uint32 numChannels = 28;
+	const uint32 numChannels = NUM_CHANNELS_GENERIC+1;
 #endif
 
 	if (SampleManager.UpdateReverb() && m_bDynamicAcousticModelingStatus) {
+#ifndef GTA_PS2
 		for (uint32 i = 0; i < numChannels; i++) {
 			if (m_asActiveSamples[i].m_bReverbFlag)
-				SampleManager.SetChannelReverbFlag(i, true);
+				SampleManager.SetChannelReverbFlag(i, TRUE);
 		}
+#endif
 	}
 }
 
@@ -274,11 +276,11 @@ cAudioManager::GetDistanceSquared(const CVector &v) const
 }
 
 void
-cAudioManager::CalculateDistance(bool &distCalculated, float dist)
+cAudioManager::CalculateDistance(bool8 &distCalculated, float dist)
 {
 	if (!distCalculated) {
 		m_sQueueSample.m_fDistance = Sqrt(dist);
-		distCalculated = true;
+		distCalculated = TRUE;
 	}
 }
 
@@ -347,7 +349,7 @@ cAudioManager::ProcessSpecial()
 			if (playerPed->m_audioEntityId >= 0 && m_asAudioEntities[playerPed->m_audioEntityId].m_bIsUsed) {
 				if (playerPed->EnteringCar()) {
 					if(!playerPed->bInVehicle && CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle == nil)
-						SampleManager.StopChannel(m_nActiveSamples);
+						SampleManager.StopChannel(CHANNEL_PLAYER_VEHICLE_ENGINE);
 				}
 			}
 		}
@@ -362,56 +364,56 @@ cAudioManager::ProcessEntity(int32 id)
 		switch (m_asAudioEntities[id].m_nType) {
 		case AUDIOTYPE_PHYSICAL:
 			if (!m_nUserPause) {
-				m_sQueueSample.m_bReverbFlag = true;
+				m_sQueueSample.m_bReverbFlag = TRUE;
 				ProcessPhysical(id);
 			}
 			break;
 		case AUDIOTYPE_EXPLOSION:
 			if (!m_nUserPause) {
-				m_sQueueSample.m_bReverbFlag = true;
+				m_sQueueSample.m_bReverbFlag = TRUE;
 				ProcessExplosions(id);
 			}
 			break;
 		case AUDIOTYPE_FIRE:
 			if (!m_nUserPause) {
-				m_sQueueSample.m_bReverbFlag = true;
+				m_sQueueSample.m_bReverbFlag = TRUE;
 				ProcessFires(id);
 			}
 			break;
 		case AUDIOTYPE_WEATHER:
 			if (!m_nUserPause) {
-				m_sQueueSample.m_bReverbFlag = true;
+				m_sQueueSample.m_bReverbFlag = TRUE;
 				if(CGame::currArea == AREA_MAIN_MAP || CGame::currArea == AREA_EVERYWHERE)
 					ProcessWeather(id);
 			}
 			break;
 /*		case AUDIOTYPE_CRANE:
 			if (!m_nUserPause) {
-				m_sQueueSample.m_bReverbFlag = true;
+				m_sQueueSample.m_bReverbFlag = TRUE;
 				ProcessCrane();
 			}
 			break;*/
 		case AUDIOTYPE_SCRIPTOBJECT:
 			if (!m_nUserPause) {
-				m_sQueueSample.m_bReverbFlag = true;
+				m_sQueueSample.m_bReverbFlag = TRUE;
 				ProcessScriptObject(id);
 			}
 			break;
 #ifdef GTA_BRIDGE
 		case AUDIOTYPE_BRIDGE:
 			if (!m_nUserPause) {
-				m_sQueueSample.m_bReverbFlag = true;
+				m_sQueueSample.m_bReverbFlag = TRUE;
 				ProcessBridge();
 			}
 			break;
 #endif
 		case AUDIOTYPE_FRONTEND:
-			m_sQueueSample.m_bReverbFlag = false;
+			m_sQueueSample.m_bReverbFlag = FALSE;
 			ProcessFrontEnd();
 			break;
 		case AUDIOTYPE_PROJECTILE:
 			if (!m_nUserPause) {
-				m_sQueueSample.m_bReverbFlag = true;
+				m_sQueueSample.m_bReverbFlag = TRUE;
 				ProcessProjectiles();
 			}
 			break;
@@ -421,25 +423,25 @@ cAudioManager::ProcessEntity(int32 id)
 			break;
 		case AUDIOTYPE_FIREHYDRANT:
 			if (!m_nUserPause) {
-				m_sQueueSample.m_bReverbFlag = true;
+				m_sQueueSample.m_bReverbFlag = TRUE;
 				ProcessFireHydrant();
 			}
 			break;
 		case AUDIOTYPE_WATERCANNON:
 			if (!m_nUserPause) {
-				m_sQueueSample.m_bReverbFlag = true;
+				m_sQueueSample.m_bReverbFlag = TRUE;
 				ProcessWaterCannon(id);
 			}
 			break;
 		case AUDIOTYPE_ESCALATOR:
 			if (!m_nUserPause) {
-				m_sQueueSample.m_bReverbFlag = true;
+				m_sQueueSample.m_bReverbFlag = TRUE;
 				ProcessEscalators();
 			}
 			break;
 		case AUDIOTYPE_EXTRA_SOUNDS:
 			if (!m_nUserPause) {
-				m_sQueueSample.m_bReverbFlag = true;
+				m_sQueueSample.m_bReverbFlag = TRUE;
 				ProcessExtraSounds();
 			}
 			break;
@@ -606,138 +608,141 @@ struct tVehicleSampleData {
 };
 
 const tVehicleSampleData aVehicleSettings[MAX_CARS] = {
-	{SFX_CAR_REV_10, SFX_BANK_PATHFINDER, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9935, OLD_DOOR},
-	{SFX_CAR_REV_11, SFX_BANK_PACARD, SFX_CAR_HORN_56CHEV, 11487, SFX_CAR_HORN_JEEP, 9900, OLD_DOOR},
-	{SFX_CAR_REV_2, SFX_BANK_PORSCHE, SFX_CAR_HORN_PORSCHE, 11025, SFX_CAR_HORN_JEEP, 9890, NEW_DOOR},
-	{SFX_CAR_REV_5, SFX_BANK_TRUCK, SFX_CAR_HORN_TRUCK, 29711, SFX_CAR_HORN_JEEP, 9960, TRUCK_DOOR},
-	{SFX_CAR_REV_11, SFX_BANK_PACARD, SFX_CAR_HORN_56CHEV, 12893, SFX_CAR_HORN_JEEP, 9500, OLD_DOOR},
-	{SFX_CAR_REV_4, SFX_BANK_MERC, SFX_CAR_HORN_BMW328, 10706, SFX_CAR_HORN_JEEP, 9600, NEW_DOOR},
-	{SFX_CAR_REV_1, SFX_BANK_0, SFX_CAR_HORN_TRUCK, 29711, SFX_CAR_HORN_JEEP, 9700, NEW_DOOR},
-	{SFX_CAR_REV_5, SFX_BANK_TRUCK, SFX_CAR_HORN_TRUCK, 29711, SFX_POLICE_SIREN_SLOW, 10588, TRUCK_DOOR},
-	{SFX_CAR_REV_5, SFX_BANK_TRUCK, SFX_CAR_HORN_TRUCK, 31478, SFX_CAR_HORN_JEEP, 9800, TRUCK_DOOR},
-	{SFX_CAR_REV_11, SFX_BANK_PACARD, SFX_CAR_HORN_BMW328, 9538, SFX_CAR_HORN_JEEP, 9900, NEW_DOOR},
-	{SFX_CAR_REV_11, SFX_BANK_PACARD, SFX_CAR_HORN_56CHEV, 10842, SFX_CAR_HORN_JEEP, 10000, OLD_DOOR},
-	{SFX_CAR_REV_7, SFX_BANK_COBRA, SFX_CAR_HORN_BMW328, 12017, SFX_CAR_HORN_JEEP, 9900, NEW_DOOR},
-	{SFX_CAR_REV_9, SFX_BANK_CADILLAC, SFX_CAR_HORN_JEEP, 22293, SFX_CAR_HORN_JEEP, 9800, NEW_DOOR},
-	{SFX_CAR_REV_3, SFX_BANK_SPIDER, SFX_CAR_HORN_BUS2, 18000, SFX_CAR_HORN_JEEP, 9700, OLD_DOOR},
-	{SFX_CAR_REV_3, SFX_BANK_SPIDER, SFX_CAR_HORN_BUS, 18286, SFX_CAR_HORN_JEEP, 9600, OLD_DOOR},
-	{SFX_CAR_REV_2, SFX_BANK_PORSCHE, SFX_CAR_HORN_PORSCHE, 11025, SFX_CAR_HORN_JEEP, 9500, NEW_DOOR},
-	{SFX_CAR_REV_3, SFX_BANK_SPIDER, SFX_CAR_HORN_JEEP, 22295, SFX_AMBULANCE_SIREN_SLOW, 12688, OLD_DOOR},
-	{SFX_CAR_REV_4, SFX_BANK_MERC, SFX_CAR_HORN_PORSCHE, 9271, SFX_POLICE_SIREN_SLOW, 11471, NEW_DOOR},
-	{SFX_CAR_REV_11, SFX_BANK_PACARD, SFX_CAR_HORN_56CHEV, 12170, SFX_CAR_HORN_JEEP, 9400, OLD_DOOR},
-	{SFX_CAR_REV_11, SFX_BANK_PACARD, SFX_CAR_HORN_BMW328, 11000, SFX_CAR_HORN_JEEP, 9300, OLD_DOOR},
-	{SFX_CAR_REV_10, SFX_BANK_PATHFINDER, SFX_CAR_HORN_BMW328, 10796, SFX_CAR_HORN_JEEP, 9200, NEW_DOOR},
-	{SFX_CAR_REV_4, SFX_BANK_MERC, SFX_CAR_HORN_BMW328, 10500, SFX_CAR_HORN_JEEP, 9100, NEW_DOOR},
-	{SFX_CAR_REV_10, SFX_BANK_PATHFINDER, SFX_CAR_HORN_PICKUP, 10924, SFX_CAR_HORN_JEEP, 9000, OLD_DOOR},
-	{SFX_CAR_REV_3, SFX_BANK_SPIDER, SFX_CAR_HORN_PICKUP, 11025, SFX_ICE_CREAM_TUNE, 11025, OLD_DOOR},
-	{SFX_CAR_REV_6, SFX_BANK_HOTROD, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9100, OLD_DOOR},
-	{SFX_HELI_APACHE_1, SFX_BANK_HELI_APACHE, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9200, NEW_DOOR},
-	{SFX_CAR_REV_4, SFX_BANK_MERC, SFX_CAR_HORN_BMW328, 10706, SFX_POLICE_SIREN_SLOW, 10511, NEW_DOOR},
-	{SFX_CAR_REV_3, SFX_BANK_SPIDER, SFX_CAR_HORN_BUS, 17260, SFX_POLICE_SIREN_SLOW, 11029, OLD_DOOR},
-	{SFX_CAR_REV_3, SFX_BANK_SPIDER, SFX_CAR_HORN_PICKUP, 8670, SFX_CAR_HORN_JEEP, 9300, OLD_DOOR},
-	{SFX_CAR_REV_7, SFX_BANK_COBRA, SFX_CAR_HORN_PORSCHE, 10400, SFX_CAR_HORN_JEEP, 9400, NEW_DOOR},
-	{SFX_CAR_REV_1, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_POLICE_SIREN_SLOW, 11912, NEW_DOOR},
-	{SFX_CAR_REV_5, SFX_BANK_TRUCK, SFX_CAR_HORN_BUS2, 11652, SFX_CAR_HORN_JEEP, 9500, BUS_DOOR},
-	{SFX_CAR_REV_5, SFX_BANK_TRUCK, SFX_CAR_HORN_TRUCK, 29711, SFX_CAR_HORN_JEEP, 9600, TRUCK_DOOR},
-	{SFX_CAR_REV_5, SFX_BANK_TRUCK, SFX_CAR_HORN_TRUCK, 28043, SFX_CAR_HORN_JEEP, 9700, TRUCK_DOOR},
-	{SFX_CAR_REV_6, SFX_BANK_HOTROD, SFX_CAR_HORN_JEEP, 25400, SFX_CAR_HORN_JEEP, 9800, OLD_DOOR},
-	{SFX_CAR_REV_1, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9900, NEW_DOOR},
-	{SFX_CAR_REV_17, SFX_BANK_VTWIN, SFX_CAR_HORN_JEEP, 26313, SFX_CAR_HORN_JEEP, 10000, NEW_DOOR},
-	{SFX_CAR_REV_5, SFX_BANK_TRUCK, SFX_CAR_HORN_BUS, 16291, SFX_CAR_HORN_JEEP, 10100, BUS_DOOR},
-	{SFX_CAR_REV_11, SFX_BANK_PACARD, SFX_CAR_HORN_56CHEV, 10842, SFX_CAR_HORN_JEEP, 9900, OLD_DOOR},
-	{SFX_CAR_REV_11, SFX_BANK_PACARD, SFX_CAR_HORN_56CHEV, 10233, SFX_CAR_HORN_JEEP, 9800, NEW_DOOR},
-	{SFX_CAR_REV_3, SFX_BANK_SPIDER, SFX_CAR_HORN_PICKUP, 8670, SFX_CAR_HORN_JEEP, 9700, OLD_DOOR},
+	{SFX_CAR_REV_PORSHE, SFX_BANK_PORSCHE, SFX_CAR_HORN_PORSCHE, 11025, SFX_CAR_HORN_JEEP, 9890, NEW_DOOR},
+	{SFX_CAR_REV_PATHFINDER, SFX_BANK_PATHFINDER, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9935, OLD_DOOR},
+	{SFX_CAR_REV_PACARD, SFX_BANK_PACARD, SFX_CAR_HORN_56CHEV, 11487, SFX_CAR_HORN_JEEP, 9900, OLD_DOOR},
+	{SFX_CAR_REV_PORSHE, SFX_BANK_PORSCHE, SFX_CAR_HORN_PORSCHE, 11025, SFX_CAR_HORN_JEEP, 9890, NEW_DOOR},
+	{SFX_CAR_REV_TRUCK, SFX_BANK_TRUCK, SFX_CAR_HORN_TRUCK, 29711, SFX_CAR_HORN_JEEP, 9960, TRUCK_DOOR},
+	{SFX_CAR_REV_PACARD, SFX_BANK_PACARD, SFX_CAR_HORN_56CHEV, 12893, SFX_CAR_HORN_JEEP, 9500, OLD_DOOR},
+	{SFX_CAR_REV_MERC, SFX_BANK_MERC, SFX_CAR_HORN_BMW328, 10706, SFX_CAR_HORN_JEEP, 9600, NEW_DOOR},
+	{SFX_CAR_REV_PATHFINDER, SFX_BANK_PATHFINDER, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9800, TRUCK_DOOR},
+	{SFX_CAR_REV_TRUCK, SFX_BANK_TRUCK, SFX_CAR_HORN_TRUCK, 29711, SFX_POLICE_SIREN_SLOW, 10588, TRUCK_DOOR},
+	{SFX_CAR_REV_TRUCK, SFX_BANK_TRUCK, SFX_CAR_HORN_TRUCK, 31478, SFX_CAR_HORN_JEEP, 9800, TRUCK_DOOR},
+	{SFX_CAR_REV_PACARD, SFX_BANK_PACARD, SFX_CAR_HORN_BMW328, 9538, SFX_CAR_HORN_JEEP, 9900, NEW_DOOR},
+	{SFX_CAR_REV_PACARD, SFX_BANK_PACARD, SFX_CAR_HORN_56CHEV, 10842, SFX_CAR_HORN_JEEP, 10000, OLD_DOOR},
+	{SFX_CAR_REV_PORSHE, SFX_BANK_PORSCHE, SFX_CAR_HORN_PORSCHE, 11025, SFX_CAR_HORN_JEEP, 9800, NEW_DOOR},
+	{SFX_CAR_REV_PACARD, SFX_BANK_PACARD, SFX_CAR_HORN_56CHEV, 11487, SFX_CAR_HORN_JEEP, 9800, OLD_DOOR},
+	{SFX_CAR_REV_SPIDER, SFX_BANK_SPIDER, SFX_CAR_HORN_BUS2, 18000, SFX_CAR_HORN_JEEP, 9700, OLD_DOOR},
+	{SFX_CAR_REV_SPIDER, SFX_BANK_SPIDER, SFX_CAR_HORN_BUS, 18286, SFX_CAR_HORN_JEEP, 9600, OLD_DOOR},
+	{SFX_CAR_REV_PORSHE, SFX_BANK_PORSCHE, SFX_CAR_HORN_PORSCHE, 11025, SFX_CAR_HORN_JEEP, 9500, NEW_DOOR},
+	{SFX_CAR_REV_SPIDER, SFX_BANK_SPIDER, SFX_CAR_HORN_JEEP, 22295, SFX_AMBULANCE_SI, 12688, OLD_DOOR},
+	{SFX_CAR_REV_MERC, SFX_BANK_MERC, SFX_CAR_HORN_PORSCHE, 9271, SFX_POLICE_SIREN_SLOW, 11471, NEW_DOOR},
+	{SFX_CAR_REV_PACARD, SFX_BANK_PACARD, SFX_CAR_HORN_56CHEV, 12170, SFX_CAR_HORN_JEEP, 9400, OLD_DOOR},
+	{SFX_CAR_REV_PACARD, SFX_BANK_PACARD, SFX_CAR_HORN_BMW328, 11000, SFX_CAR_HORN_JEEP, 9300, OLD_DOOR},
+	{SFX_CAR_REV_PATHFINDER, SFX_BANK_PATHFINDER, SFX_CAR_HORN_BMW328, 10796, SFX_CAR_HORN_JEEP, 9200, NEW_DOOR},
+	{SFX_CAR_REV_PACARD, SFX_BANK_PACARD, SFX_CAR_HORN_56CHEV, 11487, SFX_CAR_HORN_JEEP, 9800, OLD_DOOR},
+	{SFX_CAR_REV_PATHFINDER, SFX_BANK_PATHFINDER, SFX_CAR_HORN_PICKUP, 10924, SFX_CAR_HORN_JEEP, 9000, OLD_DOOR},
+	{SFX_CAR_REV_SPIDER, SFX_BANK_SPIDER, SFX_CAR_HORN_PICKUP, 11025, SFX_ICE_CREAM_TUNE, 11025, OLD_DOOR},
+	{SFX_CAR_REV_HOTROD, SFX_BANK_HOTROD, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9100, OLD_DOOR},
+	{SFX_CAR_REV_PACARD, SFX_BANK_PACARD, SFX_CAR_HORN_56CHEV, 11487, SFX_CAR_HORN_JEEP, 9800, OLD_DOOR},
+	{SFX_CAR_REV_MERC, SFX_BANK_MERC, SFX_CAR_HORN_BMW328, 10706, SFX_POLICE_SIREN_SLOW, 10511, NEW_DOOR},
+	{SFX_CAR_REV_SPIDER, SFX_BANK_SPIDER, SFX_CAR_HORN_BUS, 17260, SFX_POLICE_SIREN_SLOW, 11029, OLD_DOOR},
+	{SFX_CAR_REV_SPIDER, SFX_BANK_SPIDER, SFX_CAR_HORN_PICKUP, 8670, SFX_CAR_HORN_JEEP, 9300, OLD_DOOR},
+	{SFX_CAR_REV_COBRA, SFX_BANK_COBRA, SFX_CAR_HORN_PORSCHE, 10400, SFX_CAR_HORN_JEEP, 9400, NEW_DOOR},
+	{SFX_CAR_REV_TRUCK, SFX_BANK_TRUCK, SFX_CAR_HORN_BUS2, 11652, SFX_CAR_HORN_JEEP, 9500, BUS_DOOR},
+	{SFX_CAR_REV_TRUCK, SFX_BANK_TRUCK, SFX_CAR_HORN_TRUCK, 29711, SFX_CAR_HORN_JEEP, 9600, TRUCK_DOOR},
+	{SFX_CAR_REV_TRUCK, SFX_BANK_TRUCK, SFX_CAR_HORN_TRUCK, 28043, SFX_CAR_HORN_JEEP, 9700, TRUCK_DOOR},
+	{SFX_CAR_REV_PONT, SFX_BANK_0, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9400, NEW_DOOR},
+	{SFX_CAR_REV_TRUCK, SFX_BANK_TRUCK, SFX_CAR_HORN_BUS, 16291, SFX_CAR_HORN_JEEP, 10100, BUS_DOOR},
+	{SFX_CAR_REV_PACARD, SFX_BANK_PACARD, SFX_CAR_HORN_56CHEV, 10842, SFX_CAR_HORN_JEEP, 9900, OLD_DOOR},
+	{SFX_CAR_REV_PACARD, SFX_BANK_PACARD, SFX_CAR_HORN_56CHEV, 10233, SFX_CAR_HORN_JEEP, 9800, NEW_DOOR},
+	{SFX_CAR_REV_SPIDER, SFX_BANK_SPIDER, SFX_CAR_HORN_PICKUP, 8670, SFX_CAR_HORN_JEEP, 9700, OLD_DOOR},
 	{SFX_RC_REV, SFX_BANK_RC, SFX_CAR_HORN_PICKUP, 20000, SFX_CAR_HORN_JEEP, 9600, NEW_DOOR},
-	{SFX_CAR_REV_11, SFX_BANK_PACARD, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9500, NEW_DOOR},
-	{SFX_CAR_REV_5, SFX_BANK_TRUCK, SFX_CAR_HORN_TRUCK, 29000, SFX_CAR_HORN_JEEP, 9400, TRUCK_DOOR},
-	{SFX_CAR_REV_1, CAR_SFX_BANKS_OFFSET, SFX_CAR_HORN_BMW328, 9003, SFX_CAR_HORN_JEEP, 9300, NEW_DOOR},
-	{SFX_CAR_REV_4, SFX_BANK_MERC, SFX_CAR_HORN_PORSCHE, 12375, SFX_CAR_HORN_JEEP, 9200, NEW_DOOR},
-	{SFX_CAR_REV_1, SFX_BANK_0, SFX_CAR_HORN_BUS2, 15554, SFX_CAR_HORN_JEEP, 9100, NEW_DOOR},
-	{SFX_CAR_REV_1, SFX_BANK_0, SFX_CAR_HORN_BUS2, 13857, SFX_CAR_HORN_JEEP, 9000, TRUCK_DOOR},
+	{SFX_CAR_REV_TRUCK, SFX_BANK_TRUCK, SFX_CAR_HORN_TRUCK, 31478, SFX_CAR_HORN_JEEP, 9800, TRUCK_DOOR},
+	{SFX_CAR_REV_TRUCK, SFX_BANK_TRUCK, SFX_CAR_HORN_TRUCK, 31478, SFX_CAR_HORN_JEEP, 9800, TRUCK_DOOR},
+	{SFX_CAR_REV_PONT, SFX_BANK_PONTIAC, SFX_CAR_HORN_BMW328, 9003, SFX_CAR_HORN_JEEP, 9300, NEW_DOOR},
+	{SFX_CAR_REV_COBRA, SFX_BANK_COBRA, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9800, OLD_DOOR},
+	{SFX_CAR_REV_PORSHE, SFX_BANK_PORSCHE, SFX_CAR_HORN_PORSCHE, 11025, SFX_CAR_HORN_JEEP, 9800, OLD_DOOR},
+	{SFX_CAR_REV_HOTROD, SFX_BANK_HOTROD, SFX_CAR_HORN_56CHEV, 11487, SFX_CAR_HORN_JEEP, 9800, OLD_DOOR},
+	{SFX_CAR_REV_PATHFINDER, SFX_BANK_PATHFINDER, SFX_CAR_HORN_PICKUP, 10924, SFX_CAR_HORN_JEEP, 9800, OLD_DOOR},
+	{SFX_CAR_REV_SPIDER, SFX_BANK_SPIDER, SFX_CAR_HORN_PICKUP, 8670, SFX_CAR_HORN_JEEP, 9800, OLD_DOOR},
+	{SFX_CAR_REV_SPIDER, SFX_BANK_SPIDER, SFX_CAR_HORN_PICKUP, 8670, SFX_CAR_HORN_JEEP, 9800, OLD_DOOR},
+	{SFX_CAR_REV_TRUCK, SFX_BANK_TRUCK, SFX_CAR_HORN_TRUCK, 28043, SFX_CAR_HORN_JEEP, 9800, OLD_DOOR},
+	{SFX_CAR_REV_SPIDER, SFX_BANK_SPIDER, SFX_CAR_HORN_BUS, 18286, SFX_CAR_HORN_JEEP, 9900, OLD_DOOR},
+	{SFX_CAR_REV_PONT, SFX_BANK_PONTIAC, SFX_CAR_HORN_56CHEV, 10842, SFX_CAR_HORN_JEEP, 9700, OLD_DOOR},
+	{SFX_CAR_REV_SPIDER, SFX_BANK_SPIDER, SFX_CAR_HORN_BUS, 18286, SFX_CAR_HORN_JEEP, 9700, OLD_DOOR},
+	{SFX_CAR_REV_SPIDER, SFX_BANK_SPIDER, SFX_CAR_HORN_PICKUP, 8670, SFX_CAR_HORN_JEEP, 9700, OLD_DOOR},
+	{SFX_CAR_REV_SPIDER, SFX_BANK_SPIDER, SFX_CAR_HORN_BUS2, 18000, SFX_CAR_HORN_JEEP, 9700, OLD_DOOR},
+	{SFX_CAR_REV_COBRA, SFX_BANK_COBRA, SFX_CAR_HORN_PORSCHE, 10400, SFX_CAR_HORN_JEEP, 9800, OLD_DOOR},
+	{SFX_CAR_REV_COBRA, SFX_BANK_COBRA, SFX_CAR_HORN_PORSCHE, 10400, SFX_CAR_HORN_JEEP, 9700, NEW_DOOR},
+	{SFX_CAR_REV_PORSHE, SFX_BANK_PORSCHE, SFX_CAR_HORN_PORSCHE, 11025, SFX_CAR_HORN_JEEP, 9800, NEW_DOOR},
+	{SFX_CAR_REV_TRUCK, SFX_BANK_TRUCK, SFX_CAR_HORN_TRUCK, 31478, SFX_CAR_HORN_JEEP, 9800, TRUCK_DOOR},
+	{SFX_CAR_REV_HOTROD, SFX_BANK_HOTROD, SFX_CAR_HORN_JEEP, 25400, SFX_CAR_HORN_JEEP, 9800, OLD_DOOR},
+	{SFX_CAR_REV_COBRA, SFX_BANK_COBRA, SFX_CAR_HORN_PORSCHE, 10400, SFX_CAR_HORN_JEEP, 9800, OLD_DOOR},
+	{SFX_CAR_REV_COBRA, SFX_BANK_COBRA, SFX_CAR_HORN_PORSCHE, 10400, SFX_CAR_HORN_JEEP, 9800, OLD_DOOR},
+	{SFX_CAR_REV_PONT, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_POLICE_SIREN_SLOW, 11912, NEW_DOOR},
+	{SFX_CAR_REV_PONT, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_POLICE_SIREN_SLOW, 11912, NEW_DOOR},
+	{SFX_CAR_REV_PONT, SFX_BANK_0, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9500, NEW_DOOR},
+	{SFX_CAR_REV_PONT, SFX_BANK_0, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9600, NEW_DOOR},
+	{SFX_CAR_REV_PONT, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_POLICE_SIREN_SLOW, 11912, NEW_DOOR},
+	{SFX_CAR_REV_PONT, SFX_BANK_0, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9300, NEW_DOOR},
+	{SFX_CAR_REV_PONT, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9900, NEW_DOOR},
+	{SFX_CAR_REV_PONT, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9900, NEW_DOOR},
+	{SFX_CAR_REV_PONT, SFX_BANK_0, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9300, NEW_DOOR},
+	{SFX_CAR_REV_PONT, SFX_BANK_0, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9400, NEW_DOOR},
+	{SFX_CAR_REV_VTWI, SFX_BANK_VTWIN, SFX_CAR_HORN_JEEP, 26313, SFX_CAR_HORN_JEEP, 10000, NEW_DOOR},
 	{SFX_MOPED_REV, SFX_BANK_MOPED, SFX_CAR_HORN_JEEP, 30000, SFX_CAR_HORN_JEEP, 9100, NEW_DOOR},
-	{SFX_CAR_REV_7, SFX_BANK_COBRA, SFX_CAR_HORN_JEEP, 22043, SFX_CAR_HORN_JEEP, 9200, OLD_DOOR},
-	{SFX_CAR_REV_1, SFX_BANK_0, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9300, NEW_DOOR},
-	{SFX_CAR_REV_1, SFX_BANK_0, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9400, NEW_DOOR},
-	{SFX_CAR_REV_1, SFX_BANK_0, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9500, NEW_DOOR},
-	{SFX_CAR_REV_1, SFX_BANK_0, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9600, NEW_DOOR},
-	{SFX_CAR_REV_1, SFX_BANK_0, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9700, NEW_DOOR},
-	{SFX_CAR_REV_5, SFX_BANK_TRUCK, SFX_CAR_HORN_TRUCK, 28043, SFX_CAR_HORN_JEEP, 9800, TRUCK_DOOR},
-	{SFX_CAR_REV_3, SFX_BANK_SPIDER, SFX_CAR_HORN_BUS, 18286, SFX_CAR_HORN_JEEP, 9900, OLD_DOOR},
-	{SFX_CAR_REV_12, SFX_BANK_GOLF_CART, SFX_CAR_HORN_JEEP, 28500, SFX_CAR_HORN_JEEP, 9800, NEW_DOOR},
-	{SFX_CAR_REV_1, CAR_SFX_BANKS_OFFSET, SFX_CAR_HORN_56CHEV, 10842, SFX_CAR_HORN_JEEP, 9700, OLD_DOOR},
-	{SFX_CAR_REV_8, SFX_BANK_PONTIAC_SLOW, SFX_CAR_HORN_BUS2, 18000, SFX_CAR_HORN_JEEP, 9700, OLD_DOOR},
-	{SFX_SEAPLANE_PRO1, SFX_BANK_PLANE_SEAPLANE, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9700, NEW_DOOR},
-	{SFX_CAR_REV_20, SFX_BANK_SPORTS_BIKE, SFX_CAR_HORN_JEEP, 27000, SFX_CAR_HORN_JEEP, 9600, NEW_DOOR},
+	{SFX_MOPED_REV, SFX_BANK_MOPED, SFX_CAR_HORN_JEEP, 30000, SFX_CAR_HORN_JEEP, 9100, NEW_DOOR},
+	{SFX_CAR_REV_SPORTCAR, SFX_BANK_SPORTS_BIKE, SFX_CAR_HORN_JEEP, 27000, SFX_CAR_HORN_JEEP, 9600, NEW_DOOR},
 	{SFX_MOPED_REV, SFX_BANK_MOPED, SFX_CAR_HORN_JEEP, 31000, SFX_CAR_HORN_JEEP, 9500, NEW_DOOR},
-	{SFX_CAR_REV_17, SFX_BANK_VTWIN, SFX_CAR_HORN_PICKUP, 11000, SFX_CAR_HORN_JEEP, 9400, NEW_DOOR},
-	{SFX_RC_REV, SFX_BANK_RC, SFX_CAR_HORN_JEEP, 30000, SFX_CAR_HORN_JEEP, 15000, NEW_DOOR},
-	{SFX_CAR_RC_HELI, SFX_BANK_RC_HELI, SFX_CAR_HORN_JEEP, 30000, SFX_CAR_HORN_JEEP, 15000, NEW_DOOR},
-	{SFX_CAR_REV_9, SFX_BANK_CADILLAC, SFX_CAR_HORN_56CHEV, 10300, SFX_CAR_HORN_JEEP, 9100, OLD_DOOR},
-	{SFX_CAR_REV_9, SFX_BANK_CADILLAC, SFX_CAR_HORN_56CHEV, 10500, SFX_CAR_HORN_JEEP, 9000, OLD_DOOR},
-	{SFX_CAR_REV_19, SFX_BANK_HONDA250, SFX_CAR_HORN_JEEP, 30000, SFX_CAR_HORN_JEEP, 9000, NEW_DOOR},
-	{SFX_CAR_REV_1, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9100, TRUCK_DOOR},
-	{SFX_CAR_REV_3, SFX_BANK_SPIDER, SFX_CAR_HORN_TRUCK, 28000, SFX_CAR_HORN_JEEP, 9200, TRUCK_DOOR},
-	{SFX_CAR_REV_7, SFX_BANK_COBRA, SFX_CAR_HORN_PICKUP, 11200, SFX_CAR_HORN_JEEP, 9300, NEW_DOOR},
-	{SFX_CAR_REV_1, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9400, NEW_DOOR},
-	{SFX_CAR_REV_1, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9500, NEW_DOOR},
-	{SFX_CAR_REV_9, SFX_BANK_CADILLAC, SFX_CAR_HORN_56CHEV, 10700, SFX_CAR_HORN_JEEP, 9600, OLD_DOOR},
-	{SFX_CAR_REV_1, CAR_SFX_BANKS_OFFSET, SFX_CAR_HORN_BMW328, 9000, SFX_CAR_HORN_JEEP, 9700, OLD_DOOR},
-	{SFX_CAR_REV_6, SFX_BANK_HOTROD, SFX_CAR_HORN_BMW328, 9200, SFX_CAR_HORN_JEEP, 9800, OLD_DOOR},
-	{SFX_CAR_REV_7, SFX_BANK_COBRA, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9900, NEW_DOOR},
-	{SFX_CAR_REV_11, SFX_BANK_PACARD, SFX_CAR_HORN_56CHEV, 10540, SFX_CAR_HORN_JEEP, 9935, TRUCK_DOOR},
-	{SFX_CAR_REV_8, SFX_BANK_PONTIAC_SLOW, SFX_CAR_HORN_PICKUP, 11000, SFX_CAR_HORN_JEEP, 9700, NEW_DOOR},
-	{SFX_CAR_REV_2, SFX_BANK_PORSCHE, SFX_CAR_HORN_BMW328, 9500, SFX_CAR_HORN_JEEP, 9800, NEW_DOOR},
-	{SFX_CAR_REV_7, SFX_BANK_COBRA, SFX_CAR_HORN_BMW328, 9700, SFX_CAR_HORN_JEEP, 9700, NEW_DOOR},
-	{SFX_CAR_REV_8, SFX_BANK_PONTIAC_SLOW, SFX_CAR_HORN_BUS2, 18000, SFX_CAR_HORN_JEEP, 9600, OLD_DOOR},
-	{SFX_CAR_REV_3, SFX_BANK_SPIDER, SFX_CAR_HORN_BUS, 18000, SFX_CAR_HORN_JEEP, 9500, TRUCK_DOOR},
-	{SFX_CAR_REV_1, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9400, NEW_DOOR},
-	{SFX_CAR_REV_8, SFX_BANK_PONTIAC_SLOW, SFX_CAR_HORN_JEEP, 27513, SFX_CAR_HORN_JEEP, 9300, NEW_DOOR},
-	{SFX_CAR_REV_8, SFX_BANK_PONTIAC_SLOW, SFX_CAR_HORN_56CHEV, 10700, SFX_CAR_HORN_JEEP, 9200, OLD_DOOR},
-	{SFX_CAR_REV_1, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9100, TRUCK_DOOR},
-	{SFX_CAR_REV_1, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9000, TRUCK_DOOR},
-	{SFX_CAR_REV_10, SFX_BANK_PATHFINDER, SFX_CAR_HORN_BUS2, 18000, SFX_CAR_HORN_JEEP, 9100, TRUCK_DOOR},
-	{SFX_CAR_REV_1, CAR_SFX_BANKS_OFFSET, SFX_CAR_HORN_BUS2, 17900, SFX_POLICE_SIREN_SLOW, 10511, TRUCK_DOOR},
-	{SFX_CAR_REV_4, SFX_BANK_MERC, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9200, NEW_DOOR},
-	{SFX_CAR_REV_8, SFX_BANK_PONTIAC_SLOW, SFX_CAR_HORN_BMW328, 9600, SFX_CAR_HORN_JEEP, 9300, NEW_DOOR},
-	{SFX_CAR_REV_4, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9400, NEW_DOOR},
-	{SFX_CAR_REV_7, SFX_BANK_COBRA, SFX_CAR_HORN_PORSCHE, 10000, SFX_CAR_HORN_JEEP, 9500, OLD_DOOR},
-	{SFX_CAR_REV_6, SFX_BANK_HOTROD, SFX_CAR_HORN_PORSCHE, 10500, SFX_CAR_HORN_JEEP, 9600, OLD_DOOR},
-	{SFX_CAR_REV_10, SFX_BANK_PATHFINDER, SFX_CAR_HORN_JEEP, 25513, SFX_CAR_HORN_JEEP, 9700, NEW_DOOR},
-	{SFX_CAR_REV_1, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9800, NEW_DOOR},
-	{SFX_CAR_REV_3, SFX_BANK_SPIDER, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9900, NEW_DOOR},
-	{SFX_CAR_REV_10, SFX_BANK_PATHFINDER, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9800, NEW_DOOR},
-	{SFX_CAR_REV_1, CAR_SFX_BANKS_OFFSET, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9700, NEW_DOOR},
+	{SFX_CAR_REV_VTWI, SFX_BANK_VTWIN, SFX_CAR_HORN_PICKUP, 11000, SFX_CAR_HORN_JEEP, 9400, NEW_DOOR},
+	{SFX_CAR_REV_VTWI, SFX_BANK_VTWIN, SFX_CAR_HORN_JEEP, 26313, SFX_CAR_HORN_JEEP, 10000, NEW_DOOR},
+	{SFX_CAR_REV_HONDA, SFX_BANK_HONDA250, SFX_CAR_HORN_JEEP, 30000, SFX_CAR_HORN_JEEP, 9000, NEW_DOOR},
+	{SFX_CAR_REV_HONDA, SFX_BANK_HONDA250, SFX_CAR_HORN_JEEP, 30000, SFX_CAR_HORN_JEEP, 9000, NEW_DOOR},
 	{SFX_CAR_RC_HELI, SFX_BANK_RC_HELI, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9600, NEW_DOOR},
-	{SFX_CAR_REV_6, SFX_BANK_HOTROD, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9700, NEW_DOOR},
-	{SFX_CAR_REV_7, SFX_BANK_COBRA, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9600, NEW_DOOR},
-	{SFX_CAR_REV_1, CAR_SFX_BANKS_OFFSET, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9500, NEW_DOOR},
-	{SFX_CAR_REV_9, SFX_BANK_CADILLAC, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9400, NEW_DOOR},
-	{SFX_CAR_REV_2, SFX_BANK_PORSCHE, SFX_CAR_HORN_PORSCHE, 11025, SFX_POLICE_SIREN_SLOW, 11000, NEW_DOOR},
-	{SFX_CAR_REV_1, CAR_SFX_BANKS_OFFSET, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9200, NEW_DOOR},
-	{SFX_CAR_REV_1, CAR_SFX_BANKS_OFFSET, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9300, NEW_DOOR},
-	{SFX_CAR_REV_1, CAR_SFX_BANKS_OFFSET, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9400, NEW_DOOR} };
-
-
-
-bool bPlayerJustEnteredCar;
-
-const bool hornPatternsArray[8][44] = {
-    {false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false,
-     false, true,  true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,  false, false, false, false},
-    {false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,  true,
-     true,  true,  true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false},
-    {false, false, true, true, true, true, true, true, true, true, true, true, false, false, false, false, true, true, true, true, true, false,
-     false, false, true, true, true, true, true, true, true, true, true, true, true,  true,  true,  true,  true, true, true, true, true, false},
-    {false, false, true, true, true, true,  true,  false, false, true, true, true, true, true, false, false, false, true, true, true, true, true,
-     true,  true,  true, true, true, false, false, false, true,  true, true, true, true, true, true,  true,  true,  true, true, true, true, false},
-    {false, false, true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false, false, false,
-     false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},
-    {false, false, true,  true,  true,  false, false, false, true,  true,  true,  false, false, false, false, false, false, false, false, false, false, false,
-     false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},
-    {false, false, true, true, true,  true,  false, false, false, false, true, true, true, false, false, true, true, true, false, false, true,  true,
-     true,  true,  true, true, false, false, false, false, false, true,  true, true, true, true,  true,  true, true, true, true,  true,  false, false},
-    {false, false, true,  true,  true, true, false, false, true, true, true, true, true, false, false, false, true, true,  true,  true,  true,  true,
-     false, false, false, false, true, true, true,  true,  true, true, true, true, true, true,  true,  true,  true, false, false, false, false, false},
+	{SFX_CAR_RC_HELI, SFX_BANK_RC_HELI, SFX_CAR_HORN_JEEP, 30000, SFX_CAR_HORN_JEEP, 15000, NEW_DOOR},
+	{SFX_CAR_ACCEL_22, SFX_BANK_HELI_APACHE, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9200, NEW_DOOR},
+	{SFX_CAR_REV_PONT, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9100, TRUCK_DOOR},
+	{SFX_CAR_REV_PONT, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9800, NEW_DOOR},
+	{SFX_CAR_REV_PONT, SFX_BANK_0, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9000, TRUCK_DOOR}
+};
+
+const eSfxSample aEngineSounds[][2] = {
+	{ SFX_CAR_IDLE_PONT, SFX_CAR_REV_PONT },
+	{ SFX_CAR_IDLE_PORSHE, SFX_CAR_REV_PORSHE },
+	{ SFX_CAR_IDLE_SPIDER, SFX_CAR_REV_SPIDER },
+	{ SFX_CAR_IDLE_MERC, SFX_CAR_REV_MERC },
+	{ SFX_CAR_IDLE_TRUCK, SFX_CAR_REV_TRUCK },
+	{ SFX_CAR_IDLE_HOTROD, SFX_CAR_REV_HOTROD },
+	{ SFX_CAR_IDLE_COBRA, SFX_CAR_REV_COBRA },
+	{ SFX_CAR_IDLE_PONT2, SFX_CAR_REV_PONT2 },
+	{ SFX_CAR_IDLE_CADI, SFX_CAR_REV_CADI },
+	{ SFX_CAR_IDLE_PATHFINDER, SFX_CAR_REV_PATHFINDER },
+	{ SFX_CAR_IDLE_PACARD, SFX_CAR_REV_PACARD },
+	{ SFX_CAR_IDLE_GOLFCART, SFX_CAR_REV_GOLFCART },
+	{ SFX_CAR_IDLE_GOLFCART, SFX_CAR_REV_GOLFCART },
+	{ SFX_CAR_IDLE_GOLFCART, SFX_CAR_REV_GOLFCART },
+	{ SFX_CAR_IDLE_GOLFCART, SFX_CAR_REV_GOLFCART },
+	{ SFX_CAR_IDLE_GOLFCART, SFX_CAR_REV_GOLFCART },
+	{ SFX_CAR_IDLE_VTWI, SFX_CAR_REV_VTWI },
+	{ SFX_MOPED_IDLE, SFX_MOPED_REV },
+	{ SFX_CAR_IDLE_HONDA, SFX_CAR_REV_HONDA },
+	{ SFX_CAR_IDLE_SPORTCAR, SFX_CAR_REV_SPORTCAR },
+	{ SFX_CAR_IDLE_UNUSED1, SFX_CAR_REV_UNUSED1 },
+	{ SFX_CAR_IDLE_UNUSED2, SFX_CAR_REV_UNUSED2 },
+	{ SFX_CAR_IDLE_UNUSED3, SFX_CAR_REV_UNUSED3 },
+	{ SFX_CAR_IDLE_UNUSED4, SFX_CAR_REV_UNUSED4 },
+};
+
+bool8 bPlayerJustEnteredCar;
+
+const bool8 hornPatternsArray[8][44] = {
+    {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
+     FALSE, TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE},
+    {FALSE, FALSE, TRUE,  TRUE,  TRUE,  FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, TRUE, TRUE,  FALSE,
+     FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, TRUE, TRUE, TRUE,  TRUE,  TRUE,  TRUE,  TRUE, TRUE, TRUE, FALSE, FALSE},
+    {FALSE, FALSE, TRUE,  TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, TRUE, TRUE, TRUE,  FALSE,
+     FALSE, FALSE, FALSE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,  TRUE,  TRUE,  TRUE,  TRUE, TRUE, TRUE, TRUE, FALSE, FALSE},
+    {FALSE, FALSE, TRUE, TRUE, TRUE, TRUE, TRUE,  FALSE, FALSE, FALSE, FALSE, TRUE,  TRUE,  TRUE,  TRUE,  FALSE, FALSE, FALSE, FALSE, TRUE, TRUE,  TRUE,
+     TRUE,  TRUE,  TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, FALSE},
+    {FALSE, FALSE, TRUE,  TRUE,  TRUE,  TRUE,  FALSE, FALSE, FALSE, FALSE, TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
+     FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE},
+    {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE,  FALSE, FALSE, FALSE, FALSE, TRUE,  TRUE,  FALSE, FALSE, FALSE, FALSE,
+     TRUE,  TRUE,  TRUE,  FALSE, FALSE, FALSE, FALSE, TRUE,  TRUE,  TRUE,  TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE},
+    {FALSE, FALSE, TRUE,  TRUE,  TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, TRUE,  TRUE,  TRUE, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE,  TRUE,
+     FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, TRUE, TRUE,  TRUE,  TRUE,  TRUE,  TRUE, FALSE, FALSE},
+    {FALSE, FALSE, TRUE, TRUE,  TRUE,  TRUE,  FALSE, FALSE, FALSE, FALSE, TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE, FALSE, FALSE, FALSE, TRUE, TRUE,  TRUE,
+     TRUE,  TRUE,  TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  TRUE,  TRUE,  TRUE, FALSE, FALSE}
 };
 
 void cAudioManager::ProcessVehicle(CVehicle* veh)
@@ -756,7 +761,7 @@ void cAudioManager::ProcessVehicle(CVehicle* veh)
 		|| CGame::currArea == AREA_MALL
 		|| CGame::currArea == AREA_MAIN_MAP) {
 		m_sQueueSample.m_vecPos = veh->GetPosition();
-		params.m_bDistanceCalculated = false;
+		params.m_bDistanceCalculated = FALSE;
 		params.m_pVehicle = veh;
 		params.m_fDistance = GetDistanceSquared(m_sQueueSample.m_vecPos);
 		params.m_pTransmission = veh->pHandling != nil ? &veh->pHandling->Transmission : nil;
@@ -825,6 +830,12 @@ void cAudioManager::ProcessVehicle(CVehicle* veh)
 			ProcessBoatMovingOverWater(params);
 			ProcessVehicleOneShots(params);
 			break;
+#ifdef GTA_TRAIN
+		case VEHICLE_TYPE_TRAIN:
+			ProcessTrainNoise(params);
+			ProcessVehicleOneShots(params);
+			break;
+#endif
 		case VEHICLE_TYPE_HELI: 
 			ProcessCarHeli(params);
 			ProcessVehicleOneShots(params);
@@ -882,24 +893,23 @@ cAudioManager::ProcessRainOnVehicle(cVehicleParams& params)
 				veh->m_bRainSamplesCounter = 68;
 			m_sQueueSample.m_nSampleIndex = (m_anRandomTable[1] & 3) + SFX_CAR_RAIN_1;
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nReleasingVolumeModificator = 9;
 			m_sQueueSample.m_nFrequency = m_anRandomTable[1] % 4000 + 28000;
 			m_sQueueSample.m_nLoopCount = 1;
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_nLoopStart = 0;
-			m_sQueueSample.m_nLoopEnd = -1;
+			RESET_LOOP_OFFSETS
 			m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-			m_sQueueSample.m_bReleasingSoundFlag = true;
-			m_sQueueSample.m_bReverbFlag = false;
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+			m_sQueueSample.m_bReverbFlag = FALSE;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			AddSampleToRequestedQueue();
 		}
 	}
 }
 
-bool
+bool8
 cAudioManager::ProcessReverseGear(cVehicleParams& params)
 {
 	const int reverseGearIntensity = 30;
@@ -909,10 +919,10 @@ cAudioManager::ProcessReverseGear(cVehicleParams& params)
 	uint8 emittingVolume;
 
 	if (params.m_fDistance >= SQR(reverseGearIntensity))
-		return false;
+		return FALSE;
 	automobile = (CAutomobile*)params.m_pVehicle;
 	if (automobile->m_modelIndex == MI_CADDY)
-		return true;
+		return TRUE;
 	if (automobile->bEngineOn && (automobile->m_fGasPedal < 0.0f || automobile->m_nCurrentGear == 0)) {
 		CalculateDistance(params.m_bDistanceCalculated, params.m_fDistance);
 		if (automobile->m_nDriveWheelsOnGround != 0) {
@@ -935,23 +945,22 @@ cAudioManager::ProcessReverseGear(cVehicleParams& params)
 				m_sQueueSample.m_nSampleIndex = SFX_REVERSE_GEAR;
 			}
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nReleasingVolumeModificator = 3;
 			m_sQueueSample.m_nFrequency = (6000.0f * modificator) + 7000;
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_nEmittingVolume = emittingVolume;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 			m_sQueueSample.m_fSpeedMultiplier = 3.0f;
 			m_sQueueSample.m_fSoundIntensity = reverseGearIntensity;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 5;
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bReverbFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			AddSampleToRequestedQueue();
 		}
 	}
-	return true;
+	return TRUE;
 }
 
 void
@@ -966,14 +975,14 @@ cAudioManager::ProcessModelVehicle(cVehicleParams& params)
 	int16 acceletateState;
 	int16 brakeState;
 	uint8 volume;
-	bool isPlayerVeh;
-	bool vehSlowdown;
+	bool8 isPlayerVeh;
+	bool8 vehSlowdown;
 
 	if (params.m_fDistance >= SQR(SOUND_INTENSITY))
 		return;
 
 	if (FindPlayerVehicle() == params.m_pVehicle)
-		isPlayerVeh = true;
+		isPlayerVeh = TRUE;
 	else
 #ifdef FIX_BUGS
 		isPlayerVeh = CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle == params.m_pVehicle;
@@ -999,19 +1008,18 @@ cAudioManager::ProcessModelVehicle(cVehicleParams& params)
 				m_sQueueSample.m_nCounter = 2;
 				m_sQueueSample.m_nSampleIndex = SFX_RC_REV;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-				m_sQueueSample.m_bIs2D = false;
+				m_sQueueSample.m_bIs2D = FALSE;
 				m_sQueueSample.m_nReleasingVolumeModificator = 1;
 				m_sQueueSample.m_nFrequency = freq;
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_nEmittingVolume = volume;
-				m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(SFX_RC_REV);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(SFX_RC_REV);
+				SET_LOOP_OFFSETS(SFX_RC_REV)
 				m_sQueueSample.m_fSpeedMultiplier = 3.0f;
 				m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-				m_sQueueSample.m_bReleasingSoundFlag = false;
+				m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 				m_sQueueSample.m_nReleasingVolumeDivider = 4;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
+				m_sQueueSample.m_bReverbFlag = TRUE;
+				m_sQueueSample.m_bRequireReflection = FALSE;
 				AddSampleToRequestedQueue();
 			}
 		}
@@ -1030,11 +1038,11 @@ cAudioManager::ProcessModelVehicle(cVehicleParams& params)
 		if (acceletateState < brakeState)
 			acceletateState = brakeState;
 		if (acceletateState <= 0) {
-			vehSlowdown = true;
+			vehSlowdown = TRUE;
 			volume = 127;
 			freq = 18000;
 		} else {
-			vehSlowdown = false;
+			vehSlowdown = FALSE;
 			volume = Min(127, (127 * acceletateState / 255) * 3.0f * Abs(params.m_fVelocityChange));
 			freq = Min(22000, (8000 * acceletateState / 255 + 14000) * 3.0f * Abs(params.m_fVelocityChange));
 		}
@@ -1064,18 +1072,17 @@ cAudioManager::ProcessModelVehicle(cVehicleParams& params)
 					m_sQueueSample.m_nReleasingVolumeDivider = 4;
 				}
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-				m_sQueueSample.m_bIs2D = false;
+				m_sQueueSample.m_bIs2D = FALSE;
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
 				m_sQueueSample.m_nFrequency = freq;
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_nEmittingVolume = volume;
-				m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+				SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 				m_sQueueSample.m_fSpeedMultiplier = 3.0f;
 				m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-				m_sQueueSample.m_bReleasingSoundFlag = false;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
+				m_sQueueSample.m_bReleasingSoundFlag = FALSE;
+				m_sQueueSample.m_bReverbFlag = TRUE;
+				m_sQueueSample.m_bRequireReflection = FALSE;
 				AddSampleToRequestedQueue();
 			}
 		}
@@ -1096,7 +1103,7 @@ cAudioManager::ProcessModelHeliVehicle(cVehicleParams& params)
 	static uint32 prevFreq = 22050;
 
 	uint32 freq;
-	bool isPlayerVeh;
+	bool8 isPlayerVeh;
 	int16 acceletateState;
 	int16 brakeState;
 
@@ -1104,7 +1111,7 @@ cAudioManager::ProcessModelHeliVehicle(cVehicleParams& params)
 		return;
 
 	if (FindPlayerVehicle() == params.m_pVehicle)
-		isPlayerVeh = true;
+		isPlayerVeh = TRUE;
 	else
 #ifdef FIX_BUGS
 		isPlayerVeh = CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle == params.m_pVehicle;
@@ -1127,26 +1134,25 @@ cAudioManager::ProcessModelHeliVehicle(cVehicleParams& params)
 		m_sQueueSample.m_nCounter = 2;
 		m_sQueueSample.m_nSampleIndex = SFX_CAR_RC_HELI;
 		m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_nFrequency = freq;
 		m_sQueueSample.m_nLoopCount = 0;
 		m_sQueueSample.m_nEmittingVolume = 70;
-		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(SFX_CAR_RC_HELI);
-		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(SFX_CAR_RC_HELI);
+		SET_LOOP_OFFSETS(SFX_CAR_RC_HELI)
 		m_sQueueSample.m_fSpeedMultiplier = 3.0f;
 		m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-		m_sQueueSample.m_bReleasingSoundFlag = false;
+		m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 		m_sQueueSample.m_nReleasingVolumeDivider = 4;
-		m_sQueueSample.m_bReverbFlag = true;
-		m_sQueueSample.m_bRequireReflection = false;
+		m_sQueueSample.m_bReverbFlag = TRUE;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		AddSampleToRequestedQueue();
 	}
 	if (isPlayerVeh)
 		prevFreq = freq;
 }
 
-bool
+bool8
 cAudioManager::ProcessVehicleRoadNoise(cVehicleParams& params)
 {
 	const float SOUND_INTENSITY = 95.0f;
@@ -1159,10 +1165,10 @@ cAudioManager::ProcessVehicleRoadNoise(cVehicleParams& params)
 	uint8 wheelsOnGround;
 
 	if (params.m_fDistance >= SQR(SOUND_INTENSITY))
-		return false;
+		return FALSE;
 
 	if (params.m_fDistance >= SQR(SOUND_INTENSITY))
-		return false;
+		return FALSE;
 	switch (params.m_VehicleType) {
 	case VEHICLE_TYPE_CAR:
 		wheelsOnGround = ((CAutomobile*)params.m_pVehicle)->m_nWheelsOnGround;
@@ -1175,7 +1181,7 @@ cAudioManager::ProcessVehicleRoadNoise(cVehicleParams& params)
 		break;
 	}
 	if (params.m_pTransmission == nil || wheelsOnGround == 0)
-		return true;
+		return TRUE;
 
 	velocity = Abs(params.m_fVelocityChange);
 	if (velocity > 0.0f) {
@@ -1185,7 +1191,7 @@ cAudioManager::ProcessVehicleRoadNoise(cVehicleParams& params)
 		if (m_sQueueSample.m_nVolume != 0) {
 			m_sQueueSample.m_nCounter = 0;
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nReleasingVolumeModificator = 3;
 			if (params.m_pVehicle->m_nSurfaceTouched == SURFACE_WATER) {
 				m_sQueueSample.m_nSampleIndex = SFX_BOAT_WATER_LOOP;
@@ -1199,22 +1205,21 @@ cAudioManager::ProcessVehicleRoadNoise(cVehicleParams& params)
 			m_sQueueSample.m_nFrequency = freq;
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 			m_sQueueSample.m_fSpeedMultiplier = 6.0f;
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 4;
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bReverbFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			AddSampleToRequestedQueue();
 		}
 	}
 
-	return true;
+	return TRUE;
 }
 
-bool
+bool8
 cAudioManager::ProcessWetRoadNoise(cVehicleParams& params)
 {
 	const float SOUND_INTENSITY = 30.0f;
@@ -1227,7 +1232,7 @@ cAudioManager::ProcessWetRoadNoise(cVehicleParams& params)
 	uint8 wheelsOnGround;
 
 	if (params.m_fDistance >= SQR(SOUND_INTENSITY))
-		return false;
+		return FALSE;
 	switch (params.m_VehicleType) {
 	case VEHICLE_TYPE_CAR:
 		wheelsOnGround = ((CAutomobile*)params.m_pVehicle)->m_nWheelsOnGround;
@@ -1240,7 +1245,7 @@ cAudioManager::ProcessWetRoadNoise(cVehicleParams& params)
 		break;
 	}
 	if (params.m_pTransmission == nil || wheelsOnGround == 0)
-		return true;
+		return TRUE;
 
 	velocity = Abs(params.m_fVelocityChange);
 	if (velocity > 0.0f) {
@@ -1252,26 +1257,25 @@ cAudioManager::ProcessWetRoadNoise(cVehicleParams& params)
 			m_sQueueSample.m_nCounter = 1;
 			m_sQueueSample.m_nSampleIndex = SFX_ROAD_NOISE;
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nReleasingVolumeModificator = 3;
 			multiplier = (m_sQueueSample.m_fDistance / SOUND_INTENSITY) * 0.5f;
 			freq = SampleManager.GetSampleBaseFrequency(SFX_ROAD_NOISE);
 			m_sQueueSample.m_nFrequency = freq + freq * multiplier;
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 			m_sQueueSample.m_fSpeedMultiplier = 6.0f;
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 4;
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bReverbFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			AddSampleToRequestedQueue();
 		}
 	}
 
-	return true;
+	return TRUE;
 }
 
 void
@@ -1296,18 +1300,18 @@ cAudioManager::ProcessVehicleEngine(cVehicleParams& params)
 	float relativeChange;
 	float modificator;
 	float traction;
-	bool isMoped;
-	bool caddyBool;
+	bool8 isMoped;
+	bool8 caddyBool;
 
-	isMoped = false;
-	caddyBool = false;
+	isMoped = FALSE;
+	caddyBool = FALSE;
 	traction = 0.0f;
 	if (params.m_fDistance >= SQR(SOUND_INTENSITY))
 		return;
 	playerVeh = FindPlayerVehicle();
 	veh = params.m_pVehicle;
 	if (playerVeh == veh && veh->GetStatus() == STATUS_WRECKED) {
-		SampleManager.StopChannel(m_nActiveSamples);
+		SampleManager.StopChannel(CHANNEL_PLAYER_VEHICLE_ENGINE);
 		return;
 	}
 	if (!veh->bEngineOn)
@@ -1322,12 +1326,12 @@ cAudioManager::ProcessVehicleEngine(cVehicleParams& params)
 		switch (veh->m_modelIndex) {
 		case MI_PIZZABOY:
 		case MI_FAGGIO:
-			isMoped = true;
+			isMoped = TRUE;
 			currentGear = transmission->nNumberOfGears;
 			break;
 		case MI_CADDY:
 			currentGear = transmission->nNumberOfGears;
-			caddyBool = true;
+			caddyBool = TRUE;
 			break;
 		default:
 			currentGear = veh->m_nCurrentGear;
@@ -1354,7 +1358,7 @@ cAudioManager::ProcessVehicleEngine(cVehicleParams& params)
 		}
 
 		if (wheelsOnGround != 0) {
-			if (!veh->bIsHandbrakeOn || isMoped && caddyBool) { //mb bug, bcs it's can't be true together
+			if (!veh->bIsHandbrakeOn || isMoped && caddyBool) { //mb bug, bcs it's can't be TRUE together
 				if (veh->GetStatus() == STATUS_SIMPLE || isMoped || caddyBool) {
 					traction = 0.0f;
 				} else {
@@ -1452,7 +1456,7 @@ cAudioManager::ProcessVehicleEngine(cVehicleParams& params)
 		if (!caddyBool) {
 			if (veh->GetStatus() == STATUS_SIMPLE) {
 				if (modificator < 0.02f) {
-					m_sQueueSample.m_nSampleIndex = aVehicleSettings[params.m_nIndex].m_nBank - CAR_SFX_BANKS_OFFSET + SFX_CAR_IDLE_1;
+					m_sQueueSample.m_nSampleIndex = aEngineSounds[aVehicleSettings[params.m_nIndex].m_nBank - CAR_SFX_BANKS_OFFSET][0];
 					m_sQueueSample.m_nCounter = 52;
 					freq = 10000.0f * modificator + 22050;
 				} else {
@@ -1461,7 +1465,7 @@ cAudioManager::ProcessVehicleEngine(cVehicleParams& params)
 				}
 			} else {
 				if (veh->m_fGasPedal < 0.02f) {
-					m_sQueueSample.m_nSampleIndex = aVehicleSettings[params.m_nIndex].m_nBank - CAR_SFX_BANKS_OFFSET + SFX_CAR_IDLE_1;
+					m_sQueueSample.m_nSampleIndex = aEngineSounds[aVehicleSettings[params.m_nIndex].m_nBank - CAR_SFX_BANKS_OFFSET][0];
 					m_sQueueSample.m_nCounter = 52;
 					freq = 10000.0f * modificator + 22050;
 				} else {
@@ -1474,24 +1478,23 @@ cAudioManager::ProcessVehicleEngine(cVehicleParams& params)
 			if (FindVehicleOfPlayer() == params.m_pVehicle)
 				m_sQueueSample.m_nSampleIndex = SFX_CAR_AFTER_ACCEL_12;
 			else
-				m_sQueueSample.m_nSampleIndex = SFX_CAR_REV_12;
+				m_sQueueSample.m_nSampleIndex = SFX_CAR_REV_GOLFCART;
 			m_sQueueSample.m_nFrequency = freq + 20 * m_sQueueSample.m_nBankIndex % 100;
 		}
 		m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		if (m_sQueueSample.m_nSampleIndex == SFX_CAR_IDLE_5 || m_sQueueSample.m_nSampleIndex == SFX_CAR_REV_5)
+		if (m_sQueueSample.m_nSampleIndex == SFX_CAR_IDLE_TRUCK || m_sQueueSample.m_nSampleIndex == SFX_CAR_REV_TRUCK)
 			m_sQueueSample.m_nFrequency /= 2;
 		m_sQueueSample.m_nLoopCount = 0;
 		m_sQueueSample.m_nEmittingVolume = emittingVol;
-		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+		SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 		m_sQueueSample.m_fSpeedMultiplier = 6.0f;
 		m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-		m_sQueueSample.m_bReleasingSoundFlag = false;
+		m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 		m_sQueueSample.m_nReleasingVolumeDivider = 8;
-		m_sQueueSample.m_bReverbFlag = true;
-		m_sQueueSample.m_bRequireReflection = false;
+		m_sQueueSample.m_bReverbFlag = TRUE;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		AddSampleToRequestedQueue();
 	}
 }
@@ -1517,7 +1520,7 @@ void
 cAudioManager::PlayerJustGotInCar() const
 {
 	if (m_bIsInitialised)
-		bPlayerJustEnteredCar = true;
+		bPlayerJustEnteredCar = TRUE;
 }
 
 void
@@ -1527,7 +1530,7 @@ cAudioManager::PlayerJustLeftCar(void) const
 }
 
 void
-cAudioManager::AddPlayerCarSample(uint8 emittingVolume, int32 freq, uint32 sample, uint8 bank, uint8 counter, bool notLooping)
+cAudioManager::AddPlayerCarSample(uint8 emittingVolume, int32 freq, uint32 sample, uint8 bank, uint8 counter, bool8 notLooping)
 {
 	m_sQueueSample.m_nVolume = ComputeVolume(emittingVolume, 50.f, m_sQueueSample.m_fDistance);
 	if (m_sQueueSample.m_nVolume != 0) {
@@ -1538,7 +1541,7 @@ cAudioManager::AddPlayerCarSample(uint8 emittingVolume, int32 freq, uint32 sampl
 #else
 		m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 #endif // GTA_PS2
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		m_sQueueSample.m_nReleasingVolumeModificator = 0;
 		m_sQueueSample.m_nFrequency = freq;
 		if (notLooping) {
@@ -1548,13 +1551,12 @@ cAudioManager::AddPlayerCarSample(uint8 emittingVolume, int32 freq, uint32 sampl
 			m_sQueueSample.m_nLoopCount = 1;
 		}
 		m_sQueueSample.m_nEmittingVolume = emittingVolume;
-		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+		SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 		m_sQueueSample.m_fSpeedMultiplier = 6.0f;
 		m_sQueueSample.m_fSoundIntensity = 50.0f;
-		m_sQueueSample.m_bReleasingSoundFlag = false;
-		m_sQueueSample.m_bReverbFlag = true;
-		m_sQueueSample.m_bRequireReflection = false;
+		m_sQueueSample.m_bReleasingSoundFlag = FALSE;
+		m_sQueueSample.m_bReverbFlag = TRUE;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		AddSampleToRequestedQueue();
 	}
 }
@@ -1569,19 +1571,18 @@ cAudioManager::ProcessCesna(cVehicleParams &params)
 			m_sQueueSample.m_nCounter = 52;
 			m_sQueueSample.m_nSampleIndex = SFX_CESNA_IDLE;
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nReleasingVolumeModificator = 0;
 			m_sQueueSample.m_nFrequency = 12500;
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_nReleasingVolumeDivider = 8;
 			m_sQueueSample.m_nEmittingVolume = 80;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 			m_sQueueSample.m_fSpeedMultiplier = 4.0f;
 			m_sQueueSample.m_fSoundIntensity = 200.0f;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
+			m_sQueueSample.m_bReverbFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			AddSampleToRequestedQueue();
 		}
 		if(params.m_fDistance < SQR(90)) {
@@ -1590,19 +1591,18 @@ cAudioManager::ProcessCesna(cVehicleParams &params)
 				m_sQueueSample.m_nCounter = 2;
 				m_sQueueSample.m_nSampleIndex = SFX_CESNA_REV;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-				m_sQueueSample.m_bIs2D = false;
+				m_sQueueSample.m_bIs2D = FALSE;
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
 				m_sQueueSample.m_nFrequency = 25000;
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_nReleasingVolumeDivider = 4;
 				m_sQueueSample.m_nEmittingVolume = 80;
-				m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+				SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 				m_sQueueSample.m_fSpeedMultiplier = 4.0f;
 				m_sQueueSample.m_fSoundIntensity = 90.0f;
-				m_sQueueSample.m_bReleasingSoundFlag = false;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
+				m_sQueueSample.m_bReleasingSoundFlag = FALSE;
+				m_sQueueSample.m_bReverbFlag = TRUE;
+				m_sQueueSample.m_bRequireReflection = FALSE;
 				AddSampleToRequestedQueue();
 			}
 		}
@@ -1639,32 +1639,32 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams& params, CVehicle* veh
 	float velocityChangeForAudio;
 	float relativeVelocityChange;
 	float time;
-	bool channelUsed;
-	bool lostTraction;
-	bool noGearBox;
-	bool stuckInSand;
-	bool processedAccelSampleStopped;
-	bool isMoped;
+	bool8 channelUsed;
+	bool8 lostTraction;
+	bool8 noGearBox;
+	bool8 stuckInSand;
+	bool8 processedAccelSampleStopped;
+	bool8 isMoped;
 
 	static uint32 gearSoundStartTime = CTimer::GetTimeInMilliseconds();
 	static int32 nCruising = 0;
 	static int16 LastAccel = 0;
 	static uint8 CurrentPretendGear = 1;
-	static bool bLostTractionLastFrame = false;
-	static bool bHandbrakeOnLastFrame = false;
-	static bool bAccelSampleStopped = true;
+	static bool8 bLostTractionLastFrame = FALSE;
+	static bool8 bHandbrakeOnLastFrame = FALSE;
+	static bool8 bAccelSampleStopped = TRUE;
 
-	lostTraction = false;
+	lostTraction = FALSE;
 	isMoped = params.m_pVehicle->m_modelIndex == MI_PIZZABOY || params.m_pVehicle->m_modelIndex == MI_FAGGIO;
-	processedAccelSampleStopped = false;
+	processedAccelSampleStopped = FALSE;
 	if (bPlayerJustEnteredCar) {
-		bAccelSampleStopped = true;
-		bPlayerJustEnteredCar = false;
+		bAccelSampleStopped = TRUE;
+		bPlayerJustEnteredCar = FALSE;
 		nCruising = 0;
 		LastAccel = 0;
-		bLostTractionLastFrame = false;
+		bLostTractionLastFrame = FALSE;
 		CurrentPretendGear = 1;
-		bHandbrakeOnLastFrame = false;
+		bHandbrakeOnLastFrame = FALSE;
 	}
 	if (CReplay::IsPlayingBack()) {
 		accelerateState = (255.0f * clamp(params.m_pVehicle->m_fGasPedal, 0.0f, 1.0f));
@@ -1673,7 +1673,7 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams& params, CVehicle* veh
 		accelerateState = Pads[0].GetAccelerate();
 		brakeState = Pads[0].GetBrake();
 	}
-	channelUsed = SampleManager.GetChannelUsedFlag(m_nActiveSamples);
+	channelUsed = SampleManager.GetChannelUsedFlag(CHANNEL_PLAYER_VEHICLE_ENGINE);
 	if (isMoped) {
 		CurrentPretendGear = params.m_pTransmission->nNumberOfGears;
 		currentGear = CurrentPretendGear;
@@ -1720,26 +1720,26 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams& params, CVehicle* veh
 						++wheelInUseCounter;
 				}
 				if (wheelInUseCounter > 2)
-					lostTraction = true;
+					lostTraction = TRUE;
 			}
 			break;
 		case 'F':
 			if (params.m_VehicleType == VEHICLE_TYPE_BIKE) {
 				if (wheelState[BIKEWHEEL_FRONT] != WHEEL_STATE_NORMAL)
-					lostTraction = true;
+					lostTraction = TRUE;
 			} else {
 				if ((wheelState[CARWHEEL_FRONT_LEFT] != WHEEL_STATE_NORMAL || wheelState[CARWHEEL_FRONT_RIGHT] != WHEEL_STATE_NORMAL) &&
 					(wheelState[CARWHEEL_REAR_LEFT] != WHEEL_STATE_NORMAL || wheelState[CARWHEEL_REAR_RIGHT] != WHEEL_STATE_NORMAL))
-					lostTraction = true;
+					lostTraction = TRUE;
 			}
 			break;
 		case 'R':
 			if (params.m_VehicleType == VEHICLE_TYPE_BIKE) {
 				if (wheelState[BIKEWHEEL_REAR] != WHEEL_STATE_NORMAL)
-					lostTraction = true;
+					lostTraction = TRUE;
 			} else {
 				if (wheelState[CARWHEEL_REAR_LEFT] != WHEEL_STATE_NORMAL || wheelState[CARWHEEL_REAR_RIGHT] != WHEEL_STATE_NORMAL)
-					lostTraction = true;
+					lostTraction = TRUE;
 			}
 			break;
 		default:
@@ -1760,8 +1760,9 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams& params, CVehicle* veh
 		freqModifier += 1400;
 	gearSoundLength = 0;
 	engineSoundType = aVehicleSettings[params.m_nIndex].m_nBank;
-	soundOffset = 3 * (engineSoundType - CAR_SFX_BANKS_OFFSET);
-	noGearBox = false;
+	soundOffset = gBankStartOffset[engineSoundType] - gBankStartOffset[CAR_SFX_BANKS_OFFSET];
+	//soundOffset = 3 * (engineSoundType - CAR_SFX_BANKS_OFFSET);
+	noGearBox = FALSE;
 	switch (engineSoundType) {
 	case SFX_BANK_PONTIAC:
 		gearSoundLength = 2526;
@@ -1806,7 +1807,7 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams& params, CVehicle* veh
 		gearSoundLength = 2410;
 		break;
 	default:
-		noGearBox = true;
+		noGearBox = TRUE;
 		break;
 	}
 	if (!channelUsed || nCruising || noGearBox) {
@@ -1814,14 +1815,14 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams& params, CVehicle* veh
 	} else {
 		gearSoundLength -= 1000;
 		if (CTimer::GetTimeInMilliseconds() - gearSoundStartTime > gearSoundLength) {
-			channelUsed = false;
+			channelUsed = FALSE;
 			gearSoundStartTime = CTimer::GetTimeInMilliseconds();
 		}
 	}
 	relativeVelocityChange = 2.0f * params.m_fVelocityChange / params.m_pTransmission->fMaxVelocity;
 	accelerationMultipler = clamp(relativeVelocityChange, 0.0f, 1.0f);
 	gasPedalAudio = accelerationMultipler;
-	switch (engineSoundType) {
+	/*switch (engineSoundType) {
 	case SFX_BANK_MOPED:
 		++soundOffset;
 		break;
@@ -1833,12 +1834,12 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams& params, CVehicle* veh
 		break;
 	default:
 		break;
-	}
+	}*/
 	if (accelerateState <= 0) {
 		if (params.m_fVelocityChange < -0.001f) {
 			if (channelUsed) {
-				SampleManager.StopChannel(m_nActiveSamples);
-				bAccelSampleStopped = true;
+				SampleManager.StopChannel(CHANNEL_PLAYER_VEHICLE_ENGINE);
+				bAccelSampleStopped = TRUE;
 			}
 			if (wheelsOnGround == 0 || params.m_pVehicle->bIsHandbrakeOn || lostTraction)
 				gasPedalAudio = *gasPedalAudioPtr;
@@ -1849,8 +1850,8 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams& params, CVehicle* veh
 			*gasPedalAudioPtr = Max(0.0f, gasPedalAudio);
 		} else if (LastAccel > 0) {
 			if (channelUsed) {
-				SampleManager.StopChannel(m_nActiveSamples);
-				bAccelSampleStopped = true;
+				SampleManager.StopChannel(CHANNEL_PLAYER_VEHICLE_ENGINE);
+				bAccelSampleStopped = TRUE;
 			}
 			nCruising = 0;
 			if (wheelsOnGround == 0
@@ -1871,7 +1872,7 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams& params, CVehicle* veh
 					vol /= 4;
 				if (engineSoundType == SFX_BANK_TRUCK)
 					freq /= 2;
-				AddPlayerCarSample(vol, freq, soundOffset + SFX_CAR_FINGER_OFF_ACCEL_1, engineSoundType, 63, false);
+				AddPlayerCarSample(vol, freq, soundOffset + SFX_CAR_FINGER_OFF_ACCEL_1, engineSoundType, 63, FALSE);
 			}
 		}
 		freq = (10000.f * gasPedalAudio) + 22050;
@@ -1880,7 +1881,7 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams& params, CVehicle* veh
 			freq /= 2;
 		if (params.m_pVehicle->bIsDrowning)
 			vol /= 4;
-		AddPlayerCarSample(vol, freq, engineSoundType - CAR_SFX_BANKS_OFFSET + SFX_CAR_IDLE_1, SFX_BANK_0, 52, true);
+		AddPlayerCarSample(vol, freq, aEngineSounds[engineSoundType - CAR_SFX_BANKS_OFFSET][0], SFX_BANK_0, 52, TRUE);
 
 		CurrentPretendGear = Max(1, currentGear);
 	}
@@ -1910,70 +1911,70 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams& params, CVehicle* veh
 				if (engineSoundType == SFX_BANK_TRUCK)
 					freq /= 2;
 				if (channelUsed) {
-					SampleManager.StopChannel(m_nActiveSamples);
-					bAccelSampleStopped = true;
+					SampleManager.StopChannel(CHANNEL_PLAYER_VEHICLE_ENGINE);
+					bAccelSampleStopped = TRUE;
 				}
 				if (params.m_pVehicle->bIsDrowning)
 					vol /= 4;
-				AddPlayerCarSample(vol, freq, engineSoundType - CAR_SFX_BANKS_OFFSET + SFX_CAR_REV_1, SFX_BANK_0, 2, true);
+				AddPlayerCarSample(vol, freq, aEngineSounds[engineSoundType - CAR_SFX_BANKS_OFFSET][1], SFX_BANK_0, 2, TRUE);
 			} else {
 				TranslateEntity(&m_sQueueSample.m_vecPos, &pos);
 				if (bAccelSampleStopped) {
 					if (CurrentPretendGear != 1 || currentGear != 2)
 						CurrentPretendGear = Max(1, currentGear - 1);
-					processedAccelSampleStopped = true;
-					bAccelSampleStopped = false;
+					processedAccelSampleStopped = TRUE;
+					bAccelSampleStopped = FALSE;
 				}
 				if (channelUsed) {
-					SampleManager.SetChannelEmittingVolume(m_nActiveSamples, 120);
-					SampleManager.SetChannel3DPosition(m_nActiveSamples, pos.x, pos.y, pos.z);
-					SampleManager.SetChannel3DDistances(m_nActiveSamples, 50.0f, 12.5f);
+					SampleManager.SetChannelEmittingVolume(CHANNEL_PLAYER_VEHICLE_ENGINE, 120);
+					SampleManager.SetChannel3DPosition(CHANNEL_PLAYER_VEHICLE_ENGINE, pos.x, pos.y, pos.z);
+					SampleManager.SetChannel3DDistances(CHANNEL_PLAYER_VEHICLE_ENGINE, 50.0f, 12.5f);
 					freq = (GearFreqAdj[CurrentPretendGear] + freqModifier + 22050) ;
 					if (engineSoundType == SFX_BANK_TRUCK)
 						freq /= 2;
-					SampleManager.SetChannelFrequency(m_nActiveSamples, freq);
+					SampleManager.SetChannelFrequency(CHANNEL_PLAYER_VEHICLE_ENGINE, freq);
 					if (!channelUsed) {
-						SampleManager.SetChannelReverbFlag(m_nActiveSamples, m_bDynamicAcousticModelingStatus != false);
-						SampleManager.StartChannel(m_nActiveSamples);
+						SampleManager.SetChannelReverbFlag(CHANNEL_PLAYER_VEHICLE_ENGINE, m_bDynamicAcousticModelingStatus != FALSE);
+						SampleManager.StartChannel(CHANNEL_PLAYER_VEHICLE_ENGINE);
 					}
 				} else if (processedAccelSampleStopped) {
 					gearSoundStartTime = CTimer::GetTimeInMilliseconds();
-					params.m_pVehicle->bAudioChangingGear = true;
-					if (!SampleManager.InitialiseChannel(m_nActiveSamples, soundOffset + SFX_CAR_ACCEL_1, SFX_BANK_0))
+					params.m_pVehicle->bAudioChangingGear = TRUE;
+					if (!SampleManager.InitialiseChannel(CHANNEL_PLAYER_VEHICLE_ENGINE, soundOffset + SFX_CAR_ACCEL_1, SFX_BANK_0))
 						return;
-					SampleManager.SetChannelLoopCount(m_nActiveSamples, 1);
-					SampleManager.SetChannelLoopPoints(m_nActiveSamples, 0, -1);
+					SampleManager.SetChannelLoopCount(CHANNEL_PLAYER_VEHICLE_ENGINE, 1);
+					SampleManager.SetChannelLoopPoints(CHANNEL_PLAYER_VEHICLE_ENGINE, 0, -1);
 
-					SampleManager.SetChannelEmittingVolume(m_nActiveSamples, 120);
-					SampleManager.SetChannel3DPosition(m_nActiveSamples, pos.x, pos.y, pos.z);
-					SampleManager.SetChannel3DDistances(m_nActiveSamples, 50.0f, 12.5f);
+					SampleManager.SetChannelEmittingVolume(CHANNEL_PLAYER_VEHICLE_ENGINE, 120);
+					SampleManager.SetChannel3DPosition(CHANNEL_PLAYER_VEHICLE_ENGINE, pos.x, pos.y, pos.z);
+					SampleManager.SetChannel3DDistances(CHANNEL_PLAYER_VEHICLE_ENGINE, 50.0f, 12.5f);
 					freq = (GearFreqAdj[CurrentPretendGear] + freqModifier + 22050);
 					if (engineSoundType == SFX_BANK_TRUCK)
 						freq /= 2;
-					SampleManager.SetChannelFrequency(m_nActiveSamples, freq);
+					SampleManager.SetChannelFrequency(CHANNEL_PLAYER_VEHICLE_ENGINE, freq);
 					if (!channelUsed) {
-						SampleManager.SetChannelReverbFlag(m_nActiveSamples, m_bDynamicAcousticModelingStatus != false);
-						SampleManager.StartChannel(m_nActiveSamples);
+						SampleManager.SetChannelReverbFlag(CHANNEL_PLAYER_VEHICLE_ENGINE, m_bDynamicAcousticModelingStatus != FALSE);
+						SampleManager.StartChannel(CHANNEL_PLAYER_VEHICLE_ENGINE);
 					}
 				} else if (CurrentPretendGear < params.m_pTransmission->nNumberOfGears - 1) {
 					++CurrentPretendGear;
 					gearSoundStartTime = CTimer::GetTimeInMilliseconds();
-					params.m_pVehicle->bAudioChangingGear = true;
-					if (!SampleManager.InitialiseChannel(m_nActiveSamples, soundOffset + SFX_CAR_ACCEL_1, SFX_BANK_0))
+					params.m_pVehicle->bAudioChangingGear = TRUE;
+					if (!SampleManager.InitialiseChannel(CHANNEL_PLAYER_VEHICLE_ENGINE, soundOffset + SFX_CAR_ACCEL_1, SFX_BANK_0))
 						return;
-					SampleManager.SetChannelLoopCount(m_nActiveSamples, 1);
-					SampleManager.SetChannelLoopPoints(m_nActiveSamples, 0, -1);
+					SampleManager.SetChannelLoopCount(CHANNEL_PLAYER_VEHICLE_ENGINE, 1);
+					SampleManager.SetChannelLoopPoints(CHANNEL_PLAYER_VEHICLE_ENGINE, 0, -1);
 
-					SampleManager.SetChannelEmittingVolume(m_nActiveSamples, 120);
-					SampleManager.SetChannel3DPosition(m_nActiveSamples, pos.x, pos.y, pos.z);
-					SampleManager.SetChannel3DDistances(m_nActiveSamples, 50.0f, 12.5f);
+					SampleManager.SetChannelEmittingVolume(CHANNEL_PLAYER_VEHICLE_ENGINE, 120);
+					SampleManager.SetChannel3DPosition(CHANNEL_PLAYER_VEHICLE_ENGINE, pos.x, pos.y, pos.z);
+					SampleManager.SetChannel3DDistances(CHANNEL_PLAYER_VEHICLE_ENGINE, 50.0f, 12.5f);
 					freq = (GearFreqAdj[CurrentPretendGear] + freqModifier + 22050);
 					if (engineSoundType == SFX_BANK_TRUCK)
 						freq /= 2;
-					SampleManager.SetChannelFrequency(m_nActiveSamples, freq);
+					SampleManager.SetChannelFrequency(CHANNEL_PLAYER_VEHICLE_ENGINE, freq);
 					if (!channelUsed) {
-						SampleManager.SetChannelReverbFlag(m_nActiveSamples, m_bDynamicAcousticModelingStatus != false);
-						SampleManager.StartChannel(m_nActiveSamples);
+						SampleManager.SetChannelReverbFlag(CHANNEL_PLAYER_VEHICLE_ENGINE, m_bDynamicAcousticModelingStatus != FALSE);
+						SampleManager.StartChannel(CHANNEL_PLAYER_VEHICLE_ENGINE);
 					}
 				} else {
 					nCruising = 1;
@@ -1982,8 +1983,8 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams& params, CVehicle* veh
 			}
 		} else {
 PlayCruising:
-			bAccelSampleStopped = true;
-			SampleManager.StopChannel(m_nActiveSamples);
+			bAccelSampleStopped = TRUE;
+			SampleManager.StopChannel(CHANNEL_PLAYER_VEHICLE_ENGINE);
 			if (isMoped || accelerateState >= 150 && wheelsOnGround && brakeState <= 0 && !params.m_pVehicle->bIsHandbrakeOn
 				&& !lostTraction && currentGear >= params.m_pTransmission->nNumberOfGears - 1) {
 				if (accelerateState >= 220 && params.m_fVelocityChange + 0.001f >= velocityChangeForAudio) {
@@ -1995,7 +1996,7 @@ PlayCruising:
 				freq = 27 * nCruising + freqModifier + 22050;
 				if (engineSoundType == SFX_BANK_TRUCK)
 					freq /= 2;
-				AddPlayerCarSample(120, freq, soundOffset + SFX_CAR_AFTER_ACCEL_1, engineSoundType, 64, true);
+				AddPlayerCarSample(120, freq, soundOffset + SFX_CAR_AFTER_ACCEL_1, engineSoundType, 64, TRUE);
 			} else {
 				nCruising = 0;
 			}
@@ -2007,7 +2008,7 @@ PlayCruising:
 	return;
 }
 
-bool
+bool8
 cAudioManager::ProcessVehicleSkidding(cVehicleParams& params)
 {
 	const float SOUND_INTENSITY = 40.0f;
@@ -2026,7 +2027,7 @@ cAudioManager::ProcessVehicleSkidding(cVehicleParams& params)
 	float skidVal = 0.0f;
 
 	if (params.m_fDistance >= SQR(SOUND_INTENSITY))
-		return false;
+		return FALSE;
 	switch (params.m_VehicleType) {
 	case VEHICLE_TYPE_CAR:
 		automobile = (CAutomobile*)params.m_pVehicle;
@@ -2044,10 +2045,10 @@ cAudioManager::ProcessVehicleSkidding(cVehicleParams& params)
 		break;
 	default:
 		debug("\n * AUDIOLOG:  ProcessVehicleSkidding() Unsupported vehicle type %d * \n", params.m_VehicleType);
-		return true;
+		return TRUE;
 	}
 	if (wheelsOnGround == 0)
-		return true;
+		return TRUE;
 	CalculateDistance(params.m_bDistanceCalculated, params.m_fDistance);
 
 	for (int32 i = 0; i < numWheels; i++) {
@@ -2089,7 +2090,7 @@ cAudioManager::ProcessVehicleSkidding(cVehicleParams& params)
 				m_sQueueSample.m_nFrequency = 13000.f * skidVal + 35000.f;
 				m_sQueueSample.m_nVolume /= 4;
 				if (m_sQueueSample.m_nVolume == 0)
-					return true;
+					return TRUE;
 				break;
 			case SURFACE_GRAVEL:
 			case SURFACE_MUD_DRY:
@@ -2109,22 +2110,21 @@ cAudioManager::ProcessVehicleSkidding(cVehicleParams& params)
 			}
 
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nReleasingVolumeModificator = 8;
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 			m_sQueueSample.m_fSpeedMultiplier = 3.0f;
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 3;
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bReverbFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			AddSampleToRequestedQueue();
 		}
 	}
-	return true;
+	return TRUE;
 }
 
 float
@@ -2173,7 +2173,7 @@ cAudioManager::GetVehicleNonDriveWheelSkidValue(CVehicle *veh, tWheelState wheel
 	return Max(relativeVelChange, Min(1.0f, Abs(veh->m_vecTurnSpeed.z) * 20.0f));
 }
 
-bool
+bool8
 cAudioManager::ProcessVehicleHorn(cVehicleParams& params)
 {
 	const float SOUND_INTENSITY = 40.0f;
@@ -2182,17 +2182,17 @@ cAudioManager::ProcessVehicleHorn(cVehicleParams& params)
 	uint8 volume;
 
 	if (params.m_fDistance >= SQR(SOUND_INTENSITY))
-		return false;
+		return FALSE;
 
 	veh = params.m_pVehicle;
 	if (veh->m_bSirenOrAlarm && UsesSirenSwitching(params))
-		return true;
+		return TRUE;
 
 	if (veh->m_modelIndex == MI_MRWHOOP)
-		return true;
+		return TRUE;
 
 	if (veh->IsAlarmOn())
-		return true;
+		return TRUE;
 
 	if (veh->m_nCarHornTimer != 0) {
 		if (veh->GetStatus() != STATUS_PLAYER) {
@@ -2201,7 +2201,7 @@ cAudioManager::ProcessVehicleHorn(cVehicleParams& params)
 				veh->m_nCarHornPattern = (m_FrameCounter + m_sQueueSample.m_nEntityIndex) & 7;
 
 			if (!hornPatternsArray[veh->m_nCarHornPattern][44 - veh->m_nCarHornTimer])
-				return true;
+				return TRUE;
 		}
 
 		CalculateDistance(params.m_bDistanceCalculated, params.m_fDistance);
@@ -2211,7 +2211,7 @@ cAudioManager::ProcessVehicleHorn(cVehicleParams& params)
 			m_sQueueSample.m_nCounter = 4;
 			m_sQueueSample.m_nSampleIndex = aVehicleSettings[params.m_nIndex].m_nHornSample;
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nReleasingVolumeModificator = 2;
 			m_sQueueSample.m_nFrequency = aVehicleSettings[params.m_nIndex].m_nHornFrequency;
 			m_sQueueSample.m_nLoopCount = 0;
@@ -2220,35 +2220,34 @@ cAudioManager::ProcessVehicleHorn(cVehicleParams& params)
 #else
 			m_sQueueSample.m_nEmittingVolume = 80;
 #endif
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 			m_sQueueSample.m_fSpeedMultiplier = 5.0f;
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 4;
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bReverbFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			AddSampleToRequestedQueue();
 		}
 	}
-	return true;
+	return TRUE;
 }
 
-bool
+bool8
 cAudioManager::UsesSiren(cVehicleParams& params) const
 {
 	return params.m_pVehicle->UsesSiren();
 }
 
-bool
+bool8
 cAudioManager::UsesSirenSwitching(cVehicleParams& params) const
 {
 	if (params.m_nIndex == FIRETRUK || params.m_nIndex == MRWHOOP)
-		return false;
+		return FALSE;
 	return UsesSiren(params);
 }
 
-bool
+bool8
 cAudioManager::ProcessVehicleSirenOrAlarm(cVehicleParams& params)
 {
 	const float SOUND_INTENSITY = 110.0f;
@@ -2257,18 +2256,18 @@ cAudioManager::ProcessVehicleSirenOrAlarm(cVehicleParams& params)
 	uint8 volume;
 
 	if (params.m_fDistance >= SQR(SOUND_INTENSITY))
-		return false;
+		return FALSE;
 
 	veh = params.m_pVehicle;
 	if (!veh->m_bSirenOrAlarm && !veh->IsAlarmOn())
-		return true;
+		return TRUE;
 
 	if (veh->IsAlarmOn()) {
 		if (CTimer::GetTimeInMilliseconds() > veh->m_nCarHornTimer)
 			veh->m_nCarHornTimer = CTimer::GetTimeInMilliseconds() + 750;
 
 		if (veh->m_nCarHornTimer < CTimer::GetTimeInMilliseconds() + 375)
-			return true;
+			return TRUE;
 	}
 
 	CalculateDistance(params.m_bDistanceCalculated, params.m_fDistance);
@@ -2278,7 +2277,7 @@ cAudioManager::ProcessVehicleSirenOrAlarm(cVehicleParams& params)
 		m_sQueueSample.m_nCounter = 5;
 		if (UsesSiren(params)) {
 			if (params.m_pVehicle->GetStatus() == STATUS_ABANDONED)
-				return true;
+				return TRUE;
 			if (veh->m_nCarHornTimer != 0 && params.m_nIndex != FIRETRUK && params.m_nIndex != MRWHOOP) {
 				m_sQueueSample.m_nSampleIndex = SFX_SIREN_FAST;
 				if (params.m_nIndex == FBIRANCH)
@@ -2298,30 +2297,29 @@ cAudioManager::ProcessVehicleSirenOrAlarm(cVehicleParams& params)
 			m_sQueueSample.m_nFrequency = aVehicleSettings[params.m_nIndex].m_nHornFrequency;
 		}
 		m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		m_sQueueSample.m_nReleasingVolumeModificator = 1;
 		m_sQueueSample.m_nLoopCount = 0;
 		m_sQueueSample.m_nEmittingVolume = volume;
-		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+		SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 		m_sQueueSample.m_fSpeedMultiplier = 7.0f;
 		m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-		m_sQueueSample.m_bReleasingSoundFlag = false;
+		m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 		m_sQueueSample.m_nReleasingVolumeDivider = 5;
-		m_sQueueSample.m_bReverbFlag = true;
-		m_sQueueSample.m_bRequireReflection = false;
+		m_sQueueSample.m_bReverbFlag = TRUE;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		AddSampleToRequestedQueue();
 	}
-	return true;
+	return TRUE;
 }
 
-bool
+bool8
 cAudioManager::UsesReverseWarning(int32 model) const
 {
 	return model == LINERUN || model == FIRETRUK || model == BUS || model == COACH || model == PACKER || model == FLATBED;
 }
 
-bool
+bool8
 cAudioManager::ProcessVehicleReverseWarning(cVehicleParams& params)
 {
 	const float SOUND_INTENSITY = 50.0f;
@@ -2330,7 +2328,7 @@ cAudioManager::ProcessVehicleReverseWarning(cVehicleParams& params)
 	uint8 volume;
 
 	if (params.m_fDistance >= SQR(SOUND_INTENSITY))
-		return false;
+		return FALSE;
 
 	if (veh->bEngineOn && veh->m_fGasPedal < 0.0f) {
 		CalculateDistance(params.m_bDistanceCalculated, params.m_fDistance);
@@ -2340,7 +2338,7 @@ cAudioManager::ProcessVehicleReverseWarning(cVehicleParams& params)
 			m_sQueueSample.m_nCounter = 12;
 			m_sQueueSample.m_nSampleIndex = SFX_REVERSE_WARNING;
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nReleasingVolumeModificator = 2;
 			m_sQueueSample.m_nFrequency = (100 * m_sQueueSample.m_nEntityIndex & 1023) + SampleManager.GetSampleBaseFrequency(SFX_REVERSE_WARNING);
 			m_sQueueSample.m_nLoopCount = 0;
@@ -2349,21 +2347,20 @@ cAudioManager::ProcessVehicleReverseWarning(cVehicleParams& params)
 #else
 			m_sQueueSample.m_nEmittingVolume = 60;
 #endif
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 			m_sQueueSample.m_fSpeedMultiplier = 3.0f;
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 3;
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bReverbFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			AddSampleToRequestedQueue();
 		}
 	}
-	return true;
+	return TRUE;
 }
 
-bool
+bool8
 cAudioManager::ProcessVehicleDoors(cVehicleParams& params)
 {
 	const float SOUND_INTENSITY = 40.0f;
@@ -2374,7 +2371,7 @@ cAudioManager::ProcessVehicleDoors(cVehicleParams& params)
 	float velocity;
 
 	if (params.m_fDistance >= SQR(SOUND_INTENSITY))
-		return false;
+		return FALSE;
 
 	automobile = (CAutomobile *)params.m_pVehicle;
 	CalculateDistance(params.m_bDistanceCalculated, params.m_fDistance);
@@ -2391,27 +2388,26 @@ cAudioManager::ProcessVehicleDoors(cVehicleParams& params)
 						m_sQueueSample.m_nSampleIndex = m_anRandomTable[1] % 6 + SFX_COL_CAR_PANEL_1;
 						m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex) + RandomDisplacement(1000);
 						m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-						m_sQueueSample.m_bIs2D = false;
+						m_sQueueSample.m_bIs2D = FALSE;
 						m_sQueueSample.m_nReleasingVolumeModificator = 10;
 						m_sQueueSample.m_nLoopCount = 1;
 						m_sQueueSample.m_nEmittingVolume = emittingVol;
-						m_sQueueSample.m_nLoopStart = 0;
-						m_sQueueSample.m_nLoopEnd = -1;
+						RESET_LOOP_OFFSETS
 						m_sQueueSample.m_fSpeedMultiplier = 1.0f;
 						m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-						m_sQueueSample.m_bReleasingSoundFlag = true;
-						m_sQueueSample.m_bReverbFlag = true;
-						m_sQueueSample.m_bRequireReflection = true;
+						m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+						m_sQueueSample.m_bReverbFlag = TRUE;
+						m_sQueueSample.m_bRequireReflection = TRUE;
 						AddSampleToRequestedQueue();
 					}
 				}
 			}
 		}
 	}
-	return true;
+	return TRUE;
 }
 
-bool
+bool8
 cAudioManager::ProcessAirBrakes(cVehicleParams& params)
 {
 	const float SOUND_INTENSITY = 30.0f;
@@ -2419,14 +2415,14 @@ cAudioManager::ProcessAirBrakes(cVehicleParams& params)
 	uint8 volume;
 
 	if (params.m_fDistance > SQR(SOUND_INTENSITY))
-		return false;
+		return FALSE;
 	automobile = (CAutomobile *)params.m_pVehicle;
 	if (!automobile->bEngineOn)
-		return true;
+		return TRUE;
 
 	if ((automobile->m_fVelocityChangeForAudio < 0.025f || params.m_fVelocityChange >= 0.025f) &&
 	    (automobile->m_fVelocityChangeForAudio > -0.025f || params.m_fVelocityChange <= 0.025f))
-		return true;
+		return TRUE;
 
 	CalculateDistance(params.m_bDistanceCalculated, params.m_fDistance);
 	volume = m_anRandomTable[0] % 10 + 70;
@@ -2437,31 +2433,30 @@ cAudioManager::ProcessAirBrakes(cVehicleParams& params)
 		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_AIR_BRAKES);
 		m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
 		m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		m_sQueueSample.m_nReleasingVolumeModificator = 10;
 		m_sQueueSample.m_nLoopCount = 1;
 		m_sQueueSample.m_nEmittingVolume = volume;
-		m_sQueueSample.m_nLoopStart = 0;
-		m_sQueueSample.m_nLoopEnd = -1;
+		RESET_LOOP_OFFSETS
 		m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 		m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-		m_sQueueSample.m_bReleasingSoundFlag = true;
-		m_sQueueSample.m_bReverbFlag = true;
-		m_sQueueSample.m_bRequireReflection = false;
+		m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+		m_sQueueSample.m_bReverbFlag = TRUE;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		AddSampleToRequestedQueue();
 	}
 
-	return true;
+	return TRUE;
 }
 
-bool
+bool8
 cAudioManager::HasAirBrakes(int32 model) const
 {
 	return model == LINERUN || model == FIRETRUK || model == TRASH || model == BUS || model == BARRACKS 
 		|| model == COACH || model == PACKER || model == FLATBED;
 }
 
-bool
+bool8
 cAudioManager::ProcessEngineDamage(cVehicleParams& params)
 {
 	const float SOUND_INTENSITY = 40.0f;
@@ -2470,11 +2465,11 @@ cAudioManager::ProcessEngineDamage(cVehicleParams& params)
 	uint8 emittingVolume;
 
 	if (params.m_fDistance >= SQR(SOUND_INTENSITY))
-		return false;
+		return FALSE;
 	if (params.m_pVehicle->m_modelIndex == MI_CADDY)
-		return true;
+		return TRUE;
 	if (params.m_pVehicle->GetStatus() == STATUS_WRECKED)
-		return true;
+		return TRUE;
 	health = params.m_pVehicle->m_fHealth;
 	if (health < 390.0f) {
 		if (health < 250.0f) {
@@ -2495,24 +2490,23 @@ cAudioManager::ProcessEngineDamage(cVehicleParams& params)
 		if (m_sQueueSample.m_nVolume != 0) {
 			m_sQueueSample.m_nCounter = 28;
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_nEmittingVolume = emittingVolume;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 			m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 3;
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bReverbFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			AddSampleToRequestedQueue();
 		}
 	}
-	return true;
+	return TRUE;
 }
 
-bool
+bool8
 cAudioManager::ProcessCarBombTick(cVehicleParams& params)
 {
 	const float SOUND_INTENSITY = 40.0f;
@@ -2521,7 +2515,7 @@ cAudioManager::ProcessCarBombTick(cVehicleParams& params)
 	uint8 bombType;
 
 	if (params.m_fDistance >= SQR(SOUND_INTENSITY))
-		return false;
+		return FALSE;
 	if (params.m_pVehicle->bEngineOn) {
 		switch (params.m_VehicleType) {
 		case VEHICLE_TYPE_CAR:
@@ -2532,7 +2526,7 @@ cAudioManager::ProcessCarBombTick(cVehicleParams& params)
 			break;
 		default:
 			debug("\n * AUDIOLOG:  ProcessCarBombTick()  Unsupported vehicle type %d * \n", params.m_VehicleType);
-			return true;
+			return TRUE;
 			break;
 		}
 		if (bombType == CARBOMB_TIMEDACTIVE) {
@@ -2542,24 +2536,23 @@ cAudioManager::ProcessCarBombTick(cVehicleParams& params)
 				m_sQueueSample.m_nCounter = 35;
 				m_sQueueSample.m_nSampleIndex = SFX_COUNTDOWN;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-				m_sQueueSample.m_bIs2D = false;
+				m_sQueueSample.m_bIs2D = FALSE;
 				m_sQueueSample.m_nReleasingVolumeModificator = 0;
 				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_COUNTDOWN);
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_nEmittingVolume = EMITTING_VOLUME;
-				m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+				SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 				m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 				m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-				m_sQueueSample.m_bReleasingSoundFlag = false;
+				m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 				m_sQueueSample.m_nReleasingVolumeDivider = 3;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
+				m_sQueueSample.m_bReverbFlag = TRUE;
+				m_sQueueSample.m_bRequireReflection = FALSE;
 				AddSampleToRequestedQueue();
 			}
 		}
 	}
-	return true;
+	return TRUE;
 }
 
 void
@@ -2569,15 +2562,15 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
 	uint8 emittingVol;
 	float relVol;
 	float vol;
-	bool noReflections;
-	bool isHeli;
+	bool8 noReflections;
+	bool8 isHeli;
 	float maxDist;
 	static uint8 GunIndex = 53;
 
 	for (int i = 0; i < m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_AudioEvents; i++) {
-		noReflections = false;
-		isHeli = false;
-		m_sQueueSample.m_bRequireReflection = false;
+		noReflections = FALSE;
+		isHeli = FALSE;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		event = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i];
 		switch (event) {
 		case SOUND_CAR_DOOR_CLOSE_BONNET:
@@ -2620,7 +2613,7 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
 			m_sQueueSample.m_nReleasingVolumeModificator = 3;
 			m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-			m_sQueueSample.m_bRequireReflection = true;
+			m_sQueueSample.m_bRequireReflection = TRUE;
 			break;
 		}
 		case SOUND_CAR_DOOR_OPEN_BONNET:
@@ -2660,7 +2653,7 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
 			m_sQueueSample.m_nReleasingVolumeModificator = 3;
 			m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-			m_sQueueSample.m_bRequireReflection = true;
+			m_sQueueSample.m_bRequireReflection = TRUE;
 			break;
 		}
 		case SOUND_CAR_WINDSHIELD_CRACK: {
@@ -2735,7 +2728,7 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
 			m_sQueueSample.m_nReleasingVolumeModificator = 1;
 			m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-			m_sQueueSample.m_bRequireReflection = true;
+			m_sQueueSample.m_bRequireReflection = TRUE;
 			break;
 		}
 		case SOUND_CAR_LIGHT_BREAK: {
@@ -2780,7 +2773,7 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
 			m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
 			m_sQueueSample.m_nReleasingVolumeDivider = 7;
-			noReflections = true;
+			noReflections = TRUE;
 			maxDist = SQR(SOUND_INTENSITY);
 			emittingVol = m_anRandomTable[0] % 15 + 55;
 			break;
@@ -2865,7 +2858,7 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
 			emittingVol = (37.0f * vol * 625.0f / 24.0f) + 90;
 			maxDist = SQR(SOUND_INTENSITY);
-			noReflections = true;
+			noReflections = TRUE;
 			break;
 		}
 		case SOUND_CAR_BOMB_TICK: {
@@ -2878,7 +2871,7 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
 			m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
 			maxDist = SQR(SOUND_INTENSITY);
-			m_sQueueSample.m_bRequireReflection = true;
+			m_sQueueSample.m_bRequireReflection = TRUE;
 			emittingVol = 60;
 			break;
 		}
@@ -2960,8 +2953,8 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
 				m_sQueueSample.m_nReleasingVolumeModificator = 2;
 				m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 				m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-				m_sQueueSample.m_bRequireReflection = true;
-				isHeli = true;
+				m_sQueueSample.m_bRequireReflection = TRUE;
+				isHeli = TRUE;
 				break;
 			default:
 			{
@@ -2970,6 +2963,8 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
 				int32 sampleIndex;
 				int32 frequency;
 				CPed *pPed = params.m_pVehicle->pDriver;
+				if(!pPed)
+					break;
 				if(!pPed->HasWeaponSlot(WEAPONSLOT_SUBMACHINEGUN)) {
 					sampleIndex = SFX_UZI_LEFT;
 					frequency = SampleManager.GetSampleBaseFrequency(sampleIndex);
@@ -3012,7 +3007,7 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
 				m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 				m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-				m_sQueueSample.m_bRequireReflection = true;
+				m_sQueueSample.m_bRequireReflection = TRUE;
 				break;
 			}
 			}
@@ -3044,7 +3039,7 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
 			m_sQueueSample.m_nReleasingVolumeModificator = 0;
 			m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-			m_sQueueSample.m_bRequireReflection = true;
+			m_sQueueSample.m_bRequireReflection = TRUE;
 			emittingVol = 50;
 			maxDist = SQR(SOUND_INTENSITY);
 			break;
@@ -3058,7 +3053,7 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
 		}
 		/* case SOUND_PED_BODYCAST_HIT:
 			pedParams.m_pPed = nil;
-			pedParams.m_bDistanceCalculated = false;
+			pedParams.m_bDistanceCalculated = FALSE;
 			pedParams.m_fDistance = 0.0f;
 			pedParams.m_bDistanceCalculated = params.m_bDistanceCalculated;
 			pedParams.m_fDistance = params.m_fDistance;
@@ -3085,7 +3080,7 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
 			m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
 			maxDist = SQR(SOUND_INTENSITY);
-			m_sQueueSample.m_bRequireReflection = true;
+			m_sQueueSample.m_bRequireReflection = TRUE;
 			emittingVol = m_anRandomTable[4] % 20 + 90;
 			break;
 		}
@@ -3103,7 +3098,7 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
 			maxDist = SQR(SOUND_INTENSITY);
 			emittingVol = m_anRandomTable[4] % 20 + 55;
 			CrunchOffset %= 2;
-			m_sQueueSample.m_bRequireReflection = true;
+			m_sQueueSample.m_bRequireReflection = TRUE;
 			break;
 		}
 		case SOUND_CAR_PED_COLLISION: {
@@ -3133,18 +3128,17 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
 			if (m_sQueueSample.m_nVolume != 0) {
 				if (noReflections) {
 					m_sQueueSample.m_nLoopCount = 0;
-					m_sQueueSample.m_bReleasingSoundFlag = false;
+					m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 				} else {
 					m_sQueueSample.m_nLoopCount = 1;
-					m_sQueueSample.m_bReleasingSoundFlag = true;
+					m_sQueueSample.m_bReleasingSoundFlag = TRUE;
 				}
-				m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+				SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_bReverbFlag = true;
+				m_sQueueSample.m_bReverbFlag = TRUE;
 				if (isHeli) {
 					if (0.2f * m_sQueueSample.m_fSoundIntensity > m_sQueueSample.m_fDistance) {
-						m_sQueueSample.m_bIs2D = true;
+						m_sQueueSample.m_bIs2D = TRUE;
 						m_sQueueSample.m_nOffset = 0;
 #ifdef THIS_IS_STUPID
 						goto AddSample;
@@ -3155,14 +3149,14 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
 						m_sQueueSample.m_nCounter = GunIndex++;
 						if (GunIndex > 58)
 							GunIndex = 53;
-						m_sQueueSample.m_bRequireReflection = false;
+						m_sQueueSample.m_bRequireReflection = FALSE;
 						AddSampleToRequestedQueue();
 						continue;
 #endif
 					}
-					isHeli = false;
+					isHeli = FALSE;
 				}
-				m_sQueueSample.m_bIs2D = false;
+				m_sQueueSample.m_bIs2D = FALSE;
 #ifdef THIS_IS_STUPID
 AddSample:
 				AddSampleToRequestedQueue();
@@ -3186,79 +3180,77 @@ AddSample:
 }
 
 #ifdef GTA_TRAIN
-bool
+bool8
 cAudioManager::ProcessTrainNoise(cVehicleParams& params)
 {
-	const float SOUND_INTENSITY = 300.0f;
+	const float SOUND_INTENSITY = 140.0f;
 
 	CTrain *train;
 	uint8 emittingVol;
 	float speedMultipler;
 
 	if (params.m_fDistance >= SQR(SOUND_INTENSITY))
-		return false;
+		return FALSE;
 
 	if (params.m_fVelocityChange > 0.0f) {
 		CalculateDistance(params.m_bDistanceCalculated, params.m_fDistance);
 		train = (CTrain *)params.m_pVehicle;
 		speedMultipler = Min(1.0f, train->m_fSpeed * 250.f / 51.f);
-		emittingVol = (75.f * speedMultipler);
+		emittingVol = (70.f * speedMultipler);
 		if (train->m_fWagonPosition == 0.0f) {
 			m_sQueueSample.m_nVolume = ComputeVolume(emittingVol, SOUND_INTENSITY, m_sQueueSample.m_fDistance);
 			if (m_sQueueSample.m_nVolume != 0) {
 				m_sQueueSample.m_nCounter = 32;
-				m_sQueueSample.m_nSampleIndex = SFX_TRAIN_FAR;
+				m_sQueueSample.m_nSampleIndex = SFX_TRAIN;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-				m_sQueueSample.m_bIs2D = false;
+				m_sQueueSample.m_bIs2D = FALSE;
 				m_sQueueSample.m_nReleasingVolumeModificator = 2;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_TRAIN_FAR);
+				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_TRAIN);
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+				SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 				m_sQueueSample.m_fSpeedMultiplier = 3.0f;
 				m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-				m_sQueueSample.m_bReleasingSoundFlag = false;
+				m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 				m_sQueueSample.m_nReleasingVolumeDivider = 3;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
+				m_sQueueSample.m_bReverbFlag = TRUE;
+				m_sQueueSample.m_bRequireReflection = FALSE;
 				AddSampleToRequestedQueue();
 			}
 		}
-		const float SOUND_INTENSITY = 70.0f;
-		if (params.m_fDistance < SQR(SOUND_INTENSITY)) {
-			m_sQueueSample.m_nVolume = ComputeVolume(emittingVol, SOUND_INTENSITY, m_sQueueSample.m_fDistance);
-			if (m_sQueueSample.m_nVolume != 0) {
-				m_sQueueSample.m_nCounter = 33;
-				m_sQueueSample.m_nSampleIndex = SFX_TRAIN_NEAR;
-				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_nReleasingVolumeModificator = 5;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_TRAIN_NEAR) + 100 * m_sQueueSample.m_nEntityIndex % 987;
-				m_sQueueSample.m_nLoopCount = 0;
-				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_fSpeedMultiplier = 6.0f;
-				m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-				m_sQueueSample.m_bReleasingSoundFlag = false;
-				m_sQueueSample.m_nReleasingVolumeDivider = 3;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
-				AddSampleToRequestedQueue();
-			}
-		}
-	}
-	return true;
+		//const float SOUND_INTENSITY = 70.0f;
+		//if (params.m_fDistance < SQR(SOUND_INTENSITY)) {
+		//	m_sQueueSample.m_nVolume = ComputeVolume(emittingVol, SOUND_INTENSITY, m_sQueueSample.m_fDistance);
+		//	if (m_sQueueSample.m_nVolume != 0) {
+		//		m_sQueueSample.m_nCounter = 33;
+		//		m_sQueueSample.m_nSampleIndex = SFX_TRAIN_NEAR;
+		//		m_sQueueSample.m_nBankIndex = SFX_BANK_0;
+		//		m_sQueueSample.m_bIs2D = FALSE;
+		//		m_sQueueSample.m_nReleasingVolumeModificator = 5;
+		//		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_TRAIN_NEAR) + 100 * m_sQueueSample.m_nEntityIndex % 987;
+		//		m_sQueueSample.m_nLoopCount = 0;
+		//		m_sQueueSample.m_nEmittingVolume = emittingVol;
+		//		SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
+		//		m_sQueueSample.m_fSpeedMultiplier = 6.0f;
+		//		m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
+		//		m_sQueueSample.m_bReleasingSoundFlag = FALSE;
+		//		m_sQueueSample.m_nReleasingVolumeDivider = 3;
+		//		m_sQueueSample.m_bReverbFlag = TRUE;
+		//		m_sQueueSample.m_bRequireReflection = FALSE;
+		//		AddSampleToRequestedQueue();
+		//	}
+		//}
+	}
+	return TRUE;
 }
 #endif
-bool
+bool8
 cAudioManager::ProcessBoatEngine(cVehicleParams& params)
 {
 	CBoat *boat;
 	float padRelativeAccerate;
 
-	bool isV12 = false;
+	bool8 isV12 = FALSE;
 	static int32 LastFreq = 2000;
 	static int8 LastVol = 0;
 
@@ -3267,7 +3259,7 @@ cAudioManager::ProcessBoatEngine(cVehicleParams& params)
 	if (params.m_fDistance < SQR(intensity)) {
 		boat = (CBoat *)params.m_pVehicle;
 		if(boat->GetStatus() == STATUS_WRECKED)
-			return true;
+			return TRUE;
 
 		float freqModificator;
 		float volModificator;
@@ -3289,7 +3281,7 @@ cAudioManager::ProcessBoatEngine(cVehicleParams& params)
 		case MI_JETMAX:
 			freqModificator = 6000.0f;
 			volModificator = 60.0f;
-			isV12 = true;
+			isV12 = TRUE;
 			BaseFreq = 9000;
 			BaseVol = 20;
 			break;
@@ -3307,18 +3299,18 @@ cAudioManager::ProcessBoatEngine(cVehicleParams& params)
 			BaseFreq = 1782;
 			break;
 		default:
-			return true;
+			return TRUE;
 		}
 
-		bool bIsPlayerVeh;
+		bool8 bIsPlayerVeh;
 
 		if(FindPlayerVehicle() == params.m_pVehicle) {
 			float padAccelerate = Max(Pads[0].GetAccelerate(), Pads[0].GetBrake());
 			padRelativeAccerate = padAccelerate / 255.0f;
-			bIsPlayerVeh = true;
+			bIsPlayerVeh = TRUE;
 		} else {
 			padRelativeAccerate = Max(params.m_pVehicle->m_fGasPedal, params.m_pVehicle->m_fBrakePedal);
-			bIsPlayerVeh = false;
+			bIsPlayerVeh = FALSE;
 		}
 
 		int Freq = BaseFreq + (padRelativeAccerate * freqModificator);
@@ -3356,18 +3348,17 @@ cAudioManager::ProcessBoatEngine(cVehicleParams& params)
 				else
 					m_sQueueSample.m_nSampleIndex = SFX_BOAT_CRUISER_LOOP;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-				m_sQueueSample.m_bIs2D = false;
+				m_sQueueSample.m_bIs2D = FALSE;
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_nEmittingVolume = Vol;
-				m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+				SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 				m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 				m_sQueueSample.m_fSoundIntensity = intensity;
-				m_sQueueSample.m_bReleasingSoundFlag = false;
+				m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 				m_sQueueSample.m_nReleasingVolumeDivider = 7;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
+				m_sQueueSample.m_bReverbFlag = TRUE;
+				m_sQueueSample.m_bRequireReflection = FALSE;
 				AddSampleToRequestedQueue();
 			}
 		}
@@ -3381,18 +3372,17 @@ cAudioManager::ProcessBoatEngine(cVehicleParams& params)
 				m_sQueueSample.m_nSampleIndex = SFX_FISHING_BOAT_IDLE;
 				m_sQueueSample.m_nFrequency += (m_sQueueSample.m_nEntityIndex * 65536) % 1000;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-				m_sQueueSample.m_bIs2D = false;
+				m_sQueueSample.m_bIs2D = FALSE;
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_nEmittingVolume = 80;
-				m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+				SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 				m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 				m_sQueueSample.m_fSoundIntensity = intensity;
-				m_sQueueSample.m_bReleasingSoundFlag = false;
+				m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 				m_sQueueSample.m_nReleasingVolumeDivider = 7;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
+				m_sQueueSample.m_bReverbFlag = TRUE;
+				m_sQueueSample.m_bRequireReflection = FALSE;
 				AddSampleToRequestedQueue();
 			}
 		}
@@ -3400,12 +3390,12 @@ cAudioManager::ProcessBoatEngine(cVehicleParams& params)
 			LastFreq = Freq;
 			LastVol = Vol;
 		}
-		return true;
+		return TRUE;
 	}
-	return false;
+	return FALSE;
 }
 
-bool
+bool8
 cAudioManager::ProcessBoatMovingOverWater(cVehicleParams& params)
 {
 	float velocityChange;
@@ -3413,11 +3403,11 @@ cAudioManager::ProcessBoatMovingOverWater(cVehicleParams& params)
 	float multiplier;
 
 	if (params.m_fDistance > SQR(50))
-		return false;
+		return FALSE;
 
 	velocityChange = Abs(params.m_fVelocityChange);
 	if (velocityChange <= 0.0005f && ((CBoat*)params.m_pVehicle)->bBoatInWater)
-		return true;
+		return TRUE;
 
 	velocityChange = Min(0.75f, velocityChange);
 	multiplier = (velocityChange - 0.0005f) / (1499.0f / 2000.0f);
@@ -3428,23 +3418,22 @@ cAudioManager::ProcessBoatMovingOverWater(cVehicleParams& params)
 		m_sQueueSample.m_nCounter = 38;
 		m_sQueueSample.m_nSampleIndex = SFX_BOAT_WATER_LOOP;
 		m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_nFrequency = (6050.f * multiplier) + 16000;
 		m_sQueueSample.m_nLoopCount = 0;
 		m_sQueueSample.m_nEmittingVolume = vol;
-		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+		SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 		m_sQueueSample.m_fSoundIntensity = 50.0f;
-		m_sQueueSample.m_bReleasingSoundFlag = false;
+		m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 		m_sQueueSample.m_nReleasingVolumeDivider = 6;
-		m_sQueueSample.m_bReverbFlag = true;
-		m_sQueueSample.m_bRequireReflection = false;
+		m_sQueueSample.m_bReverbFlag = TRUE;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		AddSampleToRequestedQueue();
 	}
 
-	return true;
+	return TRUE;
 }
 
 void
@@ -3464,12 +3453,12 @@ cAudioManager::ProcessCarHeli(cVehicleParams& params)
 	float propellerSpeed;
 	float freqModifier; //may be relate to angle with horison
 	float cameraAngle;
-	bool distanceCalculatedOld;
+	bool8 distanceCalculatedOld;
 	float distanceOld;
 	CVector vecPosOld;
 
 	float volumeModifier;//TODO find better name
-	bool hunterBool;
+	bool8 hunterBool;
 	
 	static uint32 freqFrontPrev = 14287;
 	static uint32 freqPropellerPrev = 7143;
@@ -3477,7 +3466,7 @@ cAudioManager::ProcessCarHeli(cVehicleParams& params)
 
 	boat = nil;
 	automobile = nil;
-	hunterBool = false;
+	hunterBool = FALSE;
 
 	if (params.m_fDistance >= SQR(SOUND_INTENSITY))
 		return;
@@ -3492,7 +3481,7 @@ cAudioManager::ProcessCarHeli(cVehicleParams& params)
 		brakeState = veh->m_fBrakePedal * 255.0f;
 	}
 	freqModifier = Abs(veh->GetUp().y);
-	cameraAngle = (DotProduct(veh->m_matrix.GetForward(), TheCamera.GetForward()) + 1.0f) / 2.0f;
+	cameraAngle = (DotProduct(veh->GetMatrix().GetForward(), TheCamera.GetForward()) + 1.0f) / 2.0f;
 	if (veh->m_modelIndex == MI_SKIMMER) {
 		boat = (CBoat*)veh;
 		propellerSpeed = boat->m_fMovingSpeed * 50.0f / 11.0f;
@@ -3533,21 +3522,31 @@ cAudioManager::ProcessCarHeli(cVehicleParams& params)
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 			}
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nReleasingVolumeModificator = 2;
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 			m_sQueueSample.m_fSpeedMultiplier = 6.0f;
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 5;
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bReverbFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			AddSampleToRequestedQueue();
 		}
 	}
+	
+	CVector backPropellerPos;
+	if (automobile != nil)
+		automobile->GetComponentWorldPosition(CAR_BOOT, backPropellerPos);
+	else if (params.m_VehicleType == VEHICLE_TYPE_HELI) 
+#ifdef FIX_BUGS
+		backPropellerPos = 
+#endif
+		params.m_pVehicle->GetMatrix() * CVector(0.0f, -10.0f, 0.0f);
+	else
+		backPropellerPos = m_sQueueSample.m_vecPos;
 
 	if (params.m_fDistance >= SQR(140.0f))
 		return;
@@ -3561,7 +3560,7 @@ cAudioManager::ProcessCarHeli(cVehicleParams& params)
 		if (playerVeh == veh && (accelerateState > 0 || brakeState > 0) && freq < 1300)//unnesesary freqModifier alredy <= 1300
 			freq = 1300;
 		if (veh->m_modelIndex == MI_HUNTER)
-			hunterBool = true;
+			hunterBool = TRUE;
 	}
 
 
@@ -3574,18 +3573,17 @@ cAudioManager::ProcessCarHeli(cVehicleParams& params)
 			m_sQueueSample.m_nSampleIndex = SFX_HELI_APACHE_1;
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 			m_sQueueSample.m_nFrequency = (volumeModifier + 1.0f) * 16000 + freq;
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nReleasingVolumeModificator = 1;
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 			m_sQueueSample.m_fSpeedMultiplier = 6.0f;
 			m_sQueueSample.m_fSoundIntensity = 140.0f;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 5;
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bReverbFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			AddSampleToRequestedQueue();
 		} else if (boat != nil) {
 			m_sQueueSample.m_nSampleIndex = SFX_SEAPLANE_PRO1;
@@ -3600,35 +3598,33 @@ cAudioManager::ProcessCarHeli(cVehicleParams& params)
 			m_sQueueSample.m_nFrequency = clamp2(m_sQueueSample.m_nFrequency, freqFrontPrev, 197);
 			freqFrontPrev = m_sQueueSample.m_nFrequency;
 
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nReleasingVolumeModificator = 1;
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 			m_sQueueSample.m_fSpeedMultiplier = 6.0f;
 			m_sQueueSample.m_fSoundIntensity = 140.0f;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 5;
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bReverbFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			AddSampleToRequestedQueue();
 		} else {
 			m_sQueueSample.m_nSampleIndex = SFX_CAR_HELI_MAI;
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 			m_sQueueSample.m_nFrequency = (volumeModifier + 1) * 16000 + freq;
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nReleasingVolumeModificator = 1;
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 			m_sQueueSample.m_fSpeedMultiplier = 6.0f;
 			m_sQueueSample.m_fSoundIntensity = 140.0f;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 5;
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bReverbFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			AddSampleToRequestedQueue();
 		}
 	}
@@ -3662,18 +3658,17 @@ cAudioManager::ProcessCarHeli(cVehicleParams& params)
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 			m_sQueueSample.m_nFrequency = (volumeModifier + 1) * 16000 + freq;
 		}
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		m_sQueueSample.m_nReleasingVolumeModificator = 1;
 		m_sQueueSample.m_nLoopCount = 0;
 		m_sQueueSample.m_nEmittingVolume = emittingVol;
-		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+		SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 		m_sQueueSample.m_fSpeedMultiplier = 6.0f;
 		m_sQueueSample.m_fSoundIntensity = 140.0f;
-		m_sQueueSample.m_bReleasingSoundFlag = false;
+		m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 		m_sQueueSample.m_nReleasingVolumeDivider = 5;
-		m_sQueueSample.m_bReverbFlag = true;
-		m_sQueueSample.m_bRequireReflection = false;
+		m_sQueueSample.m_bReverbFlag = TRUE;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		AddSampleToRequestedQueue();
 	}
 
@@ -3696,18 +3691,17 @@ cAudioManager::ProcessCarHeli(cVehicleParams& params)
 					}
 					m_sQueueSample.m_nFrequency = freq;
 					m_sQueueSample.m_nCounter = 12;
-					m_sQueueSample.m_bIs2D = false;
+					m_sQueueSample.m_bIs2D = FALSE;
 					m_sQueueSample.m_nReleasingVolumeModificator = 1;
 					m_sQueueSample.m_nLoopCount = 0;
 					m_sQueueSample.m_nEmittingVolume = emittingVol;
-					m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-					m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+					SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 					m_sQueueSample.m_fSpeedMultiplier = 6.0f;
 					m_sQueueSample.m_fSoundIntensity = 30.0f;
-					m_sQueueSample.m_bReleasingSoundFlag = false;
+					m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 					m_sQueueSample.m_nReleasingVolumeDivider = 30;
-					m_sQueueSample.m_bReverbFlag = true;
-					m_sQueueSample.m_bRequireReflection = false;
+					m_sQueueSample.m_bReverbFlag = TRUE;
+					m_sQueueSample.m_bRequireReflection = FALSE;
 					AddSampleToRequestedQueue();
 				}
 			}
@@ -3732,18 +3726,17 @@ cAudioManager::ProcessCarHeli(cVehicleParams& params)
 				m_sQueueSample.m_nSampleIndex = SFX_SEAPLANE_PRO4;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 				m_sQueueSample.m_nCounter = 12;
-				m_sQueueSample.m_bIs2D = false;
+				m_sQueueSample.m_bIs2D = FALSE;
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_nEmittingVolume = propellerSpeed * 100.0f;
-				m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(SFX_SEAPLANE_PRO4);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(SFX_SEAPLANE_PRO4);
+				SET_LOOP_OFFSETS(SFX_SEAPLANE_PRO4)
 				m_sQueueSample.m_fSpeedMultiplier = 5.0f;
 				m_sQueueSample.m_fSoundIntensity = 20.0f;
-				m_sQueueSample.m_bReleasingSoundFlag = false;
+				m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 				m_sQueueSample.m_nReleasingVolumeDivider = 7;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
+				m_sQueueSample.m_bReverbFlag = TRUE;
+				m_sQueueSample.m_bRequireReflection = FALSE;
 				AddSampleToRequestedQueue();
 			}
 		}
@@ -3752,13 +3745,9 @@ cAudioManager::ProcessCarHeli(cVehicleParams& params)
 		vecPosOld = m_sQueueSample.m_vecPos;
 		distanceCalculatedOld = params.m_bDistanceCalculated;
 		distanceOld = params.m_fDistance;
-		
-		if (automobile != nil)
-			automobile->GetComponentWorldPosition(CAR_BOOT, m_sQueueSample.m_vecPos);
-		else if (params.m_VehicleType == VEHICLE_TYPE_HELI) 
-			m_sQueueSample.m_vecPos = CVector(0.0f, -10.0f, 0.0f); //this is from android, but for real it's not used
 
-		params.m_bDistanceCalculated = false;
+		m_sQueueSample.m_vecPos = backPropellerPos;
+		params.m_bDistanceCalculated = FALSE;
 		params.m_fDistance = GetDistanceSquared(m_sQueueSample.m_vecPos);
 		if (params.m_fDistance < SQR(27.0f)) {
 			CalculateDistance(params.m_bDistanceCalculated, params.m_fDistance);
@@ -3766,20 +3755,19 @@ cAudioManager::ProcessCarHeli(cVehicleParams& params)
 			if (m_sQueueSample.m_nVolume) {
 				m_sQueueSample.m_nCounter = 2;
 				m_sQueueSample.m_nSampleIndex = hunterBool ? SFX_HELI_APACHE_3 : SFX_CAR_HELI_REA;
-				m_sQueueSample.m_nBankIndex = 0;
-				m_sQueueSample.m_bIs2D = false;
+				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
+				m_sQueueSample.m_bIs2D = FALSE;
 				m_sQueueSample.m_nReleasingVolumeModificator = 1;
 				m_sQueueSample.m_nFrequency = (volumeModifier + 1.0f) * 16000;
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_nEmittingVolume = volumeModifier * 25.0f;
-				m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+				SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 				m_sQueueSample.m_fSpeedMultiplier = 6.0f;
 				m_sQueueSample.m_fSoundIntensity = 27.0f;
-				m_sQueueSample.m_bReleasingSoundFlag = false;
+				m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 				m_sQueueSample.m_nReleasingVolumeDivider = 5;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
+				m_sQueueSample.m_bReverbFlag = TRUE;
+				m_sQueueSample.m_bRequireReflection = FALSE;
 				AddSampleToRequestedQueue();
 			}
 		}
@@ -3797,7 +3785,7 @@ cAudioManager::ProcessVehicleFlatTyre(cVehicleParams& params)
 
 	CAutomobile* automobile;
 	CBike* bike;
-	bool wheelBurst;
+	bool8 wheelBurst;
 	uint8 emittingVol;
 
 	float modifier;
@@ -3808,19 +3796,19 @@ cAudioManager::ProcessVehicleFlatTyre(cVehicleParams& params)
 	switch (params.m_VehicleType) {
 	case VEHICLE_TYPE_CAR:
 		automobile = (CAutomobile*)params.m_pVehicle;
-		wheelBurst = false;
+		wheelBurst = FALSE;
 		for (int i = 0; i < 4; i++)
 			if (automobile->Damage.GetWheelStatus(i) == WHEEL_STATUS_BURST && automobile->m_aWheelTimer[i] > 0.0f)
-				wheelBurst = true;
+				wheelBurst = TRUE;
 		if (!wheelBurst)
 			return;
 		break;
 	case VEHICLE_TYPE_BIKE:
 		bike = (CBike*)params.m_pVehicle;
-		wheelBurst = false;
+		wheelBurst = FALSE;
 		for(int i = 0; i < 2; i++)
 			if (bike->m_wheelStatus[i] == WHEEL_STATUS_BURST && bike->m_aWheelTimer[i] > 0.0f)
-				wheelBurst = true;
+				wheelBurst = TRUE;
 		if (!wheelBurst)
 			return;
 		break;
@@ -3835,20 +3823,19 @@ cAudioManager::ProcessVehicleFlatTyre(cVehicleParams& params)
 		if (m_sQueueSample.m_nVolume) {
 			m_sQueueSample.m_nCounter = 95;
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nReleasingVolumeModificator = 5;
 			m_sQueueSample.m_nSampleIndex = SFX_TYRE_BURST_L;
 			m_sQueueSample.m_nFrequency = (5500.0f * modifier) + 8000;
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(SFX_TYRE_BURST_L);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(SFX_TYRE_BURST_L);
+			SET_LOOP_OFFSETS(SFX_TYRE_BURST_L)
 			m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 3;
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bReverbFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			AddSampleToRequestedQueue();
 		}
 	}
@@ -3987,12 +3974,12 @@ cAudioManager::ProcessJumboDecel(CPlane *plane)
 	}
 }
 
-bool
+bool8
 cAudioManager::SetupJumboTaxiSound(uint8 vol)
 {
 	const float SOUND_INTENSITY = 180.0f;
 	if (m_sQueueSample.m_fDistance >= SOUND_INTENSITY)
-		return false;
+		return FALSE;
 
 	uint8 emittingVol = (vol / 2) + ((vol / 2) * m_sQueueSample.m_fDistance / SOUND_INTENSITY);
 
@@ -4004,31 +3991,30 @@ cAudioManager::SetupJumboTaxiSound(uint8 vol)
 		m_sQueueSample.m_nCounter = 1;
 		m_sQueueSample.m_nSampleIndex = SFX_JUMBO_TAXI;
 		m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		m_sQueueSample.m_nReleasingVolumeModificator = 1;
 		m_sQueueSample.m_nFrequency = GetJumboTaxiFreq();
 		m_sQueueSample.m_nLoopCount = 0;
 		m_sQueueSample.m_nEmittingVolume = emittingVol;
-		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+		SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 		m_sQueueSample.m_fSpeedMultiplier = 4.0f;
 		m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-		m_sQueueSample.m_bReleasingSoundFlag = false;
+		m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 		m_sQueueSample.m_nReleasingVolumeDivider = 4;
-		m_sQueueSample.m_bReverbFlag = true;
-		m_sQueueSample.m_bRequireReflection = false;
+		m_sQueueSample.m_bReverbFlag = TRUE;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		AddSampleToRequestedQueue();
 	}
-	return true;
+	return TRUE;
 }
 
-bool
+bool8
 cAudioManager::SetupJumboWhineSound(uint8 emittingVol, uint32 freq)
 {
 	const float SOUND_INTENSITY = 170.0f;
 
 	if (m_sQueueSample.m_fDistance >= SOUND_INTENSITY)
-		return false;
+		return FALSE;
 
 	m_sQueueSample.m_nVolume = ComputeVolume(emittingVol, SOUND_INTENSITY, m_sQueueSample.m_fDistance);
 
@@ -4036,30 +4022,29 @@ cAudioManager::SetupJumboWhineSound(uint8 emittingVol, uint32 freq)
 		m_sQueueSample.m_nCounter = 2;
 		m_sQueueSample.m_nSampleIndex = SFX_JUMBO_WHINE;
 		m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		m_sQueueSample.m_nReleasingVolumeModificator = 1;
 		m_sQueueSample.m_nFrequency = freq;
 		m_sQueueSample.m_nLoopCount = 0;
 		m_sQueueSample.m_nEmittingVolume = emittingVol;
-		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+		SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 		m_sQueueSample.m_fSpeedMultiplier = 4.0f;
 		m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-		m_sQueueSample.m_bReleasingSoundFlag = false;
+		m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 		m_sQueueSample.m_nReleasingVolumeDivider = 4;
-		m_sQueueSample.m_bReverbFlag = true;
-		m_sQueueSample.m_bRequireReflection = false;
+		m_sQueueSample.m_bReverbFlag = TRUE;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		AddSampleToRequestedQueue();
 	}
-	return true;
+	return TRUE;
 }
 
-bool
+bool8
 cAudioManager::SetupJumboEngineSound(uint8 vol, uint32 freq)
 {
 	const float SOUND_INTENSITY = 180.0f;
 	if (m_sQueueSample.m_fDistance >= SOUND_INTENSITY)
-		return false;
+		return FALSE;
 
 	uint8 emittingVol = vol - gJumboVolOffsetPercentage / 100;
 	m_sQueueSample.m_nVolume = ComputeVolume(emittingVol, SOUND_INTENSITY, m_sQueueSample.m_fDistance);
@@ -4067,29 +4052,28 @@ cAudioManager::SetupJumboEngineSound(uint8 vol, uint32 freq)
 		m_sQueueSample.m_nCounter = 3;
 		m_sQueueSample.m_nSampleIndex = SFX_JUMBO_ENGINE;
 		m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		m_sQueueSample.m_nReleasingVolumeModificator = 1;
 		m_sQueueSample.m_nFrequency = freq;
 		m_sQueueSample.m_nLoopCount = 0;
 		m_sQueueSample.m_nEmittingVolume = emittingVol;
-		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+		SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 		m_sQueueSample.m_fSpeedMultiplier = 4.0f;
 		m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-		m_sQueueSample.m_bReleasingSoundFlag = false;
+		m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 		m_sQueueSample.m_nReleasingVolumeDivider = 4;
-		m_sQueueSample.m_bReverbFlag = true;
-		m_sQueueSample.m_bRequireReflection = false;
+		m_sQueueSample.m_bReverbFlag = TRUE;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		AddSampleToRequestedQueue();
 	}
-	return true;
+	return TRUE;
 }
 
-bool
+bool8
 cAudioManager::SetupJumboFlySound(uint8 emittingVol)
 {
 	const float SOUND_INTENSITY = 440.0f;
-	if(m_sQueueSample.m_fDistance >= SOUND_INTENSITY) return false;
+	if(m_sQueueSample.m_fDistance >= SOUND_INTENSITY) return FALSE;
 
 	int32 vol = ComputeVolume(emittingVol, SOUND_INTENSITY, m_sQueueSample.m_fDistance);
 	m_sQueueSample.m_nVolume = vol;
@@ -4097,30 +4081,29 @@ cAudioManager::SetupJumboFlySound(uint8 emittingVol)
 		m_sQueueSample.m_nCounter = 0;
 		m_sQueueSample.m_nSampleIndex = SFX_JUMBO_DIST_FLY;
 		m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		m_sQueueSample.m_nReleasingVolumeModificator = 1;
 		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_JUMBO_DIST_FLY);
 		m_sQueueSample.m_nLoopCount = 0;
 		m_sQueueSample.m_nEmittingVolume = emittingVol;
-		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+		SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 		m_sQueueSample.m_fSpeedMultiplier = 4.0f;
 		m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-		m_sQueueSample.m_bReleasingSoundFlag = false;
+		m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 		m_sQueueSample.m_nReleasingVolumeDivider = 5;
-		m_sQueueSample.m_bReverbFlag = true;
-		m_sQueueSample.m_bRequireReflection = false; // todo port fix to re3
+		m_sQueueSample.m_bReverbFlag = TRUE;
+		m_sQueueSample.m_bRequireReflection = FALSE; // todo port fix to re3
 		AddSampleToRequestedQueue();
 	}
-	return true;
+	return TRUE;
 }
 
-bool
+bool8
 cAudioManager::SetupJumboRumbleSound(uint8 emittingVol)
 {
 	const float SOUND_INTENSITY = 240.0f;
 	if (m_sQueueSample.m_fDistance >= SOUND_INTENSITY)
-		return false;
+		return FALSE;
 
 	m_sQueueSample.m_nVolume = ComputeVolume(emittingVol, SOUND_INTENSITY, m_sQueueSample.m_fDistance);
 
@@ -4128,20 +4111,19 @@ cAudioManager::SetupJumboRumbleSound(uint8 emittingVol)
 		m_sQueueSample.m_nCounter = 5;
 		m_sQueueSample.m_nSampleIndex = SFX_JUMBO_RUMBLE;
 		m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-		m_sQueueSample.m_bIs2D = true;
+		m_sQueueSample.m_bIs2D = TRUE;
 		m_sQueueSample.m_nReleasingVolumeModificator = 1;
 		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_JUMBO_RUMBLE);
 		m_sQueueSample.m_nLoopCount = 0;
 		m_sQueueSample.m_nEmittingVolume = emittingVol;
-		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+		SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 		m_sQueueSample.m_fSpeedMultiplier = 4.0f;
 		m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-		m_sQueueSample.m_bReleasingSoundFlag = false;
+		m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 		m_sQueueSample.m_nReleasingVolumeDivider = 12;
 		m_sQueueSample.m_nOffset = 0;
-		m_sQueueSample.m_bReverbFlag = true;
-		m_sQueueSample.m_bRequireReflection = false;
+		m_sQueueSample.m_bReverbFlag = TRUE;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		AddSampleToRequestedQueue();
 		m_sQueueSample.m_nCounter = 6;
 		m_sQueueSample.m_nSampleIndex = SFX_JUMBO_RUMBLE;
@@ -4149,7 +4131,7 @@ cAudioManager::SetupJumboRumbleSound(uint8 emittingVol)
 		m_sQueueSample.m_nOffset = MAX_VOLUME;
 		AddSampleToRequestedQueue();
 	}
-	return true;
+	return TRUE;
 }
 
 int32
@@ -4163,6 +4145,23 @@ cAudioManager::GetJumboTaxiFreq() const
 #pragma endregion All the vehicle audio code
 
 #pragma region PED AUDIO
+struct sToniReactions
+{
+	uint32 sfx[4];
+	uint32 count[4];
+};
+
+const sToniReactions aReactions[8] = {
+    {{SFX_TONI_PISSED_OFF_CRASH_01, SFX_TONI_ANGRY_CRASH_01, SFX_TONI_WISECRACKING_CRASH_01, NULL}, {25, 29, 17, 0}},
+    {{SFX_TONI_PISSED_OFF_FIGHT_01, SFX_TONI_ANGRY_FIGHT_01, SFX_TONI_WISECRACKING_FIGHT_01, NULL}, {18, 39, 20, 0}},
+    {{SFX_TONI_PISSED_OFF_JACKED_01, SFX_TONI_ANGRY_JACKED_01, SFX_TONI_WISECRACKING_JACKED_01, NULL}, {11, 16, 17, 0}},
+    {{SFX_TONI_PISSED_OFF_JACKING_01, SFX_TONI_ANGRY_JACKING_01, SFX_TONI_WISECRACKING_JACKING_01, NULL}, {25, 33, 12, 0}},
+    {{SFX_TONI_ANGRY_PICK_UP_HOOKER_01, SFX_TONI_ANGRY_PICK_UP_HOOKER_01, SFX_TONI_WISECRACKING_PICK_UP_HOOKER_01, NULL}, {8, 8, 11, 0}},
+    {{SFX_TONI_PISSED_OFF_PULL_GUN_01, SFX_TONI_ANGRY_PULL_GUN_01, SFX_TONI_WISECRACKING_PULL_GUN_01, NULL}, {18, 29, 19, 0}},
+    {{SFX_TONI_CALM_SEX_01, SFX_TONI_ANGRY_SEX_01, SFX_TONI_ANGRY_SEX_01, SFX_TONI_WISECRACKING_SEX_01}, {11, 10, 10, 10}},
+    {{SFX_TONI_CALM_SHOOT_01, SFX_TONI_PISSED_OFF_SHOOT_01, SFX_TONI_ANGRY_SHOOT_01, SFX_TONI_WISECRACKING_SHOOT_01}, {30, 31, 36, 26}}
+};
+
 void
 cAudioManager::ProcessPed(CPhysical *ped)
 {
@@ -4170,7 +4169,7 @@ cAudioManager::ProcessPed(CPhysical *ped)
 
 	m_sQueueSample.m_vecPos = ped->GetPosition();
 
-	params.m_bDistanceCalculated = false;
+	params.m_bDistanceCalculated = FALSE;
 	params.m_pPed = (CPed *)ped;
 	params.m_fDistance = GetDistanceSquared(m_sQueueSample.m_vecPos);
 	ProcessPedOneShots(params);
@@ -4184,9 +4183,9 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 
 	CPed *ped = params.m_pPed;
 
-	bool narrowSoundRange;
+	bool8 narrowSoundRange;
 	int16 sound;
-	bool stereo;
+	bool8 stereo;
 	CWeapon *weapon;
 	float maxDist = 0.f; // uninitialized variable
 
@@ -4195,9 +4194,9 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 
 	weapon = params.m_pPed->GetWeapon();
 	for (uint32 i = 0; i < m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_AudioEvents; i++) {
-		stereo = false;
-		narrowSoundRange = false;
-		m_sQueueSample.m_bRequireReflection = false;
+		stereo = FALSE;
+		narrowSoundRange = FALSE;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		sound = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i];
 		switch (sound) {
 		case SOUND_STEP_START:
@@ -4271,12 +4270,11 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 			m_sQueueSample.m_fSoundIntensity = 20.0f;
 			m_sQueueSample.m_nLoopCount = 1;
-			m_sQueueSample.m_nLoopStart = 0;
-			m_sQueueSample.m_nLoopEnd = -1;
+			RESET_LOOP_OFFSETS
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_bReleasingSoundFlag = true;
-			m_sQueueSample.m_bRequireReflection = true;
+			m_sQueueSample.m_bIs2D = FALSE;
+			m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = TRUE;
 			break;
 		case SOUND_FALL_LAND:
 		case SOUND_FALL_COLLAPSE:
@@ -4299,12 +4297,11 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 			m_sQueueSample.m_fSoundIntensity = 30.0f;
 			m_sQueueSample.m_nLoopCount = 1;
-			m_sQueueSample.m_nLoopStart = 0;
-			m_sQueueSample.m_nLoopEnd = -1;
+			RESET_LOOP_OFFSETS
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_bReleasingSoundFlag = true;
-			m_sQueueSample.m_bRequireReflection = true;
+			m_sQueueSample.m_bIs2D = FALSE;
+			m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = TRUE;
 			break;
 		case SOUND_FIGHT_37:
 			m_sQueueSample.m_nSampleIndex = SFX_FIGHT_1;
@@ -4390,20 +4387,19 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			}
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 			m_sQueueSample.m_nCounter = iSound;
-			narrowSoundRange = true;
+			narrowSoundRange = TRUE;
 			++iSound;
 			m_sQueueSample.m_nReleasingVolumeModificator = 3;
 			m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 			m_sQueueSample.m_fSoundIntensity = 30.0f;
 			maxDist = SQR(30);
 			m_sQueueSample.m_nLoopCount = 1;
-			m_sQueueSample.m_nLoopStart = 0;
+			RESET_LOOP_OFFSETS
 			emittingVol = m_anRandomTable[3] % 26 + 100;
-			m_sQueueSample.m_nLoopEnd = -1;
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_bReleasingSoundFlag = true;
-			m_sQueueSample.m_bRequireReflection = true;
+			m_sQueueSample.m_bIs2D = FALSE;
+			m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = TRUE;
 			break;
 		case SOUND_WEAPON_BAT_ATTACK:
 		case SOUND_WEAPON_KNIFE_ATTACK:
@@ -4436,7 +4432,7 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 					m_sQueueSample.m_nSampleIndex = SFX_BAT_HIT_LEFT;
 					m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 					m_sQueueSample.m_nFrequency = RandomDisplacement(2000) + 22000;
-					stereo = true;
+					stereo = TRUE;
 					break;
 				}
 			}
@@ -4447,26 +4443,29 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
 			}
 			m_sQueueSample.m_nCounter = iSound++;
-			narrowSoundRange = true;
+			narrowSoundRange = TRUE;
 			m_sQueueSample.m_nReleasingVolumeModificator = 3;
 			m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 			m_sQueueSample.m_fSoundIntensity = 30.0f;
 			maxDist = SQR(30);
 			m_sQueueSample.m_nLoopCount = 1;
-			m_sQueueSample.m_nLoopStart = 0;
-			m_sQueueSample.m_nLoopEnd = -1;
+			RESET_LOOP_OFFSETS
 			emittingVol = m_anRandomTable[2] % 20 + 100;
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_bReleasingSoundFlag = true;
-			m_sQueueSample.m_bRequireReflection = true;
+			m_sQueueSample.m_bIs2D = FALSE;
+			m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = TRUE;
 			break;
 		}
-		case SOUND_WEAPON_CHAINSAW_ATTACK:
+		case SOUND_WEAPON_CHAINSAW_IDLE:
 			if (FindVehicleOfPlayer())
 				continue;
-			m_sQueueSample.m_nSampleIndex = SFX_CAR_ACCEL_13;
-			m_sQueueSample.m_nBankIndex = SFX_BANK_0; // SFX_BANK_CAR_CHAINSAW
+			m_sQueueSample.m_nSampleIndex = SFX_CAR_CHAINSAW_IDLE;
+#ifdef GTA_PS2
+			m_sQueueSample.m_nBankIndex = SFX_BANK_CAR_CHAINSAW;
+#else
+			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
+#endif
 			m_sQueueSample.m_nCounter = 70;
 			m_sQueueSample.m_nFrequency = 27000;
 			m_sQueueSample.m_nReleasingVolumeModificator = 3;
@@ -4475,18 +4474,21 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			maxDist = SQR(50);
 			m_sQueueSample.m_nLoopCount = 0;
 			emittingVol = 100;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(SFX_CAR_ACCEL_13);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(SFX_CAR_ACCEL_13);
+			SET_LOOP_OFFSETS(SFX_CAR_CHAINSAW_IDLE)
 			m_sQueueSample.m_nEmittingVolume = 100;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bIs2D = FALSE;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 5;
 			break;
-		case SOUND_WEAPON_CHAINSAW_IDLE:
+		case SOUND_WEAPON_CHAINSAW_ATTACK:
 			if (FindVehicleOfPlayer())
 				continue;
-			m_sQueueSample.m_nSampleIndex = SFX_CAR_AFTER_ACCEL_13;
-			m_sQueueSample.m_nBankIndex = SFX_BANK_0; // SFX_BANK_CAR_CHAINSAW
+			m_sQueueSample.m_nSampleIndex = SFX_CAR_CHAINSAW_ATTACK;
+#ifdef GTA_PS2
+			m_sQueueSample.m_nBankIndex = SFX_BANK_CAR_CHAINSAW;
+#else
+			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
+#endif
 			m_sQueueSample.m_nCounter = 68;
 			m_sQueueSample.m_nFrequency = 27000;
 			m_sQueueSample.m_nReleasingVolumeModificator = 2;
@@ -4495,11 +4497,10 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			maxDist = SQR(60);
 			m_sQueueSample.m_nLoopCount = 0;
 			emittingVol = 100;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(SFX_CAR_AFTER_ACCEL_13);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(SFX_CAR_AFTER_ACCEL_13);
+			SET_LOOP_OFFSETS(SFX_CAR_CHAINSAW_ATTACK)
 			m_sQueueSample.m_nEmittingVolume = 100;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bIs2D = FALSE;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 5;
 			break;
 		case SOUND_WEAPON_CHAINSAW_MADECONTACT:
@@ -4507,8 +4508,12 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 				continue;
 			if ((int32)m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i] != ENTITY_TYPE_PED)
 				ReportCollision(params.m_pPed, params.m_pPed, SURFACE_CAR, SURFACE_TARMAC, 0.0f, 0.09f);
-			m_sQueueSample.m_nSampleIndex = SFX_CAR_AFTER_ACCEL_13;
-			m_sQueueSample.m_nBankIndex = SFX_BANK_0; // SFX_BANK_CAR_CHAINSAW
+			m_sQueueSample.m_nSampleIndex = SFX_CAR_CHAINSAW_ATTACK;
+#ifdef GTA_PS2
+			m_sQueueSample.m_nBankIndex = SFX_BANK_CAR_CHAINSAW;
+#else
+			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
+#endif
 			m_sQueueSample.m_nCounter = 68;
 			m_sQueueSample.m_nFrequency = RandomDisplacement(500) + 22000;
 			m_sQueueSample.m_nReleasingVolumeModificator = 2;
@@ -4517,11 +4522,10 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			maxDist = SQR(60);
 			m_sQueueSample.m_nLoopCount = 0;
 			emittingVol = 100;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(SFX_CAR_AFTER_ACCEL_13);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(SFX_CAR_AFTER_ACCEL_13);
+			SET_LOOP_OFFSETS(SFX_CAR_CHAINSAW_ATTACK)
 			m_sQueueSample.m_nEmittingVolume = 100;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bIs2D = FALSE;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 5;
 			break;
 		case SOUND_WEAPON_SHOT_FIRED:
@@ -4534,7 +4538,7 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 				m_sQueueSample.m_nSampleIndex = SFX_ROCKET_LEFT;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 				m_sQueueSample.m_nCounter = iSound++;
-				narrowSoundRange = true;
+				narrowSoundRange = TRUE;
 				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_ROCKET_LEFT);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 32);
 				m_sQueueSample.m_nReleasingVolumeModificator = 1;
@@ -4542,20 +4546,19 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 				m_sQueueSample.m_fSoundIntensity = 120.0f;
 				maxDist = SQR(120);
 				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_nLoopStart = 0;
-				m_sQueueSample.m_nLoopEnd = -1;
+				RESET_LOOP_OFFSETS
 				emittingVol = m_anRandomTable[0] % 20 + 80;
 				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				m_sQueueSample.m_bRequireReflection = true;
-				stereo = true;
+				m_sQueueSample.m_bIs2D = FALSE;
+				m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+				m_sQueueSample.m_bRequireReflection = TRUE;
+				stereo = TRUE;
 				break;
 			case WEAPONTYPE_COLT45:
 				m_sQueueSample.m_nSampleIndex = SFX_COLT45_LEFT;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 				m_sQueueSample.m_nCounter = iSound++;
-				narrowSoundRange = true;
+				narrowSoundRange = TRUE;
 				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_COLT45_LEFT);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 32);
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
@@ -4563,20 +4566,19 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 				m_sQueueSample.m_fSoundIntensity = 120.0f;
 				maxDist = SQR(120);
 				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_nLoopStart = 0;
-				m_sQueueSample.m_nLoopEnd = -1;
+				RESET_LOOP_OFFSETS
 				emittingVol = m_anRandomTable[1] % 10 + 90;
 				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				m_sQueueSample.m_bRequireReflection = true;
-				stereo = true;
+				m_sQueueSample.m_bIs2D = FALSE;
+				m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+				m_sQueueSample.m_bRequireReflection = TRUE;
+				stereo = TRUE;
 				break;
 			case WEAPONTYPE_PYTHON:
 				m_sQueueSample.m_nSampleIndex = SFX_PYTHON_LEFT;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 				m_sQueueSample.m_nCounter = iSound++;
-				narrowSoundRange = true;
+				narrowSoundRange = TRUE;
 				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_PYTHON_LEFT);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 32);
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
@@ -4584,21 +4586,20 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 				m_sQueueSample.m_fSoundIntensity = 120.0f;
 				maxDist = SQR(120);
 				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_nLoopStart = 0;
-				m_sQueueSample.m_nLoopEnd = -1;
+				RESET_LOOP_OFFSETS
 				emittingVol = 127;
 				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				m_sQueueSample.m_bRequireReflection = true;
-				stereo = true;
+				m_sQueueSample.m_bIs2D = FALSE;
+				m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+				m_sQueueSample.m_bRequireReflection = TRUE;
+				stereo = TRUE;
 				break;
 			case WEAPONTYPE_SHOTGUN:
 			case WEAPONTYPE_STUBBY_SHOTGUN:
 				m_sQueueSample.m_nSampleIndex = SFX_SHOTGUN_LEFT;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 				m_sQueueSample.m_nCounter = iSound++;
-				narrowSoundRange = true;
+				narrowSoundRange = TRUE;
 				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_SHOTGUN_LEFT);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 32);
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
@@ -4606,20 +4607,19 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 				m_sQueueSample.m_fSoundIntensity = 120.0f;
 				maxDist = SQR(120);
 				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_nLoopStart = 0;
-				m_sQueueSample.m_nLoopEnd = -1;
+				RESET_LOOP_OFFSETS
 				emittingVol = m_anRandomTable[2] % 10 + 100;
 				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				m_sQueueSample.m_bRequireReflection = true;
-				stereo = true;
+				m_sQueueSample.m_bIs2D = FALSE;
+				m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+				m_sQueueSample.m_bRequireReflection = TRUE;
+				stereo = TRUE;
 				break;
 			case WEAPONTYPE_SPAS12_SHOTGUN:
 				m_sQueueSample.m_nSampleIndex = SFX_SPAS12_LEFT;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 				m_sQueueSample.m_nCounter = iSound++;
-				narrowSoundRange = true;
+				narrowSoundRange = TRUE;
 				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_SPAS12_LEFT);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 32);
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
@@ -4627,40 +4627,38 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 				m_sQueueSample.m_fSoundIntensity = 120.0f;
 				maxDist = SQR(120);
 				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_nLoopStart = 0;
-				m_sQueueSample.m_nLoopEnd = -1;
+				RESET_LOOP_OFFSETS
 				emittingVol = m_anRandomTable[2] % 10 + 100;
 				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				m_sQueueSample.m_bRequireReflection = true;
-				stereo = true;
+				m_sQueueSample.m_bIs2D = FALSE;
+				m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+				m_sQueueSample.m_bRequireReflection = TRUE;
+				stereo = TRUE;
 				break;
 			case WEAPONTYPE_TEC9:
 				m_sQueueSample.m_nSampleIndex = SFX_TEC_LEFT;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 				m_sQueueSample.m_nCounter = iSound++;
-				narrowSoundRange = true;
+				narrowSoundRange = TRUE;
 				m_sQueueSample.m_nFrequency = RandomDisplacement(500) + 17000;
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
 				m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 				m_sQueueSample.m_fSoundIntensity = 120.0f;
 				maxDist = SQR(120);
 				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_nLoopStart = 0;
+				RESET_LOOP_OFFSETS
 				emittingVol = m_anRandomTable[3] % 15 + 70;
-				m_sQueueSample.m_nLoopEnd = -1;
 				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				stereo = true;
+				m_sQueueSample.m_bIs2D = FALSE;
+				m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+				stereo = TRUE;
 				break;
 			case WEAPONTYPE_UZI:
 			case WEAPONTYPE_MINIGUN:
 				m_sQueueSample.m_nSampleIndex = SFX_UZI_LEFT;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 				m_sQueueSample.m_nCounter = iSound++;
-				narrowSoundRange = true;
+				narrowSoundRange = TRUE;
 				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_UZI_LEFT);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 32);
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
@@ -4668,38 +4666,36 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 				m_sQueueSample.m_fSoundIntensity = 120.0f;
 				maxDist = SQR(120);
 				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_nLoopStart = 0;
+				RESET_LOOP_OFFSETS
 				emittingVol = m_anRandomTable[3] % 15 + 70;
-				m_sQueueSample.m_nLoopEnd = -1;
 				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				stereo = true;
+				m_sQueueSample.m_bIs2D = FALSE;
+				m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+				stereo = TRUE;
 				break;
 			case WEAPONTYPE_SILENCED_INGRAM:
 				m_sQueueSample.m_nSampleIndex = SFX_TEC_LEFT;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 				m_sQueueSample.m_nCounter = iSound++;
-				narrowSoundRange = true;
+				narrowSoundRange = TRUE;
 				m_sQueueSample.m_nFrequency = RandomDisplacement(1000) + 34000;
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
 				m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 				m_sQueueSample.m_fSoundIntensity = 120.0f;
 				maxDist = SQR(120);
 				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_nLoopStart = 0;
+				RESET_LOOP_OFFSETS
 				emittingVol = m_anRandomTable[3] % 15 + 70;
-				m_sQueueSample.m_nLoopEnd = -1;
 				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				stereo = true;
+				m_sQueueSample.m_bIs2D = FALSE;
+				m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+				stereo = TRUE;
 				break;
 			case WEAPONTYPE_MP5:
 				m_sQueueSample.m_nSampleIndex = SFX_MP5_LEFT;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 				m_sQueueSample.m_nCounter = iSound++;
-				narrowSoundRange = true;
+				narrowSoundRange = TRUE;
 				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_MP5_LEFT);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 32);
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
@@ -4707,38 +4703,36 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 				m_sQueueSample.m_fSoundIntensity = 120.0f;
 				maxDist = SQR(120);
 				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_nLoopStart = 0;
+				RESET_LOOP_OFFSETS
 				emittingVol = m_anRandomTable[3] % 15 + 70;
-				m_sQueueSample.m_nLoopEnd = -1;
 				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				stereo = true;
+				m_sQueueSample.m_bIs2D = FALSE;
+				m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+				stereo = TRUE;
 				break;
 			case WEAPONTYPE_M4:
 				m_sQueueSample.m_nSampleIndex = SFX_RUGER_LEFT;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 				m_sQueueSample.m_nCounter = iSound++;
-				narrowSoundRange = true;
+				narrowSoundRange = TRUE;
 				m_sQueueSample.m_nFrequency = RandomDisplacement(1000) + 43150;
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
 				m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 				m_sQueueSample.m_fSoundIntensity = 120.0f;
 				maxDist = SQR(120);
 				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_nLoopStart = 0;
+				RESET_LOOP_OFFSETS
 				emittingVol = m_anRandomTable[3] % 15 + 90;
-				m_sQueueSample.m_nLoopEnd = -1;
 				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				stereo = true;
+				m_sQueueSample.m_bIs2D = FALSE;
+				m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+				stereo = TRUE;
 				break;
 			case WEAPONTYPE_RUGER:
 				m_sQueueSample.m_nSampleIndex = SFX_RUGER_LEFT;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 				m_sQueueSample.m_nCounter = iSound++;
-				narrowSoundRange = true;
+				narrowSoundRange = TRUE;
 				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RUGER_LEFT);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 32);
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
@@ -4746,20 +4740,19 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 				m_sQueueSample.m_fSoundIntensity = 120.0f;
 				maxDist = SQR(120);
 				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_nLoopStart = 0;
+				RESET_LOOP_OFFSETS
 				emittingVol = m_anRandomTable[3] % 15 + 90;
-				m_sQueueSample.m_nLoopEnd = -1;
 				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				stereo = true;
+				m_sQueueSample.m_bIs2D = FALSE;
+				m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+				stereo = TRUE;
 				break;
 			case WEAPONTYPE_SNIPERRIFLE:
 			case WEAPONTYPE_LASERSCOPE:
 				m_sQueueSample.m_nSampleIndex = SFX_SNIPER_LEFT;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 				m_sQueueSample.m_nCounter = iSound++;
-				narrowSoundRange = true;
+				narrowSoundRange = TRUE;
 				if (weapon->m_eWeaponType == WEAPONTYPE_SNIPERRIFLE)
 					m_sQueueSample.m_nFrequency = 25472;
 				else
@@ -4770,14 +4763,13 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 				m_sQueueSample.m_fSoundIntensity = 120.0f;
 				maxDist = SQR(120);
 				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_nLoopStart = 0;
-				m_sQueueSample.m_nLoopEnd = -1;
+				RESET_LOOP_OFFSETS
 				emittingVol = m_anRandomTable[4] % 10 + 110;
 				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				m_sQueueSample.m_bRequireReflection = true;
-				stereo = true;
+				m_sQueueSample.m_bIs2D = FALSE;
+				m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+				m_sQueueSample.m_bRequireReflection = TRUE;
+				stereo = TRUE;
 				break;
 			case WEAPONTYPE_FLAMETHROWER:
 				m_sQueueSample.m_nSampleIndex = SFX_FLAMETHROWER_LEFT;
@@ -4790,20 +4782,19 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 				m_sQueueSample.m_fSoundIntensity = 60.0f;
 				maxDist = SQR(60);
 				m_sQueueSample.m_nLoopCount = 0;
-				m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+				SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 				m_sQueueSample.m_nEmittingVolume = 90;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_bReleasingSoundFlag = false;
+				m_sQueueSample.m_bIs2D = FALSE;
+				m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 				m_sQueueSample.m_nReleasingVolumeDivider = 6;
-				stereo = true;
+				stereo = TRUE;
 				break;
 			case WEAPONTYPE_M60:
 			case WEAPONTYPE_HELICANNON:
 				m_sQueueSample.m_nSampleIndex = SFX_M60_LEFT;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 				m_sQueueSample.m_nCounter = iSound++;
-				narrowSoundRange = true;
+				narrowSoundRange = TRUE;
 				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_M60_LEFT);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 32);
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
@@ -4811,13 +4802,12 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 				m_sQueueSample.m_fSoundIntensity = 120.0f;
 				maxDist = SQR(120);
 				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_nLoopStart = 0;
-				m_sQueueSample.m_nLoopEnd = -1;
+				RESET_LOOP_OFFSETS
 				emittingVol = 127;
 				m_sQueueSample.m_nEmittingVolume = 127;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				stereo = true;
+				m_sQueueSample.m_bIs2D = FALSE;
+				m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+				stereo = TRUE;
 				break;
 			default:
 				continue;
@@ -4862,7 +4852,7 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			}
 			emittingVol = 75;
 			m_sQueueSample.m_nCounter = iSound++;
-			narrowSoundRange = true;
+			narrowSoundRange = TRUE;
 			m_sQueueSample.m_nFrequency += RandomDisplacement(300);
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 			m_sQueueSample.m_nReleasingVolumeModificator = 5;
@@ -4870,12 +4860,11 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			m_sQueueSample.m_fSoundIntensity = 30.0f;
 			maxDist = SQR(30);
 			m_sQueueSample.m_nLoopCount = 1;
-			m_sQueueSample.m_nLoopStart = 0;
-			m_sQueueSample.m_nLoopEnd = -1;
+			RESET_LOOP_OFFSETS
 			m_sQueueSample.m_nEmittingVolume = 75;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_bReleasingSoundFlag = true;
-			m_sQueueSample.m_bRequireReflection = true;
+			m_sQueueSample.m_bIs2D = FALSE;
+			m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = TRUE;
 			break;
 		case SOUND_WEAPON_AK47_BULLET_ECHO:
 		{
@@ -4900,14 +4889,14 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 				break;
 			case WEAPONTYPE_M60:
 			case WEAPONTYPE_HELICANNON:
-				m_sQueueSample.m_nSampleIndex = SFX_M60_TAIL_LEFT;
+				//m_sQueueSample.m_nSampleIndex = SFX_M60_TAIL_LEFT;
 				break;
 			default:
 				continue;
 			}
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 			m_sQueueSample.m_nCounter = iSound++;
-			narrowSoundRange = true;
+			narrowSoundRange = TRUE;
 			switch (weaponType) {
 			case WEAPONTYPE_TEC9:
 				m_sQueueSample.m_nFrequency = 13000;
@@ -4934,13 +4923,12 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			m_sQueueSample.m_fSoundIntensity = 120.0f;
 			maxDist = SQR(120);
 			m_sQueueSample.m_nLoopCount = 1;
-			m_sQueueSample.m_nLoopStart = 0;
-			m_sQueueSample.m_nLoopEnd = -1;
+			RESET_LOOP_OFFSETS
 			emittingVol = m_anRandomTable[4] % 10 + 80;
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_bReleasingSoundFlag = true;
-			m_sQueueSample.m_bRequireReflection = true;
+			m_sQueueSample.m_bIs2D = FALSE;
+			m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = TRUE;
 			break;
 		}
 		case SOUND_WEAPON_FLAMETHROWER_FIRE:
@@ -4954,18 +4942,17 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			m_sQueueSample.m_fSoundIntensity = 60.0f;
 			maxDist = SQR(60);
 			m_sQueueSample.m_nLoopCount = 1;
-			m_sQueueSample.m_nLoopStart = 0;
-			m_sQueueSample.m_nLoopEnd = -1;
+			RESET_LOOP_OFFSETS
 			emittingVol = 70;
 			m_sQueueSample.m_nEmittingVolume = 70;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_bReleasingSoundFlag = true;
+			m_sQueueSample.m_bIs2D = FALSE;
+			m_sQueueSample.m_bReleasingSoundFlag = TRUE;
 			break;
 		case SOUND_WEAPON_HIT_PED:
 			m_sQueueSample.m_nSampleIndex = SFX_BULLET_PED;
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 			m_sQueueSample.m_nCounter = iSound++;
-			narrowSoundRange = true;
+			narrowSoundRange = TRUE;
 			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_BULLET_PED);
 			m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 8);
 			m_sQueueSample.m_nReleasingVolumeModificator = 7;
@@ -4973,12 +4960,11 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			m_sQueueSample.m_fSoundIntensity = 30.0f;
 			maxDist = SQR(30);
 			m_sQueueSample.m_nLoopCount = 1;
-			m_sQueueSample.m_nLoopStart = 0;
+			RESET_LOOP_OFFSETS
 			emittingVol = m_anRandomTable[0] % 20 + 90;
-			m_sQueueSample.m_nLoopEnd = -1;
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_bReleasingSoundFlag = true;
+			m_sQueueSample.m_bIs2D = FALSE;
+			m_sQueueSample.m_bReleasingSoundFlag = TRUE;
 			break;
 		case SOUND_SPLASH:
 			if (m_FrameCounter <= iSplashFrame)
@@ -4987,20 +4973,19 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			m_sQueueSample.m_nSampleIndex = SFX_SPLASH_1;
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 			m_sQueueSample.m_nCounter = iSound++;
-			narrowSoundRange = true;
+			narrowSoundRange = TRUE;
 			m_sQueueSample.m_nFrequency = RandomDisplacement(1400) + 20000;
 			m_sQueueSample.m_nReleasingVolumeModificator = 1;
 			m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 			m_sQueueSample.m_fSoundIntensity = 40.0f;
 			maxDist = SQR(40);
 			m_sQueueSample.m_nLoopCount = 1;
-			m_sQueueSample.m_nLoopStart = 0;
+			RESET_LOOP_OFFSETS
 			emittingVol = m_anRandomTable[2] % 30 + 70;
-			m_sQueueSample.m_nLoopEnd = -1;
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_bReleasingSoundFlag = true;
-			m_sQueueSample.m_bRequireReflection = true;
+			m_sQueueSample.m_bIs2D = FALSE;
+			m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = TRUE;
 			break;
 		case SOUND_MELEE_ATTACK_START:
 		{
@@ -5020,7 +5005,7 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			}
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 			m_sQueueSample.m_nCounter = iSound++;
-			narrowSoundRange = true;
+			narrowSoundRange = TRUE;
 			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
 			m_sQueueSample.m_nReleasingVolumeModificator = 3;
@@ -5032,12 +5017,11 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 				emittingVol = m_anRandomTable[2] % 20 + 70;
 			maxDist = SQR(30);
 			m_sQueueSample.m_nLoopCount = 1;
-			m_sQueueSample.m_nLoopStart = 0;
-			m_sQueueSample.m_nLoopEnd = -1;
+			RESET_LOOP_OFFSETS
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_bReleasingSoundFlag = true;
-			m_sQueueSample.m_bRequireReflection = true;
+			m_sQueueSample.m_bIs2D = FALSE;
+			m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = TRUE;
 			break;
 		}
 		case SOUND_SKATING:
@@ -5048,7 +5032,7 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			m_sQueueSample.m_nSampleIndex = (m_anRandomTable[3] & 1) + SFX_SKATE_1;
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 			m_sQueueSample.m_nCounter = iSound;
-			stereo = true;
+			stereo = TRUE;
 			++iSound;
 			m_sQueueSample.m_nFrequency = m_anRandomTable[1] % 1000 + 17000;
 			if (param2 == 0)
@@ -5058,13 +5042,12 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			m_sQueueSample.m_fSoundIntensity = 20.0f;
 			maxDist = SQR(20);
 			m_sQueueSample.m_nLoopCount = 1;
-			m_sQueueSample.m_nLoopStart = 0;
-			m_sQueueSample.m_nLoopEnd = -1;
+			RESET_LOOP_OFFSETS
 			emittingVol = (m_anRandomTable[2] % 20 + 70) * param1 / 127;
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_bReleasingSoundFlag = true;
-			m_sQueueSample.m_bRequireReflection = true;
+			m_sQueueSample.m_bIs2D = FALSE;
+			m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = TRUE;
 			break;
 		}
 		case SOUND_WEAPON_MINIGUN_ATTACK:
@@ -5078,11 +5061,10 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			emittingVol = 127;
 			maxDist = SQR(150);
 			m_sQueueSample.m_nLoopCount = 0;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(SFX_MINIGUN_FIRE_LEFT);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(SFX_MINIGUN_FIRE_LEFT);
+			SET_LOOP_OFFSETS(SFX_MINIGUN_FIRE_LEFT)
 			m_sQueueSample.m_nEmittingVolume = 127;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bIs2D = FALSE;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 3;
 			break;
 		case SOUND_WEAPON_MINIGUN_2:
@@ -5096,11 +5078,10 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			emittingVol = 127.0f * m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i];
 			maxDist = SQR(150);
 			m_sQueueSample.m_nLoopCount = 0;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(SFX_MINIGUN_FIRE_RIGHT);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(SFX_MINIGUN_FIRE_RIGHT);
+			SET_LOOP_OFFSETS(SFX_MINIGUN_FIRE_RIGHT)
 			m_sQueueSample.m_nEmittingVolume = emittingVol;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bIs2D = FALSE;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 3;
 			break;
 		case SOUND_WEAPON_MINIGUN_3:
@@ -5113,13 +5094,12 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			m_sQueueSample.m_fSoundIntensity = 150.0f;
 			maxDist = SQR(150);
 			m_sQueueSample.m_nLoopCount = 1;
-			m_sQueueSample.m_nLoopStart = 0;
-			m_sQueueSample.m_nLoopEnd = -1;
+			RESET_LOOP_OFFSETS
 			emittingVol = 127;
 			m_sQueueSample.m_nEmittingVolume = 127;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_bReleasingSoundFlag = true;
-			m_sQueueSample.m_bRequireReflection = true;
+			m_sQueueSample.m_bIs2D = FALSE;
+			m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+			m_sQueueSample.m_bRequireReflection = TRUE;
 			break;
 		case SOUND_SHIRT_WIND_FLAP:
 			if (params.m_pPed->IsPlayer() && params.m_pPed->m_pMyVehicle) {
@@ -5157,11 +5137,10 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 					m_sQueueSample.m_fSoundIntensity = 15.0f;
 					maxDist = SQR(15);
 					m_sQueueSample.m_nLoopCount = 0;
-					m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-					m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+					SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 					m_sQueueSample.m_nEmittingVolume = emittingVol;
-					m_sQueueSample.m_bIs2D = false;
-					m_sQueueSample.m_bReleasingSoundFlag = false;
+					m_sQueueSample.m_bIs2D = FALSE;
+					m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 					m_sQueueSample.m_nReleasingVolumeDivider = 3;
 				}
 			}
@@ -5179,13 +5158,13 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 			if (m_sQueueSample.m_nVolume != 0) {
 				if (stereo) {
 					if (m_sQueueSample.m_fDistance < 0.2f * m_sQueueSample.m_fSoundIntensity) {
-						m_sQueueSample.m_bIs2D = true;
+						m_sQueueSample.m_bIs2D = TRUE;
 						m_sQueueSample.m_nOffset = 0;
 					} else {
-						stereo = false;
+						stereo = FALSE;
 					}
 				}
-				m_sQueueSample.m_bReverbFlag = true;
+				m_sQueueSample.m_bReverbFlag = TRUE;
 				AddSampleToRequestedQueue();
 				if (stereo) {
 					m_sQueueSample.m_nOffset = 127;
@@ -5206,7 +5185,7 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
 }
 
 void
-cAudioManager::SetPedTalkingStatus(CPed *ped, uint8 status)
+cAudioManager::SetPedTalkingStatus(CPed *ped, bool8 status)
 {
 	if (ped != nil)
 		ped->m_canTalk = status;
@@ -5234,32 +5213,28 @@ cAudioManager::SetupPedComments(cPedParams &params, uint16 sound)
 
 	if(ped != nil) {
 		if(!ped->m_canTalk) return;
-		m_bGenericSfx = false;
+		m_bGenericSfx = FALSE;
 		pedComment.m_nSampleIndex = GetPedCommentSfx(ped, sound);
 		if(pedComment.m_nSampleIndex == NO_SAMPLE) return;
 		soundIntensity = 40.0f;
 	} else {
-		m_bGenericSfx = true;
+		m_bGenericSfx = TRUE;
 		switch(sound) {
 		case SOUND_PED_HELI_PLAYER_FOUND:
 			soundIntensity = 400.0f;
-			pedComment.m_nSampleIndex = GetRandomNumberInRange(m_sQueueSample.m_nEntityIndex % 4, SFX_POLICE_HELI_1, SFX_POLICE_HELI_20);
+			pedComment.m_nSampleIndex = NO_SAMPLE; //GetRandomNumberInRange(m_sQueueSample.m_nEntityIndex % 4, SFX_POLICE_HELI_1, SFX_POLICE_HELI_20);
 			break;
 		case SOUND_PED_VCPA_PLAYER_FOUND:
 			soundIntensity = 400.0f;
-#ifdef FIX_BUGS
-			pedComment.m_nSampleIndex = m_anRandomTable[m_sQueueSample.m_nEntityIndex % 4] % 23 + SFX_POLICE_BOAT_1;
-#else
-			pedComment.m_nSampleIndex = m_anRandomTable[m_sQueueSample.m_nEntityIndex % 4] % 29 + SFX_POLICE_BOAT_1;
-#endif
+			pedComment.m_nSampleIndex = NO_SAMPLE; //m_anRandomTable[m_sQueueSample.m_nEntityIndex % 4] % 23 + SFX_POLICE_BOAT_1;
 			break;
 		case SOUND_INJURED_PED_MALE_OUCH:
 			soundIntensity = 40.0f;
-			pedComment.m_nSampleIndex = GetRandomNumberInRange(m_sQueueSample.m_nEntityIndex % 4, SFX_GENERIC_MALE_GRUNT_1, SFX_GENERIC_MALE_GRUNT_41);
+			pedComment.m_nSampleIndex = NO_SAMPLE; // = GetRandomNumberInRange(m_sQueueSample.m_nEntityIndex % 4, SFX_GENERIC_MALE_GRUNT_1, SFX_GENERIC_MALE_GRUNT_41);
 			break;
 		case SOUND_INJURED_PED_FEMALE:
 			soundIntensity = 40.0f;
-			pedComment.m_nSampleIndex = GetRandomNumberInRange(m_sQueueSample.m_nEntityIndex % 4, SFX_GENERIC_FEMALE_GRUNT_1, SFX_GENERIC_FEMALE_GRUNT_33);
+			pedComment.m_nSampleIndex = NO_SAMPLE; // = GetRandomNumberInRange(m_sQueueSample.m_nEntityIndex % 4, SFX_GENERIC_FEMALE_GRUNT_1, SFX_GENERIC_FEMALE_GRUNT_33);
 			break;
 		default:
 			return;
@@ -5287,7 +5262,7 @@ cAudioManager::SetupPedComments(cPedParams &params, uint16 sound)
 uint32
 cAudioManager::GetPedCommentSfx(CPed *ped, int32 sound)
 {
-	if(ped->m_nPedState != PED_FALL || sound == MI_VICE8 || sound == MI_WFYG1 || sound == MI_WFYG2) {
+	if(ped->m_nPedState != PED_FALL || sound == SOUND_PED_DAMAGE || sound == SOUND_PED_HIT || sound == SOUND_PED_LAND) {
 		if(ped->m_getUpTimer == UINT32_MAX || ped->m_getUpTimer > CTimer::GetTimeInMilliseconds()) {
 			if(sound != SOUND_PED_DAMAGE && sound != SOUND_PED_HIT && sound != SOUND_PED_LAND) return NO_SAMPLE;
 		}
@@ -5398,9 +5373,9 @@ cAudioManager::GetPedCommentSfx(CPed *ped, int32 sound)
 		case MI_VICE5:
 		case MI_VICE6:
 		case MI_VICE7:
-		case MI_VICE8: return GetVICETalkSfx(ped, sound, ped->GetModelIndex());
-		case MI_WFYG1: return GetWFYG1TalkSfx(ped, sound);
-		case MI_WFYG2: return GetWFYG2TalkSfx(ped, sound);
+		case MI_VICE8:// return GetVICETalkSfx(ped, sound, ped->GetModelIndex());
+		case MI_WFYG1:// return GetWFYG1TalkSfx(ped, sound);
+		case MI_WFYG2:// return GetWFYG2TalkSfx(ped, sound);
 		case MI_SPECIAL01:
 		case MI_SPECIAL02:
 		case MI_SPECIAL03:
@@ -5432,6 +5407,11 @@ cAudioManager::GetPedCommentSfx(CPed *ped, int32 sound)
 void
 cAudioManager::GetPhrase(uint32 &phrase, uint32 &prevPhrase, uint32 sample, uint32 maxOffset) const
 {
+	if (maxOffset == 0) {
+		phrase = prevPhrase = NO_SAMPLE;
+		return;
+	}
+
 	phrase = sample + m_anRandomTable[m_sQueueSample.m_nEntityIndex & 3] % maxOffset;
 
 	// check if the same sfx like last time, if yes, then try use next one,
@@ -5457,40 +5437,38 @@ cAudioManager::GetPlayerTalkSfx(CPed *ped, int16 sound)
 
 	if(m_bIsPlayerShutUp) return NO_SAMPLE;
 	switch(sound) {
-	case SOUND_PED_DEATH: return 9796;
+	case SOUND_PED_DEATH:
+	case SOUND_PED_PLAYER_AFTERSEX: return NO_SAMPLE;
 	case SOUND_PED_DAMAGE:
-	case SOUND_PED_BULLET_HIT: GetPhrase(sfx, ped->m_lastComment, 9815, 33); break;
+	case SOUND_PED_BULLET_HIT: GetPhrase(sfx, ped->m_lastComment, SFX_TONI_GENERAL_IMP_HI_01, 16); break;
 	case SOUND_PED_HIT:
-	case SOUND_PED_DEFEND: GetPhrase(sfx, ped->m_lastComment, 9883, 42); break;
-	case SOUND_PED_LAND: GetPhrase(sfx, ped->m_lastComment, 9848, 35); break;
-	case SOUND_PED_BURNING: GetPhrase(sfx, ped->m_lastComment, 9925, 16); break;
+	case SOUND_PED_DEFEND: GetPhrase(sfx, ped->m_lastComment, SFX_TONI_GENERAL_IMP_LOW_01, 15); break;
+	case SOUND_PED_LAND: GetPhrase(sfx, ped->m_lastComment, SFX_TONI_GENERAL_HIT_GROUND_01, 12); break;
+	case SOUND_PED_BURNING: GetPhrase(sfx, ped->m_lastComment, SFX_TONI_GENERAL_ON_FIRE_01, 7); break;
 	case SOUND_PED_PLAYER_REACTTOCOP:
 		switch(m_nPlayerMood) {
-		case PLAYER_MOOD_ANGRY:
-			GetPhrase(sfx, ped->m_lastComment, 8694, 38);
+		case PLAYER_MOOD_PISSED_OFF:
+			GetPhrase(sfx, ped->m_lastComment, SFX_TONI_PISSED_OFF_BUSTED_01, 12);
 			break;
-		case PLAYER_MOOD_WISECRACKING:
-			GetPhrase(sfx, ped->m_lastComment, 9615, 20);
+		case PLAYER_MOOD_ANGRY:
+			GetPhrase(sfx, ped->m_lastComment, SFX_TONI_ANGRY_BUSTED_01, 16);
 			break;
 		default:
-			GetPhrase(sfx, ped->m_lastComment, 9046, 22);
+			GetPhrase(sfx, ped->m_lastComment, SFX_TONI_CALM_BUSTED_01, 25);
 			break;
 		}
 		break;
 	case SOUND_PED_ON_FIRE: {
 		cooldown_phrase(8);
 		switch(m_nPlayerMood) {
+		case PLAYER_MOOD_CALM:
 		case PLAYER_MOOD_PISSED_OFF:
-			GetPhrase(sfx, ped->m_lastComment, 9586, 29);
-			break;
 		case PLAYER_MOOD_ANGRY:
-			GetPhrase(sfx, ped->m_lastComment, 9007, 39);
-			break;
 		case PLAYER_MOOD_WISECRACKING:
-			GetPhrase(sfx, ped->m_lastComment, 9787, 9);
+			GetPhrase(sfx, ped->m_lastComment, aReactions[7].sfx[m_nPlayerMood], aReactions[7].count[m_nPlayerMood]);
 			break;
 		default:
-			GetPhrase(sfx, ped->m_lastComment, 9322, 35);
+			GetPhrase(sfx, ped->m_lastComment, SFX_TONI_CALM_SEX_01, 30); // bruh
 			break;
 		}
 		break;
@@ -5499,16 +5477,12 @@ cAudioManager::GetPlayerTalkSfx(CPed *ped, int16 sound)
 		cooldown_phrase(8);
 		switch(m_nPlayerMood) {
 		case PLAYER_MOOD_PISSED_OFF:
-			GetPhrase(sfx, ped->m_lastComment, 9561, 25);
-			break;
 		case PLAYER_MOOD_ANGRY:
-			GetPhrase(sfx, ped->m_lastComment, 8937, 52);
-			break;
 		case PLAYER_MOOD_WISECRACKING:
-			GetPhrase(sfx, ped->m_lastComment, 9758, 19);
+			GetPhrase(sfx, ped->m_lastComment, aReactions[5].sfx[m_nPlayerMood-1], aReactions[5].count[m_nPlayerMood-1]);
 			break;
 		default:
-			GetPhrase(sfx, ped->m_lastComment, 9275, 39);
+			GetPhrase(sfx, ped->m_lastComment, SFX_TONI_CALM_PULL_GUN_01, 35);
 			break;
 		}
 		break;
@@ -5517,81 +5491,59 @@ cAudioManager::GetPlayerTalkSfx(CPed *ped, int16 sound)
 		cooldown_phrase(4);
 		switch(m_nPlayerMood) {
 		case PLAYER_MOOD_PISSED_OFF:
-			GetPhrase(sfx, ped->m_lastComment, 9483, 36);
-			break;
 		case PLAYER_MOOD_ANGRY:
-			GetPhrase(sfx, ped->m_lastComment, 8876, 43);
-			break;
 		case PLAYER_MOOD_WISECRACKING:
-			GetPhrase(sfx, ped->m_lastComment, 9706, 18);
+			GetPhrase(sfx, ped->m_lastComment, aReactions[3].sfx[m_nPlayerMood-1], aReactions[3].count[m_nPlayerMood-1]);
 			break;
 		default:
-			GetPhrase(sfx, ped->m_lastComment, 9202, 40);
+			GetPhrase(sfx, ped->m_lastComment, SFX_TONI_CALM_JACKING_01, 35);
 			break;
 		}
 		break;
 	}
 	case SOUND_PED_MUGGING: {
 		cooldown_phrase(8);
-		switch(m_nPlayerMood) {
-		case PLAYER_MOOD_PISSED_OFF:
-			GetPhrase(sfx, ped->m_lastComment, 9519, 25);
-			break;
-		case PLAYER_MOOD_ANGRY:
-			GetPhrase(sfx, ped->m_lastComment, 8919, 12);
-			break;
-		case PLAYER_MOOD_WISECRACKING:
-			GetPhrase(sfx, ped->m_lastComment, 9724, 23);
-			break;
-		default:
-			GetPhrase(sfx, ped->m_lastComment, 9242, 11);
-			break;
-		}
+		sfx = NO_SAMPLE;
 		break;
 	}
 	case SOUND_PED_CAR_JACKED: {
 		cooldown_phrase(4);
 		switch(m_nPlayerMood) {
 		case PLAYER_MOOD_PISSED_OFF:
-			GetPhrase(sfx, ped->m_lastComment, 9462, 21);
-			break;
 		case PLAYER_MOOD_ANGRY:
-			GetPhrase(sfx, ped->m_lastComment, 8843, 33);
-			break;
 		case PLAYER_MOOD_WISECRACKING:
-			GetPhrase(sfx, ped->m_lastComment, 9688, 18);
+			GetPhrase(sfx, ped->m_lastComment, aReactions[2].sfx[m_nPlayerMood-1], aReactions[2].count[m_nPlayerMood-1]);
 			break;
 		default:
-			GetPhrase(sfx, ped->m_lastComment, 9178, 24);
+			GetPhrase(sfx, ped->m_lastComment, SFX_TONI_CALM_JACKED_01, 23);
 			break;
 		}
 		break;
 	}
-	case SOUND_PED_PLAYER_AFTERSEX: GetPhrase(sfx, ped->m_lastComment, 9797, 18); break;
 	case SOUND_PED_PLAYER_BEFORESEX:
 		switch(m_nPlayerMood) {
+		case PLAYER_MOOD_CALM:
+		case PLAYER_MOOD_PISSED_OFF:
 		case PLAYER_MOOD_ANGRY:
-			GetPhrase(sfx, ped->m_lastComment, 8989, 18);
-			break;
 		case PLAYER_MOOD_WISECRACKING:
-			GetPhrase(sfx, ped->m_lastComment, 9777, 10);
+			GetPhrase(sfx, ped->m_lastComment, aReactions[6].sfx[m_nPlayerMood], aReactions[6].count[m_nPlayerMood]);
 			break;
 		default:
-			GetPhrase(sfx, ped->m_lastComment, 9314, 8);
+			GetPhrase(sfx, ped->m_lastComment, SFX_TONI_CALM_SEX_01, 10);
 			break;
 		}
 		break;
 	case SOUND_PED_PLAYER_FARFROMCOPS: {
 		cooldown_phrase(4);
 		switch(m_nPlayerMood) {
-		case PLAYER_MOOD_ANGRY:
-			GetPhrase(sfx, ped->m_lastComment, 8732, 9);
+		case PLAYER_MOOD_PISSED_OFF:
+			GetPhrase(sfx, ped->m_lastComment, SFX_TONI_PISSED_OFF_CHASED_01, 25);
 			break;
-		case PLAYER_MOOD_WISECRACKING:
-			GetPhrase(sfx, ped->m_lastComment, 9635, 7);
+		case PLAYER_MOOD_ANGRY:
+			GetPhrase(sfx, ped->m_lastComment, SFX_TONI_ANGRY_CHASED_01, 25);
 			break;
 		default:
-			GetPhrase(sfx, ped->m_lastComment, 9068, 20);
+			GetPhrase(sfx, ped->m_lastComment, SFX_TONI_CALM_CHASED_01, 20);
 			break;
 		}
 		break;
@@ -5600,16 +5552,12 @@ cAudioManager::GetPlayerTalkSfx(CPed *ped, int16 sound)
 		cooldown_phrase(4);
 		switch(m_nPlayerMood) {
 		case PLAYER_MOOD_PISSED_OFF:
-			GetPhrase(sfx, ped->m_lastComment, 9401, 61);
-			break;
 		case PLAYER_MOOD_ANGRY:
-			GetPhrase(sfx, ped->m_lastComment, 8782, 61);
-			break;
 		case PLAYER_MOOD_WISECRACKING:
-			GetPhrase(sfx, ped->m_lastComment, 9661, 27);
+			GetPhrase(sfx, ped->m_lastComment, aReactions[1].sfx[m_nPlayerMood-1], aReactions[1].count[m_nPlayerMood-1]);
 			break;
 		default:
-			GetPhrase(sfx, ped->m_lastComment, 9131, 47);
+			GetPhrase(sfx, ped->m_lastComment, SFX_TONI_CALM_FIGHT_01, 42);
 			break;
 		}
 		break;
@@ -5620,16 +5568,12 @@ cAudioManager::GetPlayerTalkSfx(CPed *ped, int16 sound)
 		cooldown_phrase(4);
 		switch(m_nPlayerMood) {
 		case PLAYER_MOOD_PISSED_OFF:
-			GetPhrase(sfx, ped->m_lastComment, 9357, 44);
-			break;
 		case PLAYER_MOOD_ANGRY:
-			GetPhrase(sfx, ped->m_lastComment, 8741, 41);
-			break;
 		case PLAYER_MOOD_WISECRACKING:
-			GetPhrase(sfx, ped->m_lastComment, 9642, 19);
+			GetPhrase(sfx, ped->m_lastComment, aReactions[0].sfx[m_nPlayerMood-1], aReactions[0].count[m_nPlayerMood-1]);
 			break;
 		default:
-			GetPhrase(sfx, ped->m_lastComment, 9088, 43);
+			GetPhrase(sfx, ped->m_lastComment, SFX_TONI_CALM_CRASH_01, 31);
 			break;
 		}
 		break;
@@ -5638,16 +5582,12 @@ cAudioManager::GetPlayerTalkSfx(CPed *ped, int16 sound)
 		cooldown_phrase(4);
 		switch(m_nPlayerMood) {
 		case PLAYER_MOOD_PISSED_OFF:
-			GetPhrase(sfx, ped->m_lastComment, 9544, 17);
-			break;
 		case PLAYER_MOOD_ANGRY:
-			GetPhrase(sfx, ped->m_lastComment, 8931, 6);
-			break;
 		case PLAYER_MOOD_WISECRACKING:
-			GetPhrase(sfx, ped->m_lastComment, 9747, 11);
+			GetPhrase(sfx, ped->m_lastComment, aReactions[4].sfx[m_nPlayerMood-1], aReactions[4].count[m_nPlayerMood-1]);
 			break;
 		default:
-			GetPhrase(sfx, ped->m_lastComment, 9253, 22);
+			GetPhrase(sfx, ped->m_lastComment, SFX_TONI_CALM_PICK_UP_HOOKER_01, 18);
 			break;
 		}
 		break;
@@ -5662,65 +5602,81 @@ cAudioManager::GetCopTalkSfx(CPed *ped, int16 sound)
 {
 	uint32 sfx;
 	PedState objective;
-	switch(sound) {
-	case SOUND_PED_ARREST_COP: GetPhrase(sfx, ped->m_lastComment, 8469, 4); break;
-	case SOUND_PED_PULLOUTWEAPON: GetPhrase(sfx, ped->m_lastComment, 8473, 3); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 8500, 2); break;
-	case SOUND_PED_COP_UNK_129: GetPhrase(sfx, ped->m_lastComment, 8510, 4); break;
-	case SOUND_PED_COP_MANYCOPSAROUND: GetPhrase(sfx, ped->m_lastComment, 8508, 2); break;
-	case SOUND_PED_GUNAIMEDAT2: GetPhrase(sfx, ped->m_lastComment, 8498, 2); break;
-	case SOUND_PED_COP_ALONE: GetPhrase(sfx, ped->m_lastComment, 8504, 4); break;
-	case SOUND_PED_GUNAIMEDAT3: GetPhrase(sfx, ped->m_lastComment, 8485, 2); break;
-	case SOUND_PED_COP_REACTION: {
-		cooldown_phrase(4);
-		GetPhrase(sfx, ped->m_lastComment, 8502, 2);
-		break;
-	}
-	case SOUND_PED_COP_LITTLECOPSAROUND:
-		objective = FindPlayerPed()->m_nPedState;
-		if(objective == PED_ARRESTED || objective == PED_DEAD || objective == PED_DIE) return NO_SAMPLE;
-		GetPhrase(sfx, ped->m_lastComment, 8481, 4);
-		break;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 8494, 4); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 8491, 3); break;
-	case SOUND_PED_PED_COLLISION:
-		if(FindPlayerPed()->m_pWanted->GetWantedLevel() <= 0) return NO_SAMPLE;
-		GetPhrase(sfx, ped->m_lastComment, 8476, 5);
-		break;
-	default: return GetGenericMaleTalkSfx(ped, sound);
-	}
-	return 45 * (m_sQueueSample.m_nEntityIndex % 5) + sfx;
+	return NO_SAMPLE;
+//	switch(sound) {
+//	case SOUND_PED_ARREST_COP: GetPhrase(sfx, ped->m_lastComment, SFX_COP_VOICE_1_ARREST_1, 4); break;
+//	case SOUND_PED_PULLOUTWEAPON: GetPhrase(sfx, ped->m_lastComment, SFX_COP_VOICE_1_PULLOUTWEAPON_1, 3); break;
+//	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_COP_VOICE_1_SAVED_1, 2); break;
+//	case SOUND_PED_COP_TARGETING: GetPhrase(sfx, ped->m_lastComment, SFX_COP_VOICE_1_COP_TARGETING_1, 4); break;
+//	case SOUND_PED_COP_MANYCOPSAROUND: GetPhrase(sfx, ped->m_lastComment, SFX_COP_VOICE_1_COP_MANYCOPSAROUND_1, 2); break;
+//	case SOUND_PED_GUNAIMEDAT2: GetPhrase(sfx, ped->m_lastComment, SFX_COP_VOICE_1_GUNAIMEDAT2_1, 2); break;
+//	case SOUND_PED_COP_ALONE: GetPhrase(sfx, ped->m_lastComment, SFX_COP_VOICE_1_COP_ALONE_1, 4); break;
+//	case SOUND_PED_GUNAIMEDAT3: GetPhrase(sfx, ped->m_lastComment, SFX_COP_VOICE_1_GUNAIMEDAT2_1, 2); break;
+//	case SOUND_PED_COP_ASK_FOR_ID: {
+//		cooldown_phrase(4);
+//		GetPhrase(sfx, ped->m_lastComment, SFX_COP_VOICE_1_COP_ASK_FOR_ID_1, 2);
+//		break;
+//	}
+//	case SOUND_PED_COP_LITTLECOPSAROUND:
+//		objective = FindPlayerPed()->m_nPedState;
+//		if(objective == PED_ARRESTED || objective == PED_DEAD || objective == PED_DIE) return NO_SAMPLE;
+//		GetPhrase(sfx, ped->m_lastComment, SFX_COP_VOICE_1_COP_LITTLECOPSAROUND_1, 4);
+//		break;
+//	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_COP_VOICE_1_FIGHT_1, 4); break;
+//	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_COP_VOICE_1_DODGE_1, 3); break;
+//#ifdef FIX_BUGS
+//	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_COP_VOICE_1_CAR_CRASH_1, 4); break;
+//#endif
+//	case SOUND_PED_PED_COLLISION:
+//		if(FindPlayerPed()->m_pWanted->GetWantedLevel() > 0)
+//			GetPhrase(sfx, ped->m_lastComment, SFX_COP_VOICE_1_BUMP_1, 5);
+//		else
+//			return NO_SAMPLE;
+//		break;
+//	default: return GetGenericMaleTalkSfx(ped, sound);
+//	}
+//	return (SFX_COP_VOICE_2_ARREST_1 - SFX_COP_VOICE_1_ARREST_1) * (m_sQueueSample.m_nEntityIndex % 5) + sfx;
 }
 
 uint32
 cAudioManager::GetSwatTalkSfx(CPed *ped, int16 sound)
 {
-	uint32 sfx;
-	switch(sound) {
-	case SOUND_PED_COP_HELIPILOTPHRASE: GetPhrase(sfx, ped->m_lastComment, 3285, 7); break;
-	case SOUND_PED_COP_UNK_129: GetPhrase(sfx, ped->m_lastComment, 3292, 4); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 3282, 3); break;
-	default: return GetGenericMaleTalkSfx(ped, sound);
-	}
-	sfx += 14 * (m_sQueueSample.m_nEntityIndex % 3);
-	return sfx;
+	return NO_SAMPLE;
+	//uint32 sfx;
+	//switch(sound) {
+	//case SOUND_PED_COP_HELIPILOTPHRASE: GetPhrase(sfx, ped->m_lastComment, SFX_SWAT_VOICE_1_COP_HELIPILOTPHRASE_1, 7); break;
+	//case SOUND_PED_COP_TARGETING: GetPhrase(sfx, ped->m_lastComment, SFX_SWAT_VOICE_1_COP_TARGETING_1, 4); break;
+	//case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_SWAT_VOICE_1_DODGE_1, 3); break;
+	//default: return GetGenericMaleTalkSfx(ped, sound);
+	//}
+	//sfx += (SFX_SWAT_VOICE_2_DODGE_1 - SFX_SWAT_VOICE_1_DODGE_1) * (m_sQueueSample.m_nEntityIndex % 3);
+	//return sfx;
 }
 
 uint32
 cAudioManager::GetFBITalkSfx(CPed *ped, int16 sound)
 {
-	uint32 sfx;
-	switch(sound) {
-	case SOUND_PED_COP_UNK_129: GetPhrase(sfx, ped->m_lastComment, 3240u, 4u); break;
-	case SOUND_PED_COP_MANYCOPSAROUND: GetPhrase(sfx, ped->m_lastComment, 3237u, 3u); break;
-	case SOUND_PED_GUNAIMEDAT2: sfx = 3236; break;
-	case SOUND_PED_GUNAIMEDAT3: GetPhrase(sfx, ped->m_lastComment, 3228u, 4u); break;
-	case SOUND_PED_CRASH_VEHICLE:
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 3232u, 4u); break;
-	default: return GetGenericMaleTalkSfx(ped, sound);
-	}
-	sfx += 16 * (m_sQueueSample.m_nEntityIndex % 3);
-	return sfx;
+	return NO_SAMPLE;
+//	uint32 sfx;
+//	switch(sound) {
+//#ifdef FIX_BUGS
+//	case SOUND_PED_COP_TARGETING: GetPhrase(sfx, ped->m_lastComment, SFX_FBI_VOICE_1_COP_TARGETING_1, 6); break;
+//#else
+//	case SOUND_PED_COP_TARGETING: GetPhrase(sfx, ped->m_lastComment, SFX_FBI_VOICE_1_COP_TARGETING_1, 4); break;
+//#endif
+//	case SOUND_PED_COP_MANYCOPSAROUND: GetPhrase(sfx, ped->m_lastComment, SFX_FBI_VOICE_1_COP_MANYCOPSAROUND_1, 3); break;
+//	case SOUND_PED_GUNAIMEDAT2: sfx = SFX_FBI_VOICE_1_GUNAIMEDAT2_1; break;
+//	case SOUND_PED_GUNAIMEDAT3: GetPhrase(sfx, ped->m_lastComment, SFX_FBI_VOICE_1_GUNAIMEDAT3_1, 4); break;
+//	case SOUND_PED_CRASH_VEHICLE:
+//	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_FBI_VOICE_1_CAR_CRASH_1, 4); break;
+//	default: return GetGenericMaleTalkSfx(ped, sound);
+//	}
+//#ifdef FIX_BUGS
+//	sfx += (SFX_FBI_VOICE_2_GUNAIMEDAT3_1 - SFX_FBI_VOICE_1_GUNAIMEDAT3_1) * (m_sQueueSample.m_nEntityIndex % 3);
+//#else
+//	sfx += 16 * (m_sQueueSample.m_nEntityIndex % 3);
+//#endif
+//	return sfx;
 }
 
 uint32
@@ -5734,12 +5690,11 @@ cAudioManager::GetMedicTalkSfx(CPed *ped, int16 sound)
 {
 	uint32 sfx;
 	switch(sound) {
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 3162, 6); break;
-	case SOUND_PED_HEALING: GetPhrase(sfx, ped->m_lastComment, 3178, 17); break;
-	case SOUND_PED_LEAVE_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 3168, 10); break; // SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_1
+	case SOUND_PED_HEALING: GetPhrase(sfx, ped->m_lastComment, SFX_AMBULAN_VOICE_1_VICTIM_1, 17); break;
+	case SOUND_PED_LEAVE_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_AMBULAN_VOICE_1_VAN_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
-	sfx += 33 * (m_sQueueSample.m_nEntityIndex % 2);
+	sfx += (SFX_AMBULAN_VOICE_2_VAN_1 - SFX_AMBULAN_VOICE_1_VAN_1) * (m_sQueueSample.m_nEntityIndex % 2);
 	return sfx;
 }
 
@@ -5755,46 +5710,52 @@ cAudioManager::GetDefaultTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 2033, 12); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 2045, 12); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 2075, 4); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 2098, 4); break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 2108, 5); break;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 2004, 16); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 1979, 19); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 2079, 19); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 2020, 13); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 1939, 15); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 1898, 16); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 2070, 5); break;
-	case SOUND_153: GetPhrase(sfx, ped->m_lastComment, 1998, 6); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 2102, 6); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 1914, 25); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 1954, 25); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_MALE01_GUN_THREATENED_1, 2); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_MALE01_JACKED_CAR_1, 2); break;
+	case SOUND_PED_ROBBED:
+	case SOUND_PED_ACCIDENTREACTION1:
+	case SOUND_PED_TAXI_WAIT:
+	case SOUND_PED_EVADE:
+	case SOUND_PED_FLEE_RUN:
+	case SOUND_PED_CRASH_VEHICLE:
+	case SOUND_PED_WAIT_DOUBLEBACK:
+#ifdef FIX_BUGS
+	case SOUND_PED_CHAT_SEXY_MALE:
+#else
+	case SOUND_PED_CHAT_SEXY_FEMALE:
+#endif
+		GetPhrase(sfx, ped->m_lastComment, NO_SAMPLE, 0);
+		break;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_MALE01_FIGHT_1, 3); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_MALE01_CRASH_CAR_1, 2); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_MALE01_DRIVER_BLOCKED_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_MALE01_SHOCKED_1, 1); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_MALE01_BUMP_1, 3); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_MALE01_CHAT_1, 4); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
 }
-
+/*
 uint32
 cAudioManager::GetHFYSTTalkSfx(CPed *ped, int16 sound)
 {
 	uint32 sfx;
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 5736, 5); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 5747, 4); break;
-	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, 5755, 4); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 5741, 6); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 5753, 2); break;
-	case SOUND_PED_TAXI_WAIT: return 5759;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 5722, 7); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 5712, 10); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 5729, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 5695, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 5678, 7); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 5751, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 5685, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 5703, 9); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_HFYST_GUN_COOL_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_HFYST_JACKING_1, 4); break;
+	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, SFX_HFYST_MUGGING_1, 4); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_HFYST_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_HFYST_MUGGED_1, 2); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_HFYST_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_HFYST_FIGHT_1, 7); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HFYST_DODGE_1, 10); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_HFYST_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_HFYST_CAR_CRASH_1, 8); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_HFYST_BLOCKED_1, 7); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_HFYST_LOST_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HFYST_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_HFYST_CHAT_1, 9); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -5806,18 +5767,18 @@ cAudioManager::GetHFOSTTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 4382, 6); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 4388, 8); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 4398, 3); break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 4401, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 4363, 8); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 4353, 10); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 4371, 11); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 4334, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 4313, 9); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 4396, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 4322, 12); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 4342, 11); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_HFOST_GUN_COOL_1, 6); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_HFOST_JACKED_1, 8); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_HFOST_MUGGED_1, 3); break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_HFOST_TAXI_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_HFOST_FIGHT_1, 8); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HFOST_DODGE_1, 10); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_HFOST_GENERIC_CRASH_1, 11); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_HFOST_CAR_CRASH_1, 8); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_HFOST_BLOCKED_1, 9); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_HFOST_LOST_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HFOST_BUMP_1, 12); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_HFOST_CHAT_1, 11); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -5829,16 +5790,16 @@ cAudioManager::GetHMYSTTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 7961, 6); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 7971;
-	case SOUND_PED_TAXI_WAIT: return 7974;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 7946, 6); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 7967, 4); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 7954, 7); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 7952, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 7972, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 7922, 13); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 7935, 11); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_HMYST_GUN_PANIC_1, 6); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_HMYST_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_HMYST_TAXI_1;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HMYST_DODGE_1, 6); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_HMYST_RUN_1, 4); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_HMYST_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_HMYST_EYEING_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_HMYST_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HMYST_BUMP_1, 13); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_HMYST_CHAT_1, 11); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -5850,20 +5811,20 @@ cAudioManager::GetHMOSTTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 5820, 5); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 5831, 3); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 5825, 6); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 5836, 2); break;
-	case SOUND_PED_TAXI_WAIT: return 5838;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 5805, 8); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 5795, 9); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 5813, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 5777, 7); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 5760, 7); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 5834, 2); break;
-	case SOUND_PED_CHAT_SEXY: return 5804;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 5767, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 5784, 11); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_HMOST_GUN_COOL_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_HMOST_JACKING_1, 3); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_HMOST_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_HMOST_MUGGED_1, 2); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_HMOST_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_HMOST_FIGHT_1, 8); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HMOST_DODGE_1, 9); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_HMOST_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_HMOST_CAR_CRASH_1, 7); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_HMOST_BLOCKED_1, 7); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_HMOST_LOST_1, 2); break;
+	case SOUND_PED_CHAT_SEXY_MALE: return SFX_HMOST_EYEING_1;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HMOST_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_HMOST_CHAT_1, 11); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -5875,19 +5836,19 @@ cAudioManager::GetHFYRITalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 6965, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 6970, 6); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 6978, 4); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 6986, 2); break;
-	case SOUND_PED_TAXI_WAIT: return 6991;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 6948, 10); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 6982, 4); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 6958, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 6940, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 6923, 8); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 6976, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 6988, 3); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 6931, 9); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_HFYRI_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_HFYRI_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_HFYRI_MUGGED_1, 4); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_HFYRI_SAVED_1, 2); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_HFYRI_TAXI_1;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HFYRI_DODGE_1, 10); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_HFYRI_RUN_1, 4); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_HFYRI_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_HFYRI_CAR_CRASH_1, 8); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_HFYRI_BLOCKED_1, 8); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_HFYRI_LOST_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_HFYRI_SHOCKED_1, 3); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HFYRI_BUMP_1, 9); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -5899,20 +5860,20 @@ cAudioManager::GetHFORITalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 7244, 6); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 7250, 9); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 7261, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 7267;
-	case SOUND_PED_TAXI_WAIT: return 7270;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 7229, 6); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 7263, 4); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 7237, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 7222, 7); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 7206, 6); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 7259, 2); break;
-	case SOUND_153: GetPhrase(sfx, ped->m_lastComment, 7235, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 7268, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 7212, 10); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_HFORI_GUN_PANIC_1, 6); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_HFORI_JACKED_1, 9); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_HFORI_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_HFORI_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_HFORI_TAXI_1;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HFORI_DODGE_1, 6); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_HFORI_RUN_1, 4); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_HFORI_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_HFORI_CAR_CRASH_1, 7); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_HFORI_BLOCKED_1, 6); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_HFORI_LOST_1, 2); break;
+	case SOUND_PED_CHAT_SEXY_FEMALE: GetPhrase(sfx, ped->m_lastComment, SFX_HFORI_EYEING_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_HFORI_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HFORI_BUMP_1, 10); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -5924,17 +5885,17 @@ cAudioManager::GetHMYRITalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 5890, 7); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 5905, 3); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 5897, 8); break;
-	case SOUND_PED_ROBBED: return 5908;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 5873, 5); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 5864, 9); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 5878, 12); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 5856, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 5839, 7); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 5909, 3); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 5846, 10); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_HMYRI_GUN_PANIC_1, 7); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_HMYRI_JACKING_1, 3); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_HMYRI_JACKED_1, 8); break;
+	case SOUND_PED_ROBBED: return SFX_HMYRI_MUGGED_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_HMYRI_FIGHT_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HMYRI_DODGE_1, 9); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_HMYRI_GENERIC_CRASH_1, 12); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_HMYRI_CAR_CRASH_1, 8); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_HMYRI_BLOCKED_1, 7); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_HMYRI_SHOCKED_1, 3); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HMYRI_BUMP_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -5947,18 +5908,18 @@ cAudioManager::GetHMORITalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 4454, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 4459, 8); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 4469, 3); break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 4478, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 4436, 7); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 4472, 6); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 4443, 11); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 4422, 6); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 4403, 8); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 4467, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 4411, 11); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 4428, 8); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_HMORI_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_HMORI_JACKED_1, 8); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_HMORI_MUGGED_1, 3); break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_HMORI_TAXI_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HMORI_DODGE_1, 7); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_HMORI_RUN_1, 6); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_HMORI_GENERIC_CRASH_1, 11); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_HMORI_CAR_CRASH_1, 6); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_HMORI_BLOCKED_1, 8); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_HMORI_LOST_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HMORI_BUMP_1, 11); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_HMORI_CHAT_1, 8); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -5970,16 +5931,19 @@ cAudioManager::GetHFYBETalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 6897, 7); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 6904, 7); break;
-	case SOUND_PED_TAXI_WAIT: return 6922;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 6878, 11); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 6889, 8); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 6862, 6); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 6911, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 6920, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 6854, 8); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 6868, 10); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBE_GUN_PANIC_1, 7); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBE_JACKED_1, 7); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_HFYBE_TAXI_1;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBE_DODGE_1, 11); break;
+#ifdef FIX_BUGS // assumption
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBE_RUN_1, 7); break;
+#endif
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBE_GENERIC_CRASH_1, 8); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBE_CAR_CRASH_1, 6); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBE_LOST_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBE_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBE_BUMP_1, 8); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBE_CHAT_1, 10); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -5991,19 +5955,19 @@ cAudioManager::GetHFOBETalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 1018, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 1023, 6); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 1035;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 1038, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 1006, 7); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 1031, 4); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 1013, 5); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 990, 6); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 973, 6); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 1029, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 1036, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 979, 11); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 996, 10); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_HFOBE_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_HFOBE_JACKED_1, 6); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_HFOBE_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_HFOBE_TAXI_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HFOBE_DODGE_1, 7); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_HFOBE_RUN_1, 4); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_HFOBE_GENERIC_CRASH_1, 5); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_HFOBE_CAR_CRASH_1, 6); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_HFOBE_BLOCKED_1, 6); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_HFOBE_LOST_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_HFOBE_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HFOBE_BUMP_1, 11); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_HFOBE_CHAT_1, 10); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6015,20 +5979,20 @@ cAudioManager::GetHMYBETalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 4892, 6); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 4902, 12); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 4917;
-	case SOUND_PED_UNK_126: GetPhrase(sfx, ped->m_lastComment, 4898, 4); break;
-	case SOUND_PED_TAXI_WAIT: return 4920;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 4874, 8); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 4862, 7); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 4882, 10); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 4845, 7); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 4914, 3); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 4869, 5); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 4918, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 4835, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 4852, 10); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_HMYBE_GUN_PANIC_1, 6); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_HMYBE_JACKED_1, 12); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_HMYBE_SAVED_1;
+	case SOUND_PED_INNOCENT: GetPhrase(sfx, ped->m_lastComment, SFX_HMYBE_INNOCENT_1, 4); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_HMYBE_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_HMYBE_FIGHT_1, 8); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HMYBE_DODGE_1, 7); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_HMYBE_GENERIC_CRASH_1, 10); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_HMYBE_CAR_CRASH_1, 7); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_HMYBE_LOST_1, 3); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_HMYBE_EYEING_1, 5); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_HMYBE_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HMYBE_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_HMYBE_CHAT_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6040,13 +6004,13 @@ cAudioManager::GetHMOBETalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 4703, 3); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 4709, 6); break;
-	case SOUND_PED_UNK_126: GetPhrase(sfx, ped->m_lastComment, 4706, 3); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 4690, 9); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 4672, 10); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 4699, 4); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 4682, 8); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_HMOBE_GUN_PANIC_1, 3); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_HMOBE_JACKED_1, 6); break;
+	case SOUND_PED_INNOCENT: GetPhrase(sfx, ped->m_lastComment, SFX_HMOBE_INNOCENT_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HMOBE_DODGE_1, 9); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_HMOBE_BLOCKED_1, 10); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_HMOBE_EYEING_1, 4); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HMOBE_BUMP_1, 8); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 
@@ -6060,19 +6024,19 @@ cAudioManager::GetHFYBUTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 4771, 5); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 4782, 3); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 4776, 6); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 4787, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 4789;
-	case SOUND_PED_TAXI_WAIT: return 4790;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 4752, 7); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 4742, 10); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 4759, 12); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 4734, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 4715, 8); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 4785, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 4723, 11); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBU_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBU_JACKING_1, 3); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBU_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBU_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_HFYBU_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_HFYBU_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBU_FIGHT_1, 7); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBU_DODGE_1, 10); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBU_GENERIC_CRASH_1, 12); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBU_CAR_CRASH_1, 8); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBU_BLOCKED_1, 8); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBU_LOST_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HFYBU_BUMP_1, 11); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6084,14 +6048,18 @@ cAudioManager::GetHFYMDTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 6014, 5); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 6019, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 6021, 3); break;
-	case SOUND_PED_TAXI_WAIT: return 8231;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 6005, 9); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 5997, 8); break;
-	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, 6024, 15); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 5988, 9); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_HFYMD_GUN_PANIC_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_HFYMD_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_HFYMD_SAVED_1, 3); break;
+#ifdef FIX_BUGS
+	case SOUND_PED_TAXI_WAIT: return SFX_HFYMD_TAXI_1;
+#else
+	case SOUND_PED_TAXI_WAIT: return SFX_BFOBE_TAXI_1;
+#endif
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_HFYMD_FIGHT_1, 9); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HFYMD_DODGE_1, 8); break;
+	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, SFX_HFYMD_SOLICIT_1, 15); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HFYMD_BUMP_1, 9); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6103,14 +6071,18 @@ cAudioManager::GetHFYCGTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 4808, 5); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 4813, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 4819;
-	case SOUND_PED_TAXI_WAIT: return 8231;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 4800, 8); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 4815, 4); break;
-	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, 4820, 14); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 4791, 9); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_HFYCG_GUN_PANIC_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_HFYCG_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_HFYCG_SAVED_1;
+#ifdef FIX_BUGS
+	case SOUND_PED_TAXI_WAIT: return SFX_HFYCG_TAXI_1;
+#else
+	case SOUND_PED_TAXI_WAIT: return SFX_BFOBE_TAXI_1;
+#endif
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HFYCG_DODGE_1, 8); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_HFYCG_RUN_1, 4); break;
+	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, SFX_HFYCG_SOLICIT_1, 14); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HFYCG_BUMP_1, 9); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6122,17 +6094,17 @@ cAudioManager::GetHFYPRTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 5964, 6); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 5970, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 5972;
-	case SOUND_PED_PLAYER_BEFORESEX: GetPhrase(sfx, ped->m_lastComment, 5956, 8); break;
-	case SOUND_PED_TAXI_WAIT: return 5987;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 5946, 10); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 5934, 9); break;
-	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, 5973, 14); break;
-	case SOUND_153: GetPhrase(sfx, ped->m_lastComment, 5943, 3); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 5912, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 5922, 12); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_HFYPR_GUN_COOL_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_HFYPR_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_HFYPR_SAVED_1;
+	case SOUND_PED_PLAYER_BEFORESEX: GetPhrase(sfx, ped->m_lastComment, SFX_HFYPR_FUCKING_1, 8); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_HFYPR_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_HFYPR_FIGHT_1, 10); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HFYPR_DODGE_1, 9); break;
+	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, SFX_HFYPR_SOLICIT_1, 14); break;
+	case SOUND_PED_CHAT_SEXY_FEMALE: GetPhrase(sfx, ped->m_lastComment, SFX_HFYPR_EYEING_1, 3); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HFYPR_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_HFYPR_CHAT_1, 12); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6144,15 +6116,15 @@ cAudioManager::GetHFOTRTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 4660, 5); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 4665, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 4667;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 4670, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 4654, 6); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 4646, 8); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 4668, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 4623, 11); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 4634, 12); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_HFOTR_GUN_COOL_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_HFOTR_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_HFOTR_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_HFOTR_TAXI_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_HFOTR_FIGHT_1, 6); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HFOTR_DODGE_1, 8); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_HFOTR_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HFOTR_BUMP_1, 11); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_HFOTR_CHAT_1, 12); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6164,15 +6136,15 @@ cAudioManager::GetHMOTRTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 4515, 6); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 4521, 2); break;
-	case SOUND_PED_TAXI_WAIT: return 4534;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 4508, 7); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 4497, 11); break;
-	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, 4526, 8); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 4523, 3); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 4480, 8); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 4488, 9); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_HMOTR_GUN_COOL_1, 6); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_HMOTR_SAVED_1, 2); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_HMOTR_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_HMOTR_FIGHT_1, 7); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HMOTR_DODGE_1, 11); break;
+	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, SFX_HMOTR_SOLICIT_1, 8); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_HMOTR_SHOCKED_1, 3); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HMOTR_BUMP_1, 8); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_HMOTR_CHAT_1, 9); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6184,21 +6156,21 @@ cAudioManager::GetHMYAPTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 4591, 7); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 4605, 4); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 4598, 7); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 4611, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 4619, 2); break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 4621, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 4573, 9); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 4613, 6); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 4585, 6); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 4555, 9); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 4535, 9); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 4609, 2); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 4582, 3); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 4544, 11); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 4564, 9); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_GUN_PANIC_1, 7); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_JACKING_1, 4); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_JACKED_1, 7); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_SAVED_1, 2); break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_TAXI_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_DODGE_1, 9); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_RUN_1, 6); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_GENERIC_CRASH_1, 6); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_CAR_CRASH_1, 9); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_BLOCKED_1, 9); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_LOST_1, 2); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_EYEING_1, 3); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_BUMP_1, 11); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_HMYAP_CHAT_1, 9); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6210,16 +6182,16 @@ cAudioManager::GetHMOCATalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 3506, 5); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 3521, 11); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 3511, 10); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 3532, 7); break;
-	case SOUND_PED_TAXI_WAIT: return 3541;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 3539, 2); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 3486, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 3478, 8); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 3504, 2); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 3494, 10); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_HMOCA_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_HMOCA_JACKING_1, 11); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_HMOCA_JACKED_1, 10); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_HMOCA_MUGGED_1, 7); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_HMOCA_TAXI_1;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_HMOCA_RUN_1, 2); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_HMOCA_CAR_CRASH_1, 8); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_HMOCA_BLOCKED_1, 8); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_HMOCA_EYEING_1, 2); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_HMOCA_CHAT_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6231,26 +6203,27 @@ cAudioManager::GetBMODKTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 6831, 4); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 6838, 9); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 6847, 2); break;
-	case SOUND_PED_UNK_126: GetPhrase(sfx, ped->m_lastComment, 6835, 3); break;
-	case SOUND_PED_TAXI_WAIT: return 6853;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 6817, 7); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 6849, 4); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 6824, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 6794, 10); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 6776, 8); break;
-	case SOUND_PED_147:
-		GetPhrase(sfx, ped->m_lastComment, 6805, 11);
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_GUN_PANIC_1, 4); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_JACKED_1, 9); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_MUGGED_1, 2); break;
+	case SOUND_PED_INNOCENT: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_INNOCENT_1, 3); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_BMODK_TAXI_1;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_DODGE_1, 7); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_RUN_1, 4); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_CAR_CRASH_1, 10); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_BLOCKED_1, 8); break;
+	case SOUND_PED_147: // this is some cut behaviour, the guy was selling something
+		GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_UNK_147_1, 11);
+		// what is this? some sort of censorship?
 		switch(sfx) {
-		case 6809:
-		case 6810:
-		case 6811: GetPhrase(sfx, ped->m_lastComment, 6805, 4); break;
+		case SFX_BMODK_UNK_147_5:
+		case SFX_BMODK_UNK_147_6:
+		case SFX_BMODK_UNK_147_7: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_UNK_147_1, 4); break;
 		default: break;
 		}
 		break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 6784, 10); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BMODK_BUMP_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6262,20 +6235,20 @@ cAudioManager::GetBMYCRTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 6578, 6); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 6594, 12); break;
-	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, 6609, 6); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 6588, 6); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 6606, 3); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 6615, 2); break;
-	case SOUND_PED_UNK_126: GetPhrase(sfx, ped->m_lastComment, 6584, 4); break;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 6563, 8); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 6553, 8); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 6571, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 6544, 9); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 6521, 12); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 6561, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 6533, 11); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_BMYCR_GUN_COOL_1, 6); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_BMYCR_JACKING_1, 12); break;
+	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, SFX_BMYCR_MUGGING_1, 6); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BMYCR_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BMYCR_MUGGED_1, 3); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_BMYCR_SAVED_1, 2); break;
+	case SOUND_PED_INNOCENT: GetPhrase(sfx, ped->m_lastComment, SFX_BMYCR_INNOCENT_1, 4); break;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_BMYCR_FIGHT_1, 8); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYCR_DODGE_1, 8); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYCR_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BMYCR_CAR_CRASH_1, 9); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BMYCR_BLOCKED_1, 12); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYCR_EYEING_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BMYCR_BUMP_1, 11); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6287,19 +6260,19 @@ cAudioManager::GetBFYSTTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 7184, 4); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 7188, 5); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 7195, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 7203, 2); break;
-	case SOUND_PED_TAXI_WAIT: return 7205;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 7167, 9); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 7197, 6); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 7176, 8); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 7149, 9); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 7132, 8); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 7193, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 7140, 9); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 7158, 9); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_BFYST_GUN_PANIC_1, 4); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BFYST_JACKED_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BFYST_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_BFYST_SAVED_1, 2); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_BFYST_TAXI_1;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BFYST_DODGE_1, 9); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_BFYST_RUN_1, 6); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BFYST_GENERIC_CRASH_1, 8); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BFYST_CAR_CRASH_1, 9); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BFYST_BLOCKED_1, 8); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_BFYST_LOST_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BFYST_BUMP_1, 9); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_BFYST_CHAT_1, 9); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6311,19 +6284,19 @@ cAudioManager::GetBFOSTTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 7046, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 7051, 8); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 7061, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 7067, 2); break;
-	case SOUND_PED_TAXI_WAIT: return 7069;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 7027, 11); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 7063, 4); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 7038, 8); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 7009, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 6992, 7); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 7059, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 6999, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 7017, 10); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_BFOST_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BFOST_JACKED_1, 8); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BFOST_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_BFOST_SAVED_1, 2); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_BFOST_TAXI_1;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BFOST_DODGE_1, 11); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_BFOST_RUN_1, 4); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BFOST_GENERIC_CRASH_1, 8); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BFOST_CAR_CRASH_1, 8); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BFOST_BLOCKED_1, 7); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_BFOST_LOST_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BFOST_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_BFOST_CHAT_1, 10); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6335,19 +6308,23 @@ cAudioManager::GetBMYSTTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 6413, 6); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 6427, 4); break;
-	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, 6433, 4); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 6419, 8); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 6431, 2); break;
-	case SOUND_PED_TAXI_WAIT: return 6437;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 6400, 6); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 6392, 8); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 6406, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 6371, 9); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 6352, 8); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 6360, 11); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 6380, 12); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_BMYST_GUN_COOL_1, 6); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_BMYST_JACKING_1, 4); break;
+	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, SFX_BMYST_MUGGING_1, 4); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BMYST_JACKED_1, 8); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BMYST_MUGGED_1, 2); break;
+#ifdef FIX_BUGS
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_BMYST_TAXI_1, 2); break;
+#else
+	case SOUND_PED_TAXI_WAIT: return SFX_BMYST_TAXI_1;
+#endif
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_BMYST_FIGHT_1, 6); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYST_DODGE_1, 8); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYST_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BMYST_CAR_CRASH_1, 9); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BMYST_BLOCKED_1, 8); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BMYST_BUMP_1, 11); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_BMYST_CHAT_1, 12); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6359,18 +6336,18 @@ cAudioManager::GetBMOSTTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 4292, 9); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 4307, 4); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 4311;
-	case SOUND_PED_TAXI_WAIT: return 4312;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 4272, 7); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 4258, 8); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 4279, 13); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 4232, 8); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 4301, 6); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 4266, 6); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 4215, 17); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 4240, 18); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_BMOST_GUN_PANIC_1, 9); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BMOST_MUGGED_1, 4); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_BMOST_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_BMOST_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_BMOST_FIGHT_1, 7); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BMOST_DODGE_1, 8); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BMOST_GENERIC_CRASH_1, 13); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BMOST_CAR_CRASH_1, 8); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_BMOST_LOST_1, 6); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_BMOST_EYEING_1, 6); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BMOST_BUMP_1, 17); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_BMOST_CHAT_1, 18); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6382,21 +6359,21 @@ cAudioManager::GetBFYRITalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 6161, 4); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 6173, 4); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 6165, 8); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 6179, 3); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 6188, 2); break;
-	case SOUND_PED_TAXI_WAIT: return 6194;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 6143, 8); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 6182, 6); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 6154, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 6135, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 6117, 9); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 6177, 2); break;
-	case SOUND_153: GetPhrase(sfx, ped->m_lastComment, 6151, 3); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 6190, 4); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 6126, 9); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_BFYRI_GUN_PANIC_1, 4); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_BFYRI_JACKING_1, 4); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BFYRI_JACKED_1, 8); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BFYRI_MUGGED_1, 3); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_BFYRI_SAVED_1, 2); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_BFYRI_TAXI_1;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BFYRI_DODGE_1, 8); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_BFYRI_RUN_1, 6); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BFYRI_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BFYRI_CAR_CRASH_1, 8); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BFYRI_BLOCKED_1, 9); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_BFYRI_LOST_1, 2); break;
+	case SOUND_PED_CHAT_SEXY_FEMALE: GetPhrase(sfx, ped->m_lastComment, SFX_BFYRI_EYEING_1, 3); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_BFYRI_SHOCKED_1, 4); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BFYRI_BUMP_1, 9); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6408,19 +6385,19 @@ cAudioManager::GetBFORITalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 7110, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 7115, 4); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 7121, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 7127;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 7130, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 7094, 9); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 7123, 4); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 7103, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 7087, 7); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 7070, 8); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 7119, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 7128, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 7078, 9); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_BFORI_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BFORI_JACKED_1, 4); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BFORI_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_BFORI_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_BFORI_TAXI_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BFORI_DODGE_1, 9); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_BFORI_RUN_1, 4); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BFORI_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BFORI_CAR_CRASH_1, 7); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BFORI_BLOCKED_1, 8); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_BFORI_LOST_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_BFORI_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BFORI_BUMP_1, 9); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6433,20 +6410,20 @@ cAudioManager::GetBMYRITalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 5430, 7); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 5437, 4); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 5443, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 5449;
-	case SOUND_PED_TAXI_WAIT: return 5453;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 5414, 8); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 5445, 4); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 5423, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 5407, 7); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 5394, 6); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 5441, 2); break;
-	case SOUND_PED_CHAT_SEXY: return 5422;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 5450, 3); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 5400, 7); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_BMYRI_GUN_PANIC_1, 7); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BMYRI_JACKED_1, 4); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BMYRI_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_BMYRI_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_BMYRI_TAXI_1;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYRI_DODGE_1, 8); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_BMYRI_RUN_1, 4); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYRI_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BMYRI_CAR_CRASH_1, 7); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BMYRI_BLOCKED_1, 6); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_BMYRI_LOST_1, 2); break;
+	case SOUND_PED_CHAT_SEXY_MALE: return SFX_BMYRI_EYEING_1;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_BMYRI_SHOCKED_1, 3); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BMYRI_BUMP_1, 7); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6458,20 +6435,28 @@ cAudioManager::GetBFYBETalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 6255, 6); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 6261, 8); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 6273, 5); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 6284, 2); break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 6290, 3); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 6233, 10); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 6278, 6); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 6247, 8); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 6207, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 6195, 12); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 6269, 4); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 6243, 4); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 6286, 4); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 6217, 16); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_BFYBE_GUN_COOL_1, 6); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BFYBE_JACKED_1, 8); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BFYBE_MUGGED_1, 5); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_BFYBE_SAVED_1, 2); break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_BFYBE_TAXI_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BFYBE_DODGE_1, 10); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_BFYBE_RUN_1, 6); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BFYBE_GENERIC_CRASH_1, 8); break;
+#ifdef FIX_BUGS
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BFYBE_CAR_CRASH_1, 10); break;
+#else
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BFYBE_CAR_CRASH_1, 8); break;
+#endif
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BFYBE_BLOCKED_1, 12); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_BFYBE_LOST_1, 4); break;
+#ifdef FIX_BUGS
+	case SOUND_PED_CHAT_SEXY_FEMALE: GetPhrase(sfx, ped->m_lastComment, SFX_BFYBE_EYEING_1, 4); break;
+#else
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_BFYBE_EYEING_1, 4); break;
+#endif
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_BFYBE_SHOCKED_1, 4); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_BFYBE_CHAT_1, 16); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6483,21 +6468,21 @@ cAudioManager::GetBMYBETalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 956, 4); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 966, 3); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 960, 6); break;
-	case SOUND_PED_ROBBED: return 970;
-	case SOUND_PED_ACCIDENTREACTION1: return 971;
-	case SOUND_PED_TAXI_WAIT: return 972;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 940, 8); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 928, 10); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 948, 8); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 910, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 892, 8); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: return 969;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 938, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 900, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 918, 10); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBE_GUN_COOL_1, 4); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBE_JACKING_1, 3); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBE_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: return SFX_BMYBE_MUGGED_1;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_BMYBE_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_BMYBE_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBE_FIGHT_1, 8); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBE_DODGE_1, 10); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBE_GENERIC_CRASH_1, 8); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBE_CAR_CRASH_1, 8); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBE_BLOCKED_1, 8); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: return SFX_BMYBE_LOST_1;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBE_EYEING_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBE_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBE_CHAT_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6506,22 +6491,21 @@ cAudioManager::GetBMYBETalkSfx(CPed *ped, int16 sound)
 uint32
 cAudioManager::GetBFOBETalkSfx(CPed *ped, int16 sound)
 {
-
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 8213, 5); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 8223, 4); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 8218, 5); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 8227, 2); break;
-	case SOUND_PED_TAXI_WAIT: return 8231;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 8197, 9); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 8206, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 8182, 7); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 8166, 8); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 8229, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 8174, 8); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 8189, 8); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_BFOBE_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_BFOBE_JACKING_1, 4); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BFOBE_JACKED_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BFOBE_MUGGED_1, 2); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_BFOBE_TAXI_1;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BFOBE_DODGE_1, 9); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BFOBE_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BFOBE_CAR_CRASH_1, 7); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BFOBE_BLOCKED_1, 8); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_BFOBE_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BFOBE_BUMP_1, 8); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_BFOBE_CHAT_1, 8); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6533,18 +6517,18 @@ cAudioManager::GetBMOBETalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 7611, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 7616, 6); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 7622, 4); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 7626, 3); break;
-	case SOUND_PED_TAXI_WAIT: return 7632;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 7594, 10); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 7583, 11); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 7604, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 7564, 9); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 7629, 3); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 7559, 5); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 7573, 10); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_BMOBE_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BMOBE_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BMOBE_MUGGED_1, 4); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_BMOBE_SAVED_1, 3); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_BMOBE_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_BMOBE_FIGHT_1, 10); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BMOBE_DODGE_1, 11); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BMOBE_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BMOBE_CAR_CRASH_1, 9); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_BMOBE_SHOCKED_1, 3); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BMOBE_BUMP_1, 5); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_BMOBE_CHAT_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6556,20 +6540,20 @@ cAudioManager::GetBMYBUTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 5500, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 5507, 6); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 5513, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 5515;
-	case SOUND_PED_UNK_126: GetPhrase(sfx, ped->m_lastComment, 5505, 2); break;
-	case SOUND_PED_TAXI_WAIT: return 5518;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 5488, 5); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 5476, 10); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 5493, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 5469, 7); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 5454, 8); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 5486, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 5516, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 5462, 7); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBU_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBU_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBU_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_BMYBU_SAVED_1;
+	case SOUND_PED_INNOCENT: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBU_INNOCENT_1, 2); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_BMYBU_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBU_FIGHT_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBU_DODGE_1, 10); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBU_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBU_CAR_CRASH_1, 7); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBU_BLOCKED_1, 8); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBU_EYEING_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBU_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBU_BUMP_1, 7); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6581,17 +6565,17 @@ cAudioManager::GetBFYPRTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 5369, 5); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 5374, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 5376;
-	case SOUND_PED_PLAYER_BEFORESEX: GetPhrase(sfx, ped->m_lastComment, 5362, 7); break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 5392, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 5355, 7); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 5348, 7); break;
-	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, 5379, 13); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 5377, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 5324, 11); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 5335, 13); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_BFYPR_GUN_COOL_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BFYPR_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_BFYPR_SAVED_1;
+	case SOUND_PED_PLAYER_BEFORESEX: GetPhrase(sfx, ped->m_lastComment, SFX_BFYPR_FUCKING_1, 7); break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_BFYPR_TAXI_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_BFYPR_FIGHT_1, 7); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BFYPR_DODGE_1, 7); break;
+	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, SFX_BFYPR_SOLICIT_1, 13); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_BFYPR_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BFYPR_BUMP_1, 11); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_BFYPR_CHAT_1, 13); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6603,17 +6587,17 @@ cAudioManager::GetBFOTRTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 5232, 6); break;
-	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, 5240, 3); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 5238, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 5243;
-	case SOUND_PED_TAXI_WAIT: return 5252;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 5226, 6); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 5217, 9); break;
-	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, 5247, 5); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 5244, 3); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 5192, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 5202, 15); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_BFOTR_GUN_COOL_1, 6); break;
+	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, SFX_BFOTR_MUGGING_1, 3); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BFOTR_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_BFOTR_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_BFOTR_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_BFOTR_FIGHT_1, 6); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BFOTR_DODGE_1, 9); break;
+	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, SFX_BFOTR_SOLICIT_1, 5); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_BFOTR_SHOCKED_1, 3); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BFOTR_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_BFOTR_CHAT_1, 15); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6625,16 +6609,16 @@ cAudioManager::GetBMOTRTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 6327, 5); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 6343, 1); break;
-	case SOUND_PED_UNK_126: GetPhrase(sfx, ped->m_lastComment, 6332, 4); break;
-	case SOUND_PED_TAXI_WAIT: return 6351;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 6313, 11); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 6336, 7); break;
-	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, 6344, 7); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 6324, 3); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 6293, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 6303, 10); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_BMOTR_GUN_COOL_1, 5); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_BMOTR_SAVED_1, 1); break;
+	case SOUND_PED_INNOCENT: GetPhrase(sfx, ped->m_lastComment, SFX_BMOTR_INNOCENT_1, 4); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_BMOTR_TAXI_1;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BMOTR_DODGE_1, 11); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_BMOTR_RUN_1, 7); break;
+	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, SFX_BMOTR_SOLICIT_1, 7); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_BMOTR_EYEING_1, 3); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BMOTR_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_BMOTR_CHAT_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6646,19 +6630,19 @@ cAudioManager::GetBMYPITalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 4033, 5); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 4044, 4); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 4038, 6); break;
-	case SOUND_PED_ROBBED: return 4048;
-	case SOUND_PED_ACCIDENTREACTION1: return 4049;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 4050, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 4012, 8); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 3998, 10); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 4020, 13); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 3993, 5); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 3978, 6); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 4008, 4); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 3984, 9); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_BMYPI_GUN_COOL_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_BMYPI_JACKING_1, 4); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BMYPI_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: return SFX_BMYPI_MUGGED_1;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_BMYPI_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_BMYPI_TAXI_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_BMYPI_FIGHT_1, 8); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYPI_DODGE_1, 10); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYPI_GENERIC_CRASH_1, 13); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BMYPI_CAR_CRASH_1, 5); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BMYPI_BLOCKED_1, 6); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYPI_EYEING_1, 4); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BMYPI_BUMP_1, 9); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6670,25 +6654,25 @@ cAudioManager::GetBMYBBTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 639, 5); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 659, 9); break;
-	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, 691, 8); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 648, 11); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 686, 5); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 699, 6); break;
-	case SOUND_PED_UNK_126: GetPhrase(sfx, ped->m_lastComment, 644, 4); break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 711, 3); break;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 618, 12); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 584, 18); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 630, 9); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 554, 9); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 524, 13); break;
-	case SOUND_PED_149: GetPhrase(sfx, ped->m_lastComment, 668, 16); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 684, 2); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 602, 16); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 705, 6); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 537, 17); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 563, 21); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_GUN_COOL_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_JACKING_1, 9); break;
+	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_MUGGING_1, 8); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_JACKED_1, 11); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_MUGGED_1, 5); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_SAVED_1, 6); break;
+	case SOUND_PED_INNOCENT: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_INNOCENT_1, 4); break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_TAXI_1, 3); break;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_FIGHT_1, 12); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_DODGE_1, 18); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_GENERIC_CRASH_1, 9); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_CAR_CRASH_1, 9); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_BLOCKED_1, 13); break;
+	case SOUND_PED_JEER: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_JEER_1, 16); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_LOST_1, 2); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_EYEING_1, 16); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_SHOCKED_1, 6); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_BUMP_1, 17); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_BMYBB_CHAT_1, 21); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6700,16 +6684,16 @@ cAudioManager::GetWMYCRTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 5056, 5); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 5061, 6); break;
-	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, 5070, 5); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 5067, 3); break;
-	case SOUND_PED_TAXI_WAIT: return 5075;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 5040, 7); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 5030, 10); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 5047, 9); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 5021, 9); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 5003, 18); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCR_GUN_COOL_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCR_JACKING_1, 6); break;
+	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCR_MUGGING_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCR_MUGGED_1, 3); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_WMYCR_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCR_FIGHT_1, 7); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCR_DODGE_1, 10); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCR_GENERIC_CRASH_1, 9); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCR_CAR_CRASH_1, 9); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCR_BUMP_1, 18); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6721,21 +6705,21 @@ cAudioManager::GetWFYSTTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 8445, 5); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 8456, 4); break;
-	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, 8463, 4); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 8450, 6); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 8461, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 8467;
-	case SOUND_PED_TAXI_WAIT: return 8468;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 8430, 7); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 8420, 10); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 8437, 8); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 8402, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 8386, 6); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: return 8460;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 8392, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 8410, 10); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_WFYST_GUN_COOL_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_WFYST_JACKING_1, 4); break;
+	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, SFX_WFYST_MUGGING_1, 4); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYST_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYST_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WFYST_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_WFYST_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFYST_FIGHT_1, 7); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYST_DODGE_1, 10); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYST_GENERIC_CRASH_1, 8); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WFYST_CAR_CRASH_1, 8); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYST_BLOCKED_1, 6); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: return SFX_WFYST_LOST_1;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYST_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYST_CHAT_1, 10); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6747,19 +6731,19 @@ cAudioManager::GetWFOSTTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 8354, 4); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 8358, 8); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 8369, 5); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 8381, 4); break;
-	case SOUND_PED_TAXI_WAIT: return 8385;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 8332, 12); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 8374, 7); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 8344, 10); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 8305, 11); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 8274, 12); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 8366, 3); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 8286, 19); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 8316, 16); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WFOST_GUN_PANIC_1, 4); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WFOST_JACKED_1, 8); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFOST_MUGGED_1, 5); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_WFOST_SAVED_1, 4); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_WFOST_TAXI_1;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFOST_DODGE_1, 12); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WFOST_RUN_1, 7); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WFOST_GENERIC_CRASH_1, 10); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WFOST_CAR_CRASH_1, 11); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WFOST_BLOCKED_1, 12); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFOST_LOST_1, 3); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFOST_BUMP_1, 19); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WFOST_CHAT_1, 16); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6771,22 +6755,22 @@ cAudioManager::GetWMYSTTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 3947, 5); break;
-	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, 3963, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 3955, 5); break;
-	case SOUND_PED_ROBBED: return 3962;
-	case SOUND_PED_ACCIDENTREACTION1: return 3975;
-	case SOUND_PED_UNK_126: GetPhrase(sfx, ped->m_lastComment, 3952, 3); break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 3976, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 3930, 10); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 3968, 7); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 3942, 5); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 3912, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 3893, 8); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 3960, 2); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 3940, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 3901, 11); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 3920, 10); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYST_GUN_PANIC_1, 5); break;
+	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, SFX_WMYST_MUGGING_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WMYST_JACKED_1, 5); break;
+	case SOUND_PED_ROBBED: return SFX_WMYST_MUGGED_1;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WMYST_SAVED_1;
+	case SOUND_PED_INNOCENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYST_INNOCENT_1, 3); break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYST_TAXI_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYST_DODGE_1, 10); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WMYST_RUN_1, 7); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYST_GENERIC_CRASH_1, 5); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WMYST_CAR_CRASH_1, 8); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYST_BLOCKED_1, 8); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMYST_LOST_1, 2); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYST_EYEING_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMYST_BUMP_1, 11); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYST_CHAT_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6798,22 +6782,22 @@ cAudioManager::GetWMOSTTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 5170, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 5178, 4); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 5188, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 5190;
-	case SOUND_PED_UNK_126: GetPhrase(sfx, ped->m_lastComment, 5175, 3); break;
-	case SOUND_PED_TAXI_WAIT: return 5191;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 5155, 8); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 5145, 8); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 5163, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 5129, 7); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 5111, 8); break;
-	case SOUND_PED_149: GetPhrase(sfx, ped->m_lastComment, 5182, 4); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 5186, 2); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 5153, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 5119, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 5136, 9); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_WMOST_GUN_COOL_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WMOST_JACKED_1, 4); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WMOST_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WMOST_SAVED_1;
+	case SOUND_PED_INNOCENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMOST_INNOCENT_1, 3); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_WMOST_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMOST_FIGHT_1, 8); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMOST_DODGE_1, 8); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WMOST_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WMOST_CAR_CRASH_1, 7); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WMOST_BLOCKED_1, 8); break;
+	case SOUND_PED_JEER: GetPhrase(sfx, ped->m_lastComment, SFX_WMOST_JEER_1, 4); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMOST_LOST_1, 2); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMOST_EYEING_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMOST_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WMOST_CHAT_1, 9); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6825,20 +6809,20 @@ cAudioManager::GetWFYRITalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 5299, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 5304, 7); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 5313, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 5320;
-	case SOUND_PED_TAXI_WAIT: return 5323;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 5280, 9); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 5315, 5); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 5291, 8); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 5271, 9); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 5253, 8); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 5311, 2); break;
-	case SOUND_153: GetPhrase(sfx, ped->m_lastComment, 5289, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 5321, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 5261, 10); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYRI_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYRI_JACKED_1, 7); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYRI_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WFYRI_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_WFYRI_TAXI_1;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYRI_DODGE_1, 9); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WFYRI_RUN_1, 5); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYRI_GENERIC_CRASH_1, 8); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WFYRI_CAR_CRASH_1, 9); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYRI_BLOCKED_1, 8); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFYRI_LOST_1, 2); break;
+	case SOUND_PED_CHAT_SEXY_FEMALE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYRI_EYEING_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYRI_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYRI_BUMP_1, 10); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6850,19 +6834,19 @@ cAudioManager::GetWFORITalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 7825, 6); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 7831, 6); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 7839, 3); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 7842;
-	case SOUND_PED_TAXI_WAIT: return 7846;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 7810, 7); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 7799, 11); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 7817, 8); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 7789, 10); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 7771, 7); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 7837, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 7843, 3); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 7778, 11); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WFORI_GUN_PANIC_1, 6); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WFORI_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFORI_MUGGED_1, 3); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WFORI_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_WFORI_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFORI_FIGHT_1, 7); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFORI_DODGE_1, 11); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WFORI_GENERIC_CRASH_1, 8); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WFORI_CAR_CRASH_1, 10); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WFORI_BLOCKED_1, 7); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFORI_LOST_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WFORI_SHOCKED_1, 3); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFORI_BUMP_1, 11); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6874,19 +6858,22 @@ cAudioManager::GetWMYRITalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 4186, 8); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 4194, 8); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 4208;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 4213, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 4163, 9); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 4203, 5); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 4175, 11); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 4144, 9); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 4126, 10); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: return 4202;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 4172, 3); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 4209, 4); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 4136, 8); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYRI_GUN_PANIC_1, 8); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WMYRI_JACKED_1, 8); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WMYRI_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYRI_TAXI_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYRI_DODGE_1, 9); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WMYRI_RUN_1, 5); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYRI_GENERIC_CRASH_1, 11); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WMYRI_CAR_CRASH_1, 9); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYRI_BLOCKED_1, 10); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: return SFX_WMYRI_LOST_1;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYRI_EYEING_1, 3); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYRI_SHOCKED_1, 4); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMYRI_BUMP_1, 8); break;
+#ifdef FIX_BUGS
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYRI_CHAT_1, 10); break;
+#endif
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6898,20 +6885,20 @@ cAudioManager::GetWMORITalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 6668, 9); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 6677, 6); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 6685, 4); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 6701, 2); break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 6707, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 6647, 10); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 6689, 12); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 6660, 8); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 6641, 6); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 6617, 10); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 6683, 2); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 6657, 3); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 6703, 4); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 6627, 14); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WMORI_GUN_PANIC_1, 9); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WMORI_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WMORI_MUGGED_1, 4); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_WMORI_SAVED_1, 2); break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_WMORI_TAXI_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMORI_DODGE_1, 10); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WMORI_RUN_1, 12); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WMORI_GENERIC_CRASH_1, 8); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WMORI_CAR_CRASH_1, 6); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WMORI_BLOCKED_1, 10); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMORI_LOST_1, 2); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMORI_EYEING_1, 3); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMORI_SHOCKED_1, 4); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMORI_BUMP_1, 14); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6923,18 +6910,18 @@ cAudioManager::GetWFYBETalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 7752, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 7757, 4); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 7766;
-	case SOUND_PED_TAXI_WAIT: return 7770;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 7738, 8); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 7761, 5); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 7746, 6); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 7722, 6); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 7704, 7); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 7767, 3); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 7711, 11); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 7728, 10); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBE_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBE_JACKED_1, 4); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WFYBE_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_WFYBE_TAXI_1;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBE_DODGE_1, 8); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBE_RUN_1, 5); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBE_GENERIC_CRASH_1, 6); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBE_CAR_CRASH_1, 6); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBE_BLOCKED_1, 7); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBE_SHOCKED_1, 3); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBE_BUMP_1, 11); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBE_CHAT_1, 10); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6946,20 +6933,20 @@ cAudioManager::GetWMYBETalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 8127, 8); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 8142, 3); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 8135, 7); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 8105, 12); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 8155, 5); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 8119, 8); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 8086, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 8063, 9); break;
-	case SOUND_PED_149: GetPhrase(sfx, ped->m_lastComment, 8145, 7); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 8152, 3); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 8117, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 8160, 6); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 8072, 14); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 8094, 11); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBE_GUN_PANIC_1, 8); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBE_JACKING_1, 3); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBE_JACKED_1, 7); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBE_DODGE_1, 12); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBE_RUN_1, 5); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBE_GENERIC_CRASH_1, 8); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBE_CAR_CRASH_1, 8); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBE_BLOCKED_1, 9); break;
+	case SOUND_PED_JEER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBE_JEER_1, 7); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBE_LOST_1, 3); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBE_EYEING_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBE_SHOCKED_1, 6); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBE_BUMP_1, 14); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBE_CHAT_1, 11); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6971,18 +6958,18 @@ cAudioManager::GetWFOBETalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 6093, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 6098, 4); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 6109, 3); break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 6115, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 6075, 8); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 6102, 7); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 6083, 10); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 6058, 7); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 6040, 8); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 6112, 3); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 6048, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 6065, 10); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WFOBE_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WFOBE_JACKED_1, 4); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_WFOBE_SAVED_1, 3); break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_WFOBE_TAXI_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFOBE_DODGE_1, 8); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WFOBE_RUN_1, 7); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WFOBE_GENERIC_CRASH_1, 10); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WFOBE_CAR_CRASH_1, 7); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WFOBE_BLOCKED_1, 8); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WFOBE_SHOCKED_1, 3); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFOBE_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WFOBE_CHAT_1, 10); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -6994,21 +6981,21 @@ cAudioManager::GetWMOBETalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 3759, 5); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 3772, 4); break;
-	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, 3792, 6); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 3764, 8); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 3802, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 3742, 8); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 3798, 4); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 3752, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 3724, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 3706, 6); break;
-	case SOUND_PED_149: GetPhrase(sfx, ped->m_lastComment, 3776, 16); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 3750, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 3804, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 3712, 12); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 3732, 10); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBE_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBE_JACKING_1, 4); break;
+	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBE_MUGGING_1, 6); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBE_JACKED_1, 8); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBE_SAVED_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBE_DODGE_1, 8); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBE_RUN_1, 4); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBE_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBE_CAR_CRASH_1, 8); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBE_BLOCKED_1, 6); break;
+	case SOUND_PED_JEER: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBE_JEER_1, 16); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBE_EYEING_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBE_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBE_BUMP_1, 12); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBE_CHAT_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7020,21 +7007,24 @@ cAudioManager::GetWMYCWTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 5650, 6); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 5670, 4); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 5659, 6); break;
-	case SOUND_PED_ROBBED: return 5676;
-	case SOUND_PED_TAXI_WAIT: return 5677;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 5635, 8); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 5622, 10); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 5643, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 5598, 9); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 5580, 9); break;
-	case SOUND_PED_149: GetPhrase(sfx, ped->m_lastComment, 5665, 5); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 5674, 2); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 5632, 3); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 5589, 9); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 5607, 15); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCW_GUN_PANIC_1, 6); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCW_JACKING_1, 4); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCW_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: return SFX_WMYCW_MUGGED_1;
+#ifdef FIX_BUGS
+	case SOUND_PED_INNOCENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCW_INNOCENT_1, 3); break;
+#endif
+	case SOUND_PED_TAXI_WAIT: return SFX_WMYCW_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCW_FIGHT_1, 8); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCW_DODGE_1, 10); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCW_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCW_CAR_CRASH_1, 9); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCW_BLOCKED_1, 9); break;
+	case SOUND_PED_JEER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCW_JEER_1, 5); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCW_LOST_1, 2); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCW_EYEING_1, 3); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCW_BUMP_1, 9); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYCW_CHAT_1, 15); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7046,19 +7036,19 @@ cAudioManager::GetWMYGOTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 7679, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 7684, 6); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 7690, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 7698;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 7701, 3); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 7659, 11); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 7692, 6); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 7672, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 7642, 7); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 7670, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 7699, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 7633, 9); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 7649, 10); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYGO_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WMYGO_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WMYGO_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WMYGO_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYGO_TAXI_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYGO_DODGE_1, 11); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WMYGO_RUN_1, 6); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYGO_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WMYGO_CAR_CRASH_1, 7); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYGO_EYEING_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYGO_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMYGO_BUMP_1, 9); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYGO_CHAT_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7070,18 +7060,18 @@ cAudioManager::GetWFOGOTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 7904, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 7909, 6); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 7915, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 7919;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 7883, 14); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 7874, 9); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 7917, 2); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 7897, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 7855, 8); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 7920, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 7847, 8); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 7863, 11); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WFOGO_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WFOGO_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFOGO_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WFOGO_SAVED_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFOGO_FIGHT_1, 14); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFOGO_DODGE_1, 9); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WFOGO_RUN_1, 2); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WFOGO_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WFOGO_CAR_CRASH_1, 8); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WFOGO_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFOGO_BUMP_1, 8); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WFOGO_CHAT_1, 11); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7093,19 +7083,19 @@ cAudioManager::GetWMOGOTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 4982, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 4987, 6); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 4998;
-	case SOUND_PED_TAXI_WAIT: return 5002;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 4961, 13); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 4947, 12); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 4993, 5); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 4974, 8); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 4929, 9); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 4959, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 4999, 3); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 4921, 8); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 4938, 9); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WMOGO_GUN_PANIC_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WMOGO_JACKED_1, 6); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WMOGO_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_WMOGO_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMOGO_FIGHT_1, 13); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMOGO_DODGE_1, 12); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WMOGO_RUN_1, 5); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WMOGO_GENERIC_CRASH_1, 8); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WMOGO_CAR_CRASH_1, 9); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMOGO_EYEING_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMOGO_SHOCKED_1, 3); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMOGO_BUMP_1, 8); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WMOGO_CHAT_1, 9); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7117,13 +7107,13 @@ cAudioManager::GetWFYLGTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 8267, 5); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 8272;
-	case SOUND_PED_TAXI_WAIT: return 8273;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 8260, 7); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 8252, 8); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 8232, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 8242, 10); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_WFYLG_GUN_COOL_1, 5); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WFYLG_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_WFYLG_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFYLG_FIGHT_1, 7); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYLG_DODGE_1, 8); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYLG_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYLG_CHAT_1, 10); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7135,13 +7125,13 @@ cAudioManager::GetWMYLGTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 3698, 6); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 3704;
-	case SOUND_PED_TAXI_WAIT: return 3705;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 3691, 7); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 3682, 9); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 3662, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 3672, 10); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_WMYLG_GUN_COOL_1, 6); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WMYLG_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_WMYLG_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMYLG_FIGHT_1, 7); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYLG_DODGE_1, 9); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMYLG_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYLG_CHAT_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7153,15 +7143,15 @@ cAudioManager::GetWFYBUTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 7309, 8); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 7317, 8); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 7325, 4); break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 7340, 2); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 7329, 8); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 7301, 8); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 7292, 9); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 7337, 3); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 7271, 21); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBU_GUN_PANIC_1, 8); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBU_JACKED_1, 8); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBU_MUGGED_1, 4); break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBU_TAXI_1, 2); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBU_RUN_1, 8); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBU_GENERIC_CRASH_1, 8); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBU_CAR_CRASH_1, 9); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBU_SHOCKED_1, 3); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYBU_BUMP_1, 21); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7173,22 +7163,26 @@ cAudioManager::GetWMYBUTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 3862, 6); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 3870, 5); break;
-	case SOUND_PED_ROBBED: return 3880;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 3884, 2); break;
-	case SOUND_PED_UNK_126: GetPhrase(sfx, ped->m_lastComment, 3868, 2); break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 3891, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 3845, 10); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 3881, 3); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 3857, 5); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 3826, 9); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 3706, 6); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 3875, 5); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 3855, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 3886, 5); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 3815, 11); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 3835, 10); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBU_GUN_PANIC_1, 6); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBU_JACKED_1, 5); break;
+	case SOUND_PED_ROBBED: return SFX_WMYBU_MUGGED_1;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBU_SAVED_1, 2); break;
+	case SOUND_PED_INNOCENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBU_INNOCENT_1, 2); break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBU_TAXI_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBU_DODGE_1, 10); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBU_RUN_1, 3); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBU_GENERIC_CRASH_1, 5); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBU_CAR_CRASH_1, 9); break;
+#ifdef FIX_BUGS
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBU_BLOCKED_1, 9); break;
+#else
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBE_BLOCKED_1, 6); break;
+#endif
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBU_LOST_1, 5); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBU_EYEING_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBU_SHOCKED_1, 5); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBU_BUMP_1, 11); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYBU_CHAT_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7200,19 +7194,19 @@ cAudioManager::GetWMOBUTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 6753, 6); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 6759, 7); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 6769, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 6771, 3); break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 6774, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 6743, 3); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 6733, 8); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 6746, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 6726, 7); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 6709, 7); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 6766, 3); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 6741, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 6716, 10); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBU_GUN_PANIC_1, 6); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBU_JACKED_1, 7); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBU_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBU_SAVED_1, 3); break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBU_TAXI_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBU_FIGHT_1, 3); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBU_DODGE_1, 8); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBU_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBU_CAR_CRASH_1, 7); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBU_BLOCKED_1, 7); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBU_LOST_1, 3); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBU_EYEING_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMOBU_BUMP_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7224,16 +7218,16 @@ cAudioManager::GetWFYPRTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 4101, 6); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 4107, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 4109;
-	case SOUND_PED_PLAYER_BEFORESEX: GetPhrase(sfx, ped->m_lastComment, 4096, 5); break;
-	case SOUND_PED_TAXI_WAIT: return 4125;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 4087, 9); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 4077, 10); break;
-	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, 4110, 15); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 4052, 11); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 4063, 14); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_WFYPR_GUN_COOL_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYPR_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WFYPR_SAVED_1;
+	case SOUND_PED_PLAYER_BEFORESEX: GetPhrase(sfx, ped->m_lastComment, SFX_WFYPR_FUCKING_1, 5); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_WFYPR_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFYPR_FIGHT_1, 9); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYPR_DODGE_1, 10); break;
+	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYPR_SOLICIT_1, 15); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYPR_BUMP_1, 11); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYPR_CHAT_1, 14); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7245,14 +7239,14 @@ cAudioManager::GetWFOTRTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 7371, 6); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 7383;
-	case SOUND_PED_TAXI_WAIT: return 7393;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 7362, 9); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 7377, 6); break;
-	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, 7384, 9); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 7342, 11); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 7353, 9); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_WFOTR_GUN_COOL_1, 6); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WFOTR_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_WFOTR_TAXI_1;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFOTR_DODGE_1, 9); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WFOTR_RUN_1, 6); break;
+	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, SFX_WFOTR_SOLICIT_1, 9); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFOTR_BUMP_1, 11); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WFOTR_CHAT_1, 9); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7264,16 +7258,16 @@ cAudioManager::GetWMOTRTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 7542, 5); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 7547;
-	case SOUND_PED_TAXI_WAIT: return 7558;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 7536, 6); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 7517, 17); break;
-	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, 7551, 7); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 7534, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 7548, 3); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 7494, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 7504, 13); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_WMOTR_GUN_COOL_1, 5); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WMOTR_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_WMOTR_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMOTR_FIGHT_1, 6); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMOTR_DODGE_1, 17); break;
+	case SOUND_PED_SOLICIT: GetPhrase(sfx, ped->m_lastComment, SFX_WMOTR_SOLICIT_1, 7); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMOTR_EYEING_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMOTR_SHOCKED_1, 3); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMOTR_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WMOTR_CHAT_1, 13); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7285,20 +7279,24 @@ cAudioManager::GetWMYPITalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 6496, 5); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 6509, 4); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 6503, 6); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 6513, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 6515, 2); break;
-	case SOUND_PED_UNK_126: GetPhrase(sfx, ped->m_lastComment, 6501, 2); break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 6517, 4); break;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 6479, 7); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 6465, 8); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 6488, 8); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 6457, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 6439, 8); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 6473, 6); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 6447, 10); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_WMYPI_GUN_COOL_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_WMYPI_JACKING_1, 4); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WMYPI_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WMYPI_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_WMYPI_SAVED_1, 2); break;
+	case SOUND_PED_INNOCENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYPI_INNOCENT_1, 2); break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYPI_TAXI_1, 4); break;
+#ifdef FIX_BUGS
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMYPI_FIGHT_1, 9); break;
+#else
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMYPI_FIGHT_1, 7); break;
+#endif
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYPI_DODGE_1, 8); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYPI_GENERIC_CRASH_1, 8); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WMYPI_CAR_CRASH_1, 8); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYPI_BLOCKED_1, 8); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYPI_EYEING_1, 6); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMYPI_BUMP_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7310,19 +7308,19 @@ cAudioManager::GetWMOCATalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 8032, 6); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 8048, 11); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 8038, 10); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 8059, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 8061;
-	case SOUND_PED_TAXI_WAIT: return 8062;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 8015, 8); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 8003, 10); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 8023, 9); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 7993, 10); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 7975, 12); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 8013, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 7987, 6); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WMOCA_GUN_PANIC_1, 6); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_WMOCA_JACKING_1, 11); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WMOCA_JACKED_1, 10); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WMOCA_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WMOCA_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_WMOCA_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMOCA_FIGHT_1, 8); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMOCA_DODGE_1, 10); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WMOCA_GENERIC_CRASH_1, 9); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WMOCA_CAR_CRASH_1, 10); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WMOCA_BLOCKED_1, 12); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMOCA_EYEING_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMOCA_BUMP_1, 6); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7333,12 +7331,12 @@ cAudioManager::GetWFYJGTalkSfx(CPed *ped, int16 sound)
 {
 	uint32 sfx;
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 7414, 4); break;
-	case SOUND_PED_ACCIDENTREACTION1: sfx = 7424; break;
-	case SOUND_PED_TAXI_WAIT: sfx = 7425; break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 7406, 8); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 7418, 6); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 7394, 12); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYJG_GUN_PANIC_1, 4); break;
+	case SOUND_PED_ACCIDENTREACTION1: sfx = SFX_WFYJG_SAVED_1; break;
+	case SOUND_PED_TAXI_WAIT: sfx = SFX_WFYJG_TAXI_1; break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYJG_DODGE_1, 8); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WFYJG_RUN_1, 6); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYJG_BUMP_1, 12); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7350,14 +7348,14 @@ cAudioManager::GetWMYJGTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 5098, 4); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 5102, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 5109;
-	case SOUND_PED_TAXI_WAIT: return 5110;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 5104, 5); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 5076, 10); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 5096, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 5086, 10); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_GUN_PANIC_1, 4); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WMYJG_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_WMYJG_TAXI_1;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_RUN_1, 5); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_BLOCKED_1, 10); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_EYEING_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMYJG_BUMP_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7369,14 +7367,14 @@ cAudioManager::GetWFYSKTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 3652, 5); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 3657, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 3659, 2); break;
-	case SOUND_PED_TAXI_WAIT: return 3661;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 3641, 11); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 3632, 9); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 3603, 11); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 3614, 18); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_GUN_PANIC_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_SAVED_1, 2); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_WFYSK_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_FIGHT_1, 11); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_DODGE_1, 9); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_BLOCKED_1, 11); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSK_BUMP_1, 18); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7388,18 +7386,18 @@ cAudioManager::GetWMYSKTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 5563, 5); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 5573, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 5575, 2); break;
-	case SOUND_PED_UNK_126: GetPhrase(sfx, ped->m_lastComment, 5568, 3); break;
-	case SOUND_PED_TAXI_WAIT: return 5579;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 5558, 5); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 5546, 10); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 5571, 2); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 5556, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 5577, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 5519, 14); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 5533, 13); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_GUN_PANIC_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_SAVED_1, 2); break;
+	case SOUND_PED_INNOCENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_INNOCENT_1, 3); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_WMYSK_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_FIGHT_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_DODGE_1, 10); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_LOST_1, 2); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_EYEING_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_BUMP_1, 14); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WMYSK_CHAT_1, 13); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7411,16 +7409,16 @@ cAudioManager::GetWFYSHTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 7459, 9); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 7470, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 7483, 4); break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 7492, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 7448, 11); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 7472, 11); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 7468, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 7487, 5); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 7426, 12); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 7438, 10); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSH_GUN_COOL_1, 9); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSH_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSH_SAVED_1, 4); break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSH_TAXI_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSH_DODGE_1, 11); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSH_RUN_1, 11); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSH_LOST_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSH_SHOCKED_1, 5); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSH_BUMP_1, 12); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYSH_CHAT_1, 10); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7432,16 +7430,16 @@ cAudioManager::GetWFOSHTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 3571, 10); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 3583, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 3594, 3); break;
-	case SOUND_PED_TAXI_WAIT: return 3602;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 3561, 10); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 3585, 9); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 3581, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 3597, 5); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 3542, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 3552, 9); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_WFOSH_GUN_COOL_1, 10); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFOSH_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_WFOSH_SAVED_1, 3); break;
+	case SOUND_PED_TAXI_WAIT: return SFX_WFOSH_TAXI_1;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFOSH_DODGE_1, 10); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WFOSH_RUN_1, 9); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFOSH_LOST_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_WFOSH_SHOCKED_1, 5); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFOSH_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WFOSH_CHAT_1, 9); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7453,20 +7451,20 @@ cAudioManager::GetJFOTOTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 811, 4); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 815, 5); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 821, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 828, 2); break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 831, 2); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 796, 9); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 823, 5); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 805, 6); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 775, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 757, 8); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: return 820;
-	case SOUND_PED_CHAT_EVENT: return 830;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 765, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 783, 13); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_JFOTO_GUN_PANIC_1, 4); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_JFOTO_JACKED_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_JFOTO_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_JFOTO_SAVED_1, 2); break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_JFOTO_TAXI_1, 2); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_JFOTO_DODGE_1, 9); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_JFOTO_RUN_1, 5); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_JFOTO_GENERIC_CRASH_1, 6); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_JFOTO_CAR_CRASH_1, 8); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_JFOTO_BLOCKED_1, 8); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: return SFX_JFOTO_LOST_1;
+	case SOUND_PED_CHAT_EVENT: return SFX_JFOTO_SHOCKED_1;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_JFOTO_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_JFOTO_CHAT_1, 13); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7478,20 +7476,20 @@ cAudioManager::GetJMOTOTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, 874, 4); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 878, 4); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 883, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 889;
-	case SOUND_PED_TAXI_WAIT: return 891;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 862, 6); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 885, 4); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 868, 6); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 849, 6); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 833, 8); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: return 882;
-	case SOUND_PED_CHAT_EVENT: return 890;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 841, 8); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 855, 7); break;
+	case SOUND_PED_HANDS_COWER: GetPhrase(sfx, ped->m_lastComment, SFX_JMOTO_GUN_PANIC_1, 4); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_JMOTO_JACKED_1, 4); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_JMOTO_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_JMOTO_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_JMOTO_TAXI_1;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_JMOTO_DODGE_1, 6); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_JMOTO_RUN_1, 4); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_JMOTO_GENERIC_CRASH_1, 6); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_JMOTO_CAR_CRASH_1, 6); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_JMOTO_BLOCKED_1, 8); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: return SFX_JMOTO_LOST_1;
+	case SOUND_PED_CHAT_EVENT: return SFX_JMOTO_SHOCKED_1;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_JMOTO_BUMP_1, 8); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_JMOTO_CHAT_1, 7); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7503,24 +7501,24 @@ cAudioManager::GetCBTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 2178, 5); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 2187, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 2183, 4); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 2194, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: sfx = 2196; break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 2197, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 2161, 9); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 2150, 9); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 2170, 8); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 2132, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 2113, 8); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 2192, 2); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 2159, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 2121, 11); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 2140, 10); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_GUN_COOL_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_JACKING_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_JACKED_1, 4); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: sfx = SFX_CUBAN_GANG_1_SAVED_1; break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_TAXI_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_FIGHT_1, 9); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_DODGE_1, 9); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_GENERIC_CRASH_1, 8); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_CAR_CRASH_1, 8); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_BLOCKED_1, 8); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_LOST_1, 2); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_EYEING_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_BUMP_1, 11); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_GANG_1_CHAT_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
-	return 86 * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
+	return (SFX_CUBAN_GANG_2_BLOCKED_1 - SFX_CUBAN_GANG_1_BLOCKED_1) * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
 }
 
 uint32
@@ -7529,24 +7527,24 @@ cAudioManager::GetHNTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 2692, 5); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 2703, 4); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 2697, 6); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 2711, 3); break;
-	case SOUND_PED_ACCIDENTREACTION1: sfx = 2714; break;
-	case SOUND_PED_TAXI_WAIT: sfx = 2715; break;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 2673, 10); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 2661, 10); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 2683, 9); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 2638, 9); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 2617, 9); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 2707, 4); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 2671, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 2626, 12); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 2647, 14); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_HAITIAN_GANG_1_GUN_COOL_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_HAITIAN_GANG_1_JACKING_1, 4); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_HAITIAN_GANG_1_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_HAITIAN_GANG_1_MUGGED_1, 3); break;
+	case SOUND_PED_ACCIDENTREACTION1: sfx = SFX_HAITIAN_GANG_1_SAVED_1; break;
+	case SOUND_PED_TAXI_WAIT: sfx = SFX_HAITIAN_GANG_1_TAXI_1; break;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_HAITIAN_GANG_1_FIGHT_1, 10); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_HAITIAN_GANG_1_DODGE_1, 10); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_HAITIAN_GANG_1_GENERIC_CRASH_1, 9); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_HAITIAN_GANG_1_CAR_CRASH_1, 9); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_HAITIAN_GANG_1_BLOCKED_1, 9); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_HAITIAN_GANG_1_LOST_1, 4); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_HAITIAN_GANG_1_EYEING_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_HAITIAN_GANG_1_BUMP_1, 12); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_HAITIAN_GANG_1_CHAT_1, 14); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
-	return 99 * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
+	return (SFX_HAITIAN_GANG_2_BLOCKED_1 - SFX_HAITIAN_GANG_1_BLOCKED_1) * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
 }
 
 uint32
@@ -7555,27 +7553,27 @@ cAudioManager::GetSGTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 1104, 5); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 1114, 5); break;
-	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, 1124, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 1109, 5); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 1121, 3); break;
-	case SOUND_PED_ACCIDENTREACTION1: sfx = 1129; break;
-	case SOUND_PED_TAXI_WAIT: sfx = 1132; break;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 1088, 10); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 1076, 9); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 1098, 6); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 1058, 6); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 1040, 8); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 1119, 2); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 1085, 3); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 1130, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 1048, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 1064, 12); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_STREET_GANG_1_GUN_COOL_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_STREET_GANG_1_JACKING_1, 5); break;
+	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, SFX_STREET_GANG_1_MUGGING_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_STREET_GANG_1_JACKED_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_STREET_GANG_1_MUGGED_1, 3); break;
+	case SOUND_PED_ACCIDENTREACTION1: sfx = SFX_STREET_GANG_1_SAVED_1; break;
+	case SOUND_PED_TAXI_WAIT: sfx = SFX_STREET_GANG_1_TAXI_1; break;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_STREET_GANG_1_FIGHT_1, 10); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_STREET_GANG_1_DODGE_1, 9); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_STREET_GANG_1_GENERIC_CRASH_1, 6); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_STREET_GANG_1_CAR_CRASH_1, 6); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_STREET_GANG_1_BLOCKED_1, 8); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_STREET_GANG_1_LOST_1, 2); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_STREET_GANG_1_EYEING_1, 3); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_STREET_GANG_1_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_STREET_GANG_1_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_STREET_GANG_1_CHAT_1, 12); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
 // LCS removed for now
-//	if(ped->GetModelIndex() == MI_SGB) sfx += 93;
+//	if(ped->GetModelIndex() == MI_SGB) sfx += (SFX_STREET_GANG_2_BLOCKED_1 - SFX_STREET_GANG_1_BLOCKED_1);
 	return sfx;
 }
 
@@ -7585,24 +7583,24 @@ cAudioManager::GetCLTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 1299, 5); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 1310, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 1304, 6); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 1317, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: sfx = 1319; break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 1320, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 1281, 10); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 1266, 13); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 1291, 8); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 1246, 10); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 1226, 10); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 1315, 2); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 1279, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 1236, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 1256, 10); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_LORD_GANG_1_GUN_COOL_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_LORD_GANG_1_JACKING_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_LORD_GANG_1_JACKED_1, 6); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_LORD_GANG_1_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: sfx = SFX_CUBAN_LORD_GANG_1_SAVED_1; break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_LORD_GANG_1_TAXI_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_LORD_GANG_1_FIGHT_1, 10); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_LORD_GANG_1_DODGE_1, 13); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_LORD_GANG_1_GENERIC_CRASH_1, 8); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_LORD_GANG_1_CAR_CRASH_1, 10); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_LORD_GANG_1_BLOCKED_1, 10); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_LORD_GANG_1_LOST_1, 2); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_LORD_GANG_1_EYEING_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_LORD_GANG_1_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_CUBAN_LORD_GANG_1_CHAT_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
-	return 96 * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
+	return (SFX_CUBAN_LORD_GANG_2_BLOCKED_1 - SFX_CUBAN_LORD_GANG_1_BLOCKED_1) * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
 }
 
 uint32
@@ -7611,18 +7609,18 @@ cAudioManager::GetGDTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 1762, 6); break;
-	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, 1770, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 1755, 7); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 1744, 9); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 1768, 2); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 1753, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 1772, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 1724, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 1734, 10); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_GUARD_DUTY_1_GUN_COOL_1, 6); break;
+	case SOUND_PED_ACCIDENTREACTION1: GetPhrase(sfx, ped->m_lastComment, SFX_GUARD_DUTY_1_SAVED_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_GUARD_DUTY_1_FIGHT_1, 7); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_GUARD_DUTY_1_DODGE_1, 9); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_GUARD_DUTY_1_LOST_1, 2); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_GUARD_DUTY_1_EYEING_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_GUARD_DUTY_1_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_GUARD_DUTY_1_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_GUARD_DUTY_1_CHAT_1, 10); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
-	return 50 * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
+	return (SFX_GUARD_DUTY_2_BUMP_1 - SFX_GUARD_DUTY_1_BUMP_1) * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
 }
 
 uint32
@@ -7631,22 +7629,22 @@ cAudioManager::GetBKTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 2429, 5); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 2442, 4); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 2434, 8); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 2448, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: sfx = 2450; break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 2451, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 2412, 9); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 2403, 9); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 2421, 8); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 2371, 10); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 2446, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 2381, 10); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 2391, 12); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_GUN_COOL_1, 5); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_JACKING_1, 4); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_JACKED_1, 8); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: sfx = SFX_BIKER_GANG_1_SAVED_1; break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_TAXI_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_FIGHT_1, 9); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_DODGE_1, 9); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_GENERIC_CRASH_1, 8); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_BLOCKED_1, 10); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_LOST_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_BUMP_1, 10); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_BIKER_GANG_1_CHAT_1, 12); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
-	return 82 * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
+	return (SFX_BIKER_GANG_2_BLOCKED_1 - SFX_BIKER_GANG_1_BLOCKED_1) * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
 }
 
 uint32
@@ -7655,25 +7653,25 @@ cAudioManager::GetPGTalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 1561, 4); break;
-	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, 1570, 5); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 1565, 5); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 1577, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: sfx = 1579; break;
-	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, 1582, 2); break;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 1551, 5); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 1542, 7); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 1556, 5); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 1529, 5); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 1514, 10); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 1575, 2); break;
-	case SOUND_PED_CHAT_SEXY: GetPhrase(sfx, ped->m_lastComment, 1549, 2); break;
-	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, 1580, 2); break;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 1524, 5); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 1534, 8); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_PLAYER_GANG_1_GUN_COOL_1, 4); break;
+	case SOUND_PED_CAR_JACKING: GetPhrase(sfx, ped->m_lastComment, SFX_PLAYER_GANG_1_JACKING_1, 5); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_PLAYER_GANG_1_JACKED_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_PLAYER_GANG_1_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: sfx = SFX_PLAYER_GANG_1_SAVED_1; break;
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_PLAYER_GANG_1_TAXI_1, 2); break;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_PLAYER_GANG_1_FIGHT_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_PLAYER_GANG_1_DODGE_1, 7); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_PLAYER_GANG_1_GENERIC_CRASH_1, 5); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_PLAYER_GANG_1_CAR_CRASH_1, 5); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_PLAYER_GANG_1_BLOCKED_1, 10); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_PLAYER_GANG_1_LOST_1, 2); break;
+	case SOUND_PED_CHAT_SEXY_MALE: GetPhrase(sfx, ped->m_lastComment, SFX_PLAYER_GANG_1_EYEING_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: GetPhrase(sfx, ped->m_lastComment, SFX_PLAYER_GANG_1_SHOCKED_1, 2); break;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_PLAYER_GANG_1_BUMP_1, 5); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_PLAYER_GANG_1_CHAT_1, 8); break;
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
-	return 70 * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
+	return (SFX_PLAYER_GANG_2_BLOCKED_1 - SFX_PLAYER_GANG_1_BLOCKED_1) * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
 }
 
 uint32
@@ -7683,18 +7681,18 @@ cAudioManager::GetVICETalkSfx(CPed *ped, int16 sound, int16 model)
 	if(model == MI_VICE6) {
 
 		switch(sound) {
-		case SOUND_PED_ARREST_COP: GetPhrase(sfx, ped->m_lastComment, 1894, 3); break;
-		case SOUND_PED_MIAMIVICE_EXITING_CAR: return 1897;
+		case SOUND_PED_ARREST_COP: GetPhrase(sfx, ped->m_lastComment, SFX_VICE_VOICE_6_ARREST_1, 3); break;
+		case SOUND_PED_MIAMIVICE_EXITING_CAR: return SFX_VICE_VOICE_6_MIAMIVICE_EXITING_CAR_1;
 		default: return GetGenericMaleTalkSfx(ped, sound);
 		}
 	}
 	switch(sound) {
-	case SOUND_PED_ARREST_COP: GetPhrase(sfx, ped->m_lastComment, 1874, 3); break;
-	case SOUND_PED_MIAMIVICE_EXITING_CAR: sfx = 1877; break;
+	case SOUND_PED_ARREST_COP: GetPhrase(sfx, ped->m_lastComment, SFX_VICE_VOICE_1_ARREST_1, 3); break;
+	case SOUND_PED_MIAMIVICE_EXITING_CAR: sfx = SFX_VICE_VOICE_1_MIAMIVICE_EXITING_CAR_1; break;
 
 	default: return GetGenericMaleTalkSfx(ped, sound);
 	}
-	sfx += 4 * (m_sQueueSample.m_nEntityIndex % 5);
+	sfx += (SFX_VICE_VOICE_2_ARREST_1-SFX_VICE_VOICE_1_ARREST_1) * (m_sQueueSample.m_nEntityIndex % 5);
 	return sfx;
 }
 
@@ -7704,23 +7702,23 @@ cAudioManager::GetWFYG1TalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 3383, 6); break;
-	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, 3399, 2); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 3389, 5); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 3397, 2); break;
-	case SOUND_PED_ACCIDENTREACTION1: return 3403;
-	case SOUND_PED_TAXI_WAIT: return 3405;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 3372, 4); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 3361, 9); break;
-	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, 3401, 2); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 3376, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 3342, 9); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 3324, 7); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, 3394, 3); break;
-	case SOUND_153: GetPhrase(sfx, ped->m_lastComment, 3370, 2); break;
-	case SOUND_PED_CHAT_EVENT: return 3404;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 3331, 11); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 3351, 10); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_GUN_COOL_1, 6); break;
+	case SOUND_PED_MUGGING: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_MUGGING_1, 2); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_JACKED_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_MUGGED_1, 2); break;
+	case SOUND_PED_ACCIDENTREACTION1: return SFX_WFYG1_SAVED_1;
+	case SOUND_PED_TAXI_WAIT: return SFX_WFYG1_TAXI_1;
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_FIGHT_1, 4); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_DODGE_1, 9); break;
+	case SOUND_PED_FLEE_RUN: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_RUN_1, 2); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_CAR_CRASH_1, 9); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_BLOCKED_1, 7); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_LOST_1, 3); break;
+	case SOUND_PED_CHAT_SEXY_FEMALE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_EYEING_1, 2); break;
+	case SOUND_PED_CHAT_EVENT: return SFX_WFYG1_SHOCKED_1;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_BUMP_1, 11); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG1_CHAT_1, 10); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 	return sfx;
@@ -7732,38 +7730,42 @@ cAudioManager::GetWFYG2TalkSfx(CPed *ped, int16 sound)
 	uint32 sfx;
 
 	switch(sound) {
-	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, 3464, 3); break;
-	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, 3467, 5); break;
-	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, 3473, 2); break;
-	case SOUND_PED_TAXI_WAIT: return 3476;
-	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, 3452, 5); break;
-	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, 3440, 8); break;
-	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, 3457, 7); break;
-	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, 3422, 9); break;
-	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, 3406, 5); break;
-	case SOUND_PED_WAIT_DOUBLEBACK: return 3472;
-	case SOUND_153: GetPhrase(sfx, ped->m_lastComment, 3448, 4); break;
-	case SOUND_PED_CHAT_EVENT: return 3475;
-	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, 3411, 11); break;
-	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 3431, 9); break;
+	case SOUND_PED_HANDS_UP: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_GUN_COOL_1, 3); break;
+	case SOUND_PED_CAR_JACKED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_JACKED_1, 5); break;
+	case SOUND_PED_ROBBED: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_MUGGED_1, 2); break;
+#ifdef FIX_BUGS
+	case SOUND_PED_TAXI_WAIT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_TAXI_1, 2); break;
+#else
+	case SOUND_PED_TAXI_WAIT: return SFX_WFYG2_TAXI_1;
+#endif
+	case SOUND_PED_ATTACK: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_FIGHT_1, 5); break;
+	case SOUND_PED_EVADE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_DODGE_1, 8); break;
+	case SOUND_PED_CRASH_VEHICLE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_GENERIC_CRASH_1, 7); break;
+	case SOUND_PED_CRASH_CAR: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_CAR_CRASH_1, 9); break;
+	case SOUND_PED_ANNOYED_DRIVER: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_BLOCKED_1, 5); break;
+	case SOUND_PED_WAIT_DOUBLEBACK: return SFX_WFYG2_LOST_1;
+	case SOUND_PED_CHAT_SEXY_FEMALE: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_EYEING_1, 4); break;
+	case SOUND_PED_CHAT_EVENT: return SFX_WFYG2_SHOCKED_1;
+	case SOUND_PED_PED_COLLISION: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_BUMP_1, 11); break;
+	case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, SFX_WFYG2_CHAT_1, 9); break;
 	default: return GetGenericFemaleTalkSfx(ped, sound);
 	}
 
 	return sfx;
 }
-
+*/
 uint32
 cAudioManager::GetGenericMaleTalkSfx(CPed *ped, int16 sound)
 {
 	uint32 sfx;
 
-	m_bGenericSfx = true;
+	m_bGenericSfx = TRUE;
 	switch(sound) {
-	case SOUND_PED_DEATH: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_MALE_DEATH_1, 41); break;
+	case SOUND_PED_DEATH: GetPhrase(sfx, ped->m_lastComment, SFX_MALE_DEATH_01, 28); break;
 	case SOUND_PED_BULLET_HIT:
-	case SOUND_PED_DEFEND: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_MALE_GRUNT_1, 41); break;
-	case SOUND_PED_BURNING: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_MALE_FIRE_1, 32); break;
-	case SOUND_PED_FLEE_SPRINT: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_MALE_PANIC_1, 35); break;
+	case SOUND_PED_DEFEND: GetPhrase(sfx, ped->m_lastComment, SFX_MALE_PAIN_01, 51); break;
+	case SOUND_PED_BURNING: GetPhrase(sfx, ped->m_lastComment, SFX_MALE_PAIN_ON_FIRE_01, 21); break;
+	case SOUND_PED_FLEE_SPRINT: GetPhrase(sfx, ped->m_lastComment, SFX_MALE_PANIC_01, 23); break;
 	default: return NO_SAMPLE;
 	}
 	return sfx;
@@ -7772,17 +7774,18 @@ cAudioManager::GetGenericMaleTalkSfx(CPed *ped, int16 sound)
 uint32
 cAudioManager::GetGenericFemaleTalkSfx(CPed *ped, int16 sound)
 {
-	uint32 sfx;
-	m_bGenericSfx = true;
-	switch(sound) {
-	case SOUND_PED_DEATH: GetPhrase(sfx, ped->m_lastComment, 2931, 22); break;
-	case SOUND_PED_BULLET_HIT:
-	case SOUND_PED_DEFEND: GetPhrase(sfx, ped->m_lastComment, 2953, 33); break;
-	case SOUND_PED_BURNING: GetPhrase(sfx, ped->m_lastComment, 2914, 17); break;
-	case SOUND_PED_FLEE_SPRINT: GetPhrase(sfx, ped->m_lastComment, 2986, 27); break;
-	default: return NO_SAMPLE;
-	}
-	return sfx;
+	return NO_SAMPLE;
+	//uint32 sfx;
+	//m_bGenericSfx = TRUE;
+	//switch(sound) {
+	//case SOUND_PED_DEATH: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_FEMALE_DEATH_1, 22); break;
+	//case SOUND_PED_BULLET_HIT:
+	//case SOUND_PED_DEFEND: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_FEMALE_GRUNT_1, 33); break;
+	//case SOUND_PED_BURNING: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_FEMALE_FIRE_1, 17); break;
+	//case SOUND_PED_FLEE_SPRINT: GetPhrase(sfx, ped->m_lastComment, SFX_GENERIC_FEMALE_PANIC_1, 27); break;
+	//default: return NO_SAMPLE;
+	//}
+	//return sfx;
 }
 
 void
@@ -7821,7 +7824,7 @@ cPedComments::Process()
 	uint32 sampleIndex;
 	uint8 actualUsedBank;
 	tPedComment *comment;
-	bool prevUsed = false;
+	bool8 prevUsed = FALSE;
 	static uint8 counter = 0;
 	static int32 prevSamples[10];
 
@@ -7832,7 +7835,7 @@ cPedComments::Process()
 			if(m_asPedComments[m_nActiveBank][m_nIndexMap[m_nActiveBank][0]].m_nSampleIndex ==
 			   prevSamples[(counter + 1 + i) % ARRAY_SIZE(prevSamples)]) {
 				m_asPedComments[m_nActiveBank][m_nIndexMap[m_nActiveBank][0]].m_nProcess = -1;
-				prevUsed = true;
+				prevUsed = TRUE;
 				break;
 			}
 		}
@@ -7852,19 +7855,21 @@ cPedComments::Process()
 				AudioManager.m_sQueueSample.m_nVolume = m_asPedComments[m_nActiveBank][m_nIndexMap[m_nActiveBank][0]].m_bVolume;
 				AudioManager.m_sQueueSample.m_fDistance = m_asPedComments[m_nActiveBank][m_nIndexMap[m_nActiveBank][0]].m_fDistance;
 				AudioManager.m_sQueueSample.m_nLoopCount = 1;
+#ifndef GTA_PS2
 				AudioManager.m_sQueueSample.m_nLoopStart = 0;
 				AudioManager.m_sQueueSample.m_nLoopEnd = -1;
+#endif
 				AudioManager.m_sQueueSample.m_nEmittingVolume = MAX_VOLUME;
 				AudioManager.m_sQueueSample.m_fSpeedMultiplier = 3.0f;
 				AudioManager.m_sQueueSample.m_fSoundIntensity = 40.0f;
-				AudioManager.m_sQueueSample.m_bReleasingSoundFlag = true;
+				AudioManager.m_sQueueSample.m_bReleasingSoundFlag = TRUE;
 				AudioManager.m_sQueueSample.m_vecPos = m_asPedComments[m_nActiveBank][m_nIndexMap[m_nActiveBank][0]].m_vecPos;
-				AudioManager.m_sQueueSample.m_bReverbFlag = true;
-				AudioManager.m_sQueueSample.m_bRequireReflection = true;
-				AudioManager.m_sQueueSample.m_bIs2D = false;
+				AudioManager.m_sQueueSample.m_bReverbFlag = TRUE;
+				AudioManager.m_sQueueSample.m_bRequireReflection = TRUE;
+				AudioManager.m_sQueueSample.m_bIs2D = FALSE;
 #ifdef FIX_BUGS
-				if (sampleIndex >= 8694 && sampleIndex < TOTAL_AUDIO_SAMPLES) { // check if player sfx, TODO: enum
-					AudioManager.m_sQueueSample.m_bIs2D = true;
+				if (sampleIndex >= SFX_TONI_ANGRY_BUSTED_01 && sampleIndex <= SFX_TONI_WISECRACKING_SHOOT_26) { // check if player sfx
+					AudioManager.m_sQueueSample.m_bIs2D = TRUE;
 					AudioManager.m_sQueueSample.m_nOffset = 63;
 				}
 #endif // FIX_BUGS
@@ -7877,19 +7882,19 @@ cPedComments::Process()
 				AudioManager.AddSampleToRequestedQueue();
 #if defined(GTA_PC) && !defined(FIX_BUGS)
 				m_nDelayTimer = CTimer::GetTimeInMilliseconds();
-				m_bDelay = true;
+				m_bDelay = TRUE;
 #endif
 			}
 		}
 	}
 
 	// Switch bank
-	if (m_nActiveBank) {
-		actualUsedBank = SFX_BANK_PED_COMMENTS;
-		m_nActiveBank = SFX_BANK_0;
+	if (m_nActiveBank == 0) {
+		actualUsedBank = 0;
+		m_nActiveBank = 1;
 	} else {
-		actualUsedBank = SFX_BANK_0;
-		m_nActiveBank = SFX_BANK_PED_COMMENTS;
+		actualUsedBank = 1;
+		m_nActiveBank = 0;
 	}
 	comment = m_asPedComments[actualUsedBank];
 	for (uint32 i = 0; i < m_nCommentsInBank[actualUsedBank]; i++) {
@@ -7905,7 +7910,7 @@ cPedComments::Process()
 	m_nCommentsInBank[actualUsedBank] = 0;
 #if defined(GTA_PC) && !defined(FIX_BUGS)
 	if(m_bDelay)
-		if(CTimer::GetTimeInMilliseconds() - m_nDelayTimer > 6000) m_bDelay = false;
+		if(CTimer::GetTimeInMilliseconds() - m_nDelayTimer > 6000) m_bDelay = FALSE;
 #endif
 }
 
@@ -7935,7 +7940,7 @@ cAudioManager::ProcessExplosions(int32 explosion)
 				m_sQueueSample.m_nFrequency = RandomDisplacement(1000) + 19000;
 				m_sQueueSample.m_nReleasingVolumeModificator = 0;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-				m_sQueueSample.m_bRequireReflection = true;
+				m_sQueueSample.m_bRequireReflection = TRUE;
 				break;
 			case EXPLOSION_MOLOTOV:
 				m_sQueueSample.m_fSoundIntensity = 150.0f;
@@ -7943,7 +7948,7 @@ cAudioManager::ProcessExplosions(int32 explosion)
 				m_sQueueSample.m_nFrequency = RandomDisplacement(1000) + 19000;
 				m_sQueueSample.m_nReleasingVolumeModificator = 0;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-				m_sQueueSample.m_bRequireReflection = false;
+				m_sQueueSample.m_bRequireReflection = FALSE;
 				break;
 			case EXPLOSION_MINE:
 			case EXPLOSION_HELI_BOMB:
@@ -7952,7 +7957,7 @@ cAudioManager::ProcessExplosions(int32 explosion)
 				m_sQueueSample.m_nFrequency = RandomDisplacement(1000) + 12347;
 				m_sQueueSample.m_nReleasingVolumeModificator = 0;
 				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-				m_sQueueSample.m_bRequireReflection = true;
+				m_sQueueSample.m_bRequireReflection = TRUE;
 				break;
 			default:
 				m_sQueueSample.m_fSoundIntensity = 200.0f;
@@ -7972,13 +7977,12 @@ cAudioManager::ProcessExplosions(int32 explosion)
 				if (m_sQueueSample.m_nVolume != 0) {
 					m_sQueueSample.m_nCounter = i;
 					m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-					m_sQueueSample.m_bIs2D = false;
+					m_sQueueSample.m_bIs2D = FALSE;
 					m_sQueueSample.m_nLoopCount = 1;
-					m_sQueueSample.m_bReleasingSoundFlag = true;
+					m_sQueueSample.m_bReleasingSoundFlag = TRUE;
 					m_sQueueSample.m_nEmittingVolume = MAX_VOLUME;
-					m_sQueueSample.m_nLoopStart = 0;
-					m_sQueueSample.m_nLoopEnd = -1;
-					m_sQueueSample.m_bReverbFlag = true;
+					RESET_LOOP_OFFSETS
+					m_sQueueSample.m_bReverbFlag = TRUE;
 					AddSampleToRequestedQueue();
 				}
 			}
@@ -8039,19 +8043,18 @@ cAudioManager::ProcessFires(int32)
 					m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 					m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 					m_sQueueSample.m_nReleasingVolumeDivider = 10;
-					m_sQueueSample.m_bIs2D = false;
+					m_sQueueSample.m_bIs2D = FALSE;
 					m_sQueueSample.m_nLoopCount = 0;
-					m_sQueueSample.m_bReleasingSoundFlag = false;
+					m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 					m_sQueueSample.m_nEmittingVolume = emittingVol;
-					m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-					m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
-					m_sQueueSample.m_bReverbFlag = true;
-					m_sQueueSample.m_bRequireReflection = false;
+					SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
+					m_sQueueSample.m_bReverbFlag = TRUE;
+					m_sQueueSample.m_bRequireReflection = FALSE;
 					AddSampleToRequestedQueue();
 				}
 			}
 			if (gFireManager.m_aFires[i].m_bExtinguishedWithWater) {
-				gFireManager.m_aFires[i].m_bExtinguishedWithWater = false;
+				gFireManager.m_aFires[i].m_bExtinguishedWithWater = FALSE;
 				emittingVol = 100.0f * gFireManager.m_aFires[i].m_fWaterExtinguishCountdown;
 				m_sQueueSample.m_nVolume = ComputeVolume(emittingVol, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 				if (m_sQueueSample.m_nVolume != 0) {
@@ -8063,14 +8066,13 @@ cAudioManager::ProcessFires(int32)
 					m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 					m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 					m_sQueueSample.m_nReleasingVolumeDivider = 10;
-					m_sQueueSample.m_bIs2D = false;
+					m_sQueueSample.m_bIs2D = FALSE;
 					m_sQueueSample.m_nLoopCount = 0;
-					m_sQueueSample.m_bReleasingSoundFlag = false;
+					m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 					m_sQueueSample.m_nEmittingVolume = emittingVol;
-					m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-					m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
-					m_sQueueSample.m_bReverbFlag = true;
-					m_sQueueSample.m_bRequireReflection = false;
+					SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
+					m_sQueueSample.m_bReverbFlag = TRUE;
+					m_sQueueSample.m_bRequireReflection = FALSE;
 					AddSampleToRequestedQueue();
 				}
 			}
@@ -8099,14 +8101,13 @@ cAudioManager::ProcessWaterCannon(int32)
 					m_sQueueSample.m_nCounter = i;
 					m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 					m_sQueueSample.m_nReleasingVolumeDivider = 8;
-					m_sQueueSample.m_bIs2D = false;
+					m_sQueueSample.m_bIs2D = FALSE;
 					m_sQueueSample.m_nLoopCount = 0;
-					m_sQueueSample.m_bReleasingSoundFlag = false;
+					m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 					m_sQueueSample.m_nEmittingVolume = 50;
-					m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-					m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
-					m_sQueueSample.m_bReverbFlag = true;
-					m_sQueueSample.m_bRequireReflection = false;
+					SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
+					m_sQueueSample.m_bReverbFlag = TRUE;
+					m_sQueueSample.m_bRequireReflection = FALSE;
 					AddSampleToRequestedQueue();
 				}
 			}
@@ -8120,38 +8121,37 @@ CVector aVecExtraSoundPosition[] = { CVector(-1042.546f, 88.794f, 11.324f), CVec
 void 
 cAudioManager::ProcessExtraSounds()
 {
-	const float SOUND_INTENSITY = 18.0f;
-	const uint8 EMITTING_VOLUME = 50;
-
-	float distance;
-
-	for (int i = 0; i < ARRAY_SIZE(aVecExtraSoundPosition); i++) {
-		m_sQueueSample.m_vecPos = aVecExtraSoundPosition[i];
-		distance = GetDistanceSquared(m_sQueueSample.m_vecPos);
-		if (distance < SQR(SOUND_INTENSITY)) {
-			m_sQueueSample.m_fDistance = Sqrt(distance);
-			m_sQueueSample.m_nVolume = ComputeVolume(EMITTING_VOLUME, SOUND_INTENSITY, m_sQueueSample.m_fDistance);
-			if (m_sQueueSample.m_nVolume != 0) {
-				m_sQueueSample.m_nCounter = i;
-				m_sQueueSample.m_nSampleIndex = SFX_ARCADE;
-				m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_ARCADE);
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_nLoopCount = 0;
-				m_sQueueSample.m_bReleasingSoundFlag = false;
-				m_sQueueSample.m_nReleasingVolumeModificator = 4;
-				m_sQueueSample.m_fSpeedMultiplier = 3.0f;
-				m_sQueueSample.m_nEmittingVolume = EMITTING_VOLUME;
-				m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(SFX_ARCADE);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(SFX_ARCADE);
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-				m_sQueueSample.m_bRequireReflection = false;
-				m_sQueueSample.m_nReleasingVolumeDivider = 3;
-				AddSampleToRequestedQueue();
-			}
-		}
-	}
+	//const float SOUND_INTENSITY = 18.0f;
+	//const uint8 EMITTING_VOLUME = 50;
+
+	//float distance;
+
+	//for (int i = 0; i < ARRAY_SIZE(aVecExtraSoundPosition); i++) {
+	//	m_sQueueSample.m_vecPos = aVecExtraSoundPosition[i];
+	//	distance = GetDistanceSquared(m_sQueueSample.m_vecPos);
+	//	if (distance < SQR(SOUND_INTENSITY)) {
+	//		m_sQueueSample.m_fDistance = Sqrt(distance);
+	//		m_sQueueSample.m_nVolume = ComputeVolume(EMITTING_VOLUME, SOUND_INTENSITY, m_sQueueSample.m_fDistance);
+	//		if (m_sQueueSample.m_nVolume != 0) {
+	//			m_sQueueSample.m_nCounter = i;
+	//			m_sQueueSample.m_nSampleIndex = SFX_ARCADE;
+	//			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
+	//			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_ARCADE);
+	//			m_sQueueSample.m_bIs2D = FALSE;
+	//			m_sQueueSample.m_nLoopCount = 0;
+	//			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
+	//			m_sQueueSample.m_nReleasingVolumeModificator = 4;
+	//			m_sQueueSample.m_fSpeedMultiplier = 3.0f;
+	//			m_sQueueSample.m_nEmittingVolume = EMITTING_VOLUME;
+	//			SET_LOOP_OFFSETS(SFX_ARCADE)
+	//			m_sQueueSample.m_bReverbFlag = TRUE;
+	//			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
+	//			m_sQueueSample.m_bRequireReflection = FALSE;
+	//			m_sQueueSample.m_nReleasingVolumeDivider = 3;
+	//			AddSampleToRequestedQueue();
+	//		}
+	//	}
+	//}
 }
 
 void
@@ -8179,14 +8179,13 @@ cAudioManager::ProcessEscalators()
 				m_sQueueSample.m_nReleasingVolumeDivider = 5;
 				m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
 				m_sQueueSample.m_nCounter = i;
-				m_sQueueSample.m_bIs2D = false;
+				m_sQueueSample.m_bIs2D = FALSE;
 				m_sQueueSample.m_nLoopCount = 0;
 				m_sQueueSample.m_nEmittingVolume = EMITTING_VOLUME;
-				m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(SFX_BOAT_V12_LOOP);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(SFX_BOAT_V12_LOOP);
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bReleasingSoundFlag = false;
-				m_sQueueSample.m_bRequireReflection = false;
+				SET_LOOP_OFFSETS(SFX_BOAT_V12_LOOP)
+				m_sQueueSample.m_bReverbFlag = TRUE;
+				m_sQueueSample.m_bReleasingSoundFlag = FALSE;
+				m_sQueueSample.m_bRequireReflection = FALSE;
 				AddSampleToRequestedQueue();
 			}
 		}
@@ -8231,8 +8230,8 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		emittingVolume = 60;
 		m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-		m_sQueueSample.m_bIs2D = false;
-		m_sQueueSample.m_bRequireReflection = true;
+		m_sQueueSample.m_bIs2D = FALSE;
+		m_sQueueSample.m_bRequireReflection = TRUE;
 		break;
 	case SCRIPT_SOUND_GARAGE_DOOR_CLUNK:
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
@@ -8243,8 +8242,8 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 4;
 		emittingVolume = 60;
 		m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-		m_sQueueSample.m_bIs2D = false;
-		m_sQueueSample.m_bRequireReflection = true;
+		m_sQueueSample.m_bIs2D = FALSE;
+		m_sQueueSample.m_bRequireReflection = TRUE;
 		break;
 	case SCRIPT_SOUND_SHOOTING_RANGE_TARGET_HIT:
 	case SCRIPT_SOUND_BULLET_HIT_GROUND_1:
@@ -8257,7 +8256,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 32);
 		m_sQueueSample.m_nReleasingVolumeModificator = 9;
 		m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		emittingVolume = m_anRandomTable[2] % 20 + 90;
 		break;
 	case SCRIPT_SOUND_WILLIE_CARD_SWIPE:
@@ -8268,8 +8267,8 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nFrequency = 20159;
 		m_sQueueSample.m_nReleasingVolumeModificator = 1;
 		m_sQueueSample.m_fSpeedMultiplier = 1.0f;
-		m_sQueueSample.m_bIs2D = false;
-		m_sQueueSample.m_bRequireReflection = false;
+		m_sQueueSample.m_bIs2D = FALSE;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		break;
 	case SCRIPT_SOUND_MALE_AMBULANCE_OUCH:
 	{
@@ -8293,20 +8292,20 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CAR_HORN_JEEP); // BUG?
 		m_sQueueSample.m_nReleasingVolumeModificator = 1;
 		m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-		m_sQueueSample.m_bIs2D = true;
-		m_sQueueSample.m_bRequireReflection = false;
-		break;
-	case SCRIPT_SOUND_PAYPHONE_RINGING:
-		m_sQueueSample.m_fSoundIntensity = 80.0f;
-		m_sQueueSample.m_nSampleIndex = SFX_PHONE_RING;
-		m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-		emittingVolume = 80;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_PHONE_RING);
-		m_sQueueSample.m_nReleasingVolumeModificator = 1;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		m_sQueueSample.m_bIs2D = false;
-		m_sQueueSample.m_bRequireReflection = false;
+		m_sQueueSample.m_bIs2D = TRUE;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		break;
+	//case SCRIPT_SOUND_PAYPHONE_RINGING:
+	//	m_sQueueSample.m_fSoundIntensity = 80.0f;
+	//	m_sQueueSample.m_nSampleIndex = SFX_PHONE_RING;
+	//	m_sQueueSample.m_nBankIndex = SFX_BANK_0;
+	//	emittingVolume = 80;
+	//	m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_PHONE_RING);
+	//	m_sQueueSample.m_nReleasingVolumeModificator = 1;
+	//	m_sQueueSample.m_fSpeedMultiplier = 2.0f;
+	//	m_sQueueSample.m_bIs2D = FALSE;
+	//	m_sQueueSample.m_bRequireReflection = FALSE;
+	//	break;
 	case SCRIPT_SOUND_GLASS_BREAK_L:
 		m_sQueueSample.m_fSoundIntensity = 60.0f;
 		m_sQueueSample.m_nSampleIndex = SFX_GLASS_SMASH;
@@ -8315,7 +8314,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_GLASS_SMASH);
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	case SCRIPT_SOUND_GLASS_BREAK_S:
 		m_sQueueSample.m_fSoundIntensity = 60.0f;
@@ -8325,7 +8324,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_GLASS_SMASH);
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	case SCRIPT_SOUND_GLASS_CRACK:
 		m_sQueueSample.m_fSoundIntensity = 60.0f;
@@ -8335,8 +8334,8 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_GLASS_CRACK);
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-		m_sQueueSample.m_bIs2D = false;
-		m_sQueueSample.m_bRequireReflection = true;
+		m_sQueueSample.m_bIs2D = FALSE;
+		m_sQueueSample.m_bRequireReflection = TRUE;
 		break;
 	case SCRIPT_SOUND_GLASS_LIGHT_BREAK:
 		m_sQueueSample.m_fSoundIntensity = 55.0f;
@@ -8345,7 +8344,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nFrequency = RandomDisplacement(2000) + 19000;
 		m_sQueueSample.m_nReleasingVolumeModificator = 9;
 		m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		emittingVolume = RandomDisplacement(11) + 25;
 		break;
 	case SCRIPT_SOUND_BOX_DESTROYED_1:
@@ -8355,8 +8354,8 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nFrequency = RandomDisplacement(1500) + 18600;
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-		m_sQueueSample.m_bIs2D = false;
-		m_sQueueSample.m_bRequireReflection = true;
+		m_sQueueSample.m_bIs2D = FALSE;
+		m_sQueueSample.m_bRequireReflection = TRUE;
 		emittingVolume = m_anRandomTable[2] % 20 + 80;
 		break;
 	case SCRIPT_SOUND_BOX_DESTROYED_2:
@@ -8366,8 +8365,8 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nFrequency = RandomDisplacement(1500) + 18600;
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-		m_sQueueSample.m_bIs2D = false;
-		m_sQueueSample.m_bRequireReflection = true;
+		m_sQueueSample.m_bIs2D = FALSE;
+		m_sQueueSample.m_bRequireReflection = TRUE;
 		emittingVolume = m_anRandomTable[2] % 20 + 80;
 		break;
 	case SCRIPT_SOUND_METAL_COLLISION:
@@ -8378,8 +8377,8 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-		m_sQueueSample.m_bIs2D = false;
-		m_sQueueSample.m_bRequireReflection = true;
+		m_sQueueSample.m_bIs2D = FALSE;
+		m_sQueueSample.m_bRequireReflection = TRUE;
 		emittingVolume = m_anRandomTable[2] % 30 + 70;
 		break;
 	case SCRIPT_SOUND_TIRE_COLLISION:
@@ -8390,8 +8389,8 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-		m_sQueueSample.m_bIs2D = false;
-		m_sQueueSample.m_bRequireReflection = true;
+		m_sQueueSample.m_bIs2D = FALSE;
+		m_sQueueSample.m_bRequireReflection = TRUE;
 		emittingVolume = m_anRandomTable[2] % 30 + 60;
 		break;
 	case SCRIPT_SOUND_HIT_BALL:
@@ -8402,8 +8401,8 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
 		m_sQueueSample.m_nReleasingVolumeModificator = 5;
 		m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-		m_sQueueSample.m_bIs2D = false;
-		m_sQueueSample.m_bRequireReflection = true;
+		m_sQueueSample.m_bIs2D = FALSE;
+		m_sQueueSample.m_bRequireReflection = TRUE;
 		emittingVolume = m_anRandomTable[2] % 30 + 60;
 		break;
 	case SCRIPT_SOUND_GUNSHELL_DROP:
@@ -8439,7 +8438,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_fSoundIntensity = 20.0f;
 		m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 		m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		emittingVolume = m_anRandomTable[2] % 20 + 30;
 		break;
 	case SCRIPT_SOUND_GUNSHELL_DROP_SOFT:
@@ -8449,7 +8448,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_fSoundIntensity = 20.0f;
 		m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 		m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		emittingVolume = m_anRandomTable[2] % 20 + 30;
 		break;
 	default:
@@ -8463,11 +8462,10 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		if (m_sQueueSample.m_nVolume != 0) {
 			m_sQueueSample.m_nCounter = iSound++;
 			m_sQueueSample.m_nLoopCount = 1;
-			m_sQueueSample.m_bReleasingSoundFlag = true;
+			m_sQueueSample.m_bReleasingSoundFlag = TRUE;
 			m_sQueueSample.m_nEmittingVolume = emittingVolume;
-			m_sQueueSample.m_nLoopStart = 0;
-			m_sQueueSample.m_nLoopEnd = -1;
-			m_sQueueSample.m_bReverbFlag = true;
+			RESET_LOOP_OFFSETS
+			m_sQueueSample.m_bReverbFlag = TRUE;
 			AddSampleToRequestedQueue();
 		}
 	}
@@ -8489,7 +8487,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 2;
 		m_sQueueSample.m_nReleasingVolumeDivider = 3;
 		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	case SCRIPT_SOUND_POLICE_CELL_DOOR_SLIDING_LOOP:
 	case SCRIPT_SOUND_GARAGE_DOOR_SLIDING_LOOP:
@@ -8501,7 +8499,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_nReleasingVolumeDivider = 3;
 		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	case SCRIPT_SOUND_SNORING_LOOP:
 		m_sQueueSample.m_fSoundIntensity = 6.0f;
@@ -8512,7 +8510,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 6;
 		m_sQueueSample.m_nReleasingVolumeDivider = 3;
 		m_sQueueSample.m_fSpeedMultiplier = 3.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	case SCRIPT_SOUND_SHOOTING_RANGE_TARGET_MOVING_LOOP:
 		m_sQueueSample.m_fSoundIntensity = 40.0f;
@@ -8523,7 +8521,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 4;
 		m_sQueueSample.m_nReleasingVolumeDivider = 3;
 		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	case SCRIPT_SOUND_NEW_BUILDING_BAR_1:
 		m_sQueueSample.m_nSampleIndex = SFX_BUILDING_BAR_1;
@@ -8534,7 +8532,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_nReleasingVolumeDivider = 15;
 		m_sQueueSample.m_fSpeedMultiplier = 4.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	case SCRIPT_SOUND_NEW_BUILDING_BAR_2:
 		m_sQueueSample.m_nSampleIndex = SFX_BUILDING_BAR_2;
@@ -8545,7 +8543,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_nReleasingVolumeDivider = 15;
 		m_sQueueSample.m_fSpeedMultiplier = 4.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	case SCRIPT_SOUND_NEW_BUILDING_BAR_3:
 		m_sQueueSample.m_nSampleIndex = SFX_BUILDING_BAR_3;
@@ -8556,7 +8554,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_nReleasingVolumeDivider = 15;
 		m_sQueueSample.m_fSpeedMultiplier = 4.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	case SCRIPT_SOUND_NEW_BUILDING_BAR_4:
 		m_sQueueSample.m_nSampleIndex = SFX_BUILDING_BAR_4;
@@ -8567,7 +8565,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_nReleasingVolumeDivider = 15;
 		m_sQueueSample.m_fSpeedMultiplier = 4.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	case SCRIPT_SOUND_NEW_BUILDING_MALIBU_1:
 		if(MusicManager.m_nPlayingTrack == STREAMED_SOUND_MALIBU_AMBIENT) return;
@@ -8580,7 +8578,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_nReleasingVolumeDivider = 15;
 		m_sQueueSample.m_fSpeedMultiplier = 4.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	case SCRIPT_SOUND_NEW_BUILDING_MALIBU_2:
 		if(MusicManager.m_nPlayingTrack == STREAMED_SOUND_MALIBU_AMBIENT) return;
@@ -8593,7 +8591,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_nReleasingVolumeDivider = 15;
 		m_sQueueSample.m_fSpeedMultiplier = 4.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	case SCRIPT_SOUND_NEW_BUILDING_MALIBU_3:
 		if(MusicManager.m_nPlayingTrack == STREAMED_SOUND_MALIBU_AMBIENT) return;
@@ -8606,7 +8604,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_nReleasingVolumeDivider = 15;
 		m_sQueueSample.m_fSpeedMultiplier = 4.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	case SCRIPT_SOUND_NEW_BUILDING_STRIP_1:
 		if(MusicManager.m_nPlayingTrack == STREAMED_SOUND_STRIPCLUB_AMBIENT) return;
@@ -8619,7 +8617,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_nReleasingVolumeDivider = 15;
 		m_sQueueSample.m_fSpeedMultiplier = 4.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	case SCRIPT_SOUND_NEW_BUILDING_STRIP_2:
 		if(MusicManager.m_nPlayingTrack == STREAMED_SOUND_STRIPCLUB_AMBIENT) return;
@@ -8632,7 +8630,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_nReleasingVolumeDivider = 15;
 		m_sQueueSample.m_fSpeedMultiplier = 4.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	case SCRIPT_SOUND_NEW_BUILDING_STRIP_3:
 		if(MusicManager.m_nPlayingTrack == STREAMED_SOUND_STRIPCLUB_AMBIENT) return;
@@ -8645,7 +8643,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_nReleasingVolumeDivider = 15;
 		m_sQueueSample.m_fSpeedMultiplier = 4.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	case SCRIPT_SOUND_NEW_BUILDING_CHURCH:
 		m_sQueueSample.m_nSampleIndex = SFX_BUILDING_CHURCH;
@@ -8656,7 +8654,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 3;
 		m_sQueueSample.m_nReleasingVolumeDivider = 15;
 		m_sQueueSample.m_fSpeedMultiplier = 4.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	case SCRIPT_SOUND_NEW_WATERFALL:
 		emittingVolume = 30;
@@ -8667,7 +8665,7 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 4;
 		m_sQueueSample.m_nReleasingVolumeDivider = 9;
 		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		m_sQueueSample.m_bIs2D = false;
+		m_sQueueSample.m_bIs2D = FALSE;
 		break;
 	default: return;
 	}
@@ -8678,14 +8676,13 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nVolume = ComputeVolume(emittingVolume, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 		if(m_sQueueSample.m_nVolume != 0) {
 			m_sQueueSample.m_nCounter = 0;
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nLoopCount = 0;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
-			m_sQueueSample.m_bReverbFlag = true;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
+			m_sQueueSample.m_bReverbFlag = TRUE;
 			m_sQueueSample.m_nEmittingVolume = emittingVolume;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_bRequireReflection = false;
+			SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			AddSampleToRequestedQueue();
 		}
 	}
@@ -8723,14 +8720,13 @@ cAudioManager::ProcessWeather(int32 id)
 		m_sQueueSample.m_nCounter = iSound++;
 		m_sQueueSample.m_nReleasingVolumeModificator = 0;
 		m_sQueueSample.m_nOffset = (m_anRandomTable[2] & 15) + 55;
-		m_sQueueSample.m_bIs2D = true;
+		m_sQueueSample.m_bIs2D = TRUE;
 		m_sQueueSample.m_nLoopCount = 1;
-		m_sQueueSample.m_bReleasingSoundFlag = true;
+		m_sQueueSample.m_bReleasingSoundFlag = TRUE;
 		m_sQueueSample.m_nEmittingVolume = m_sQueueSample.m_nVolume;
-		m_sQueueSample.m_nLoopStart = 0;
-		m_sQueueSample.m_nLoopEnd = -1;
-		m_sQueueSample.m_bReverbFlag = false;
-		m_sQueueSample.m_bRequireReflection = false;
+		RESET_LOOP_OFFSETS
+		m_sQueueSample.m_bReverbFlag = FALSE;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		AddSampleToRequestedQueue();
 	}
 	if (CWeather::Rain > 0.0f && (!CCullZones::CamNoRain() || !CCullZones::PlayerNoRain())) {
@@ -8741,15 +8737,14 @@ cAudioManager::ProcessWeather(int32 id)
 		m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 		m_sQueueSample.m_nReleasingVolumeModificator = 0;
 		m_sQueueSample.m_nOffset = 63;
-		m_sQueueSample.m_bIs2D = true;
+		m_sQueueSample.m_bIs2D = TRUE;
 		m_sQueueSample.m_nLoopCount = 0;
-		m_sQueueSample.m_bReleasingSoundFlag = false;
+		m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 		m_sQueueSample.m_nReleasingVolumeDivider = 30;
-		m_sQueueSample.m_bReverbFlag = false;
+		m_sQueueSample.m_bReverbFlag = FALSE;
 		m_sQueueSample.m_nEmittingVolume = m_sQueueSample.m_nVolume;
-		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_bRequireReflection = false;
+		SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		AddSampleToRequestedQueue();
 	}
 	x = 0.0f;
@@ -8766,15 +8761,14 @@ cAudioManager::ProcessWeather(int32 id)
 		m_sQueueSample.m_nBankIndex = SFX_BANK_0;
 		m_sQueueSample.m_nReleasingVolumeModificator = 1;
 		m_sQueueSample.m_nOffset = 63;
-		m_sQueueSample.m_bIs2D = true;
+		m_sQueueSample.m_bIs2D = TRUE;
 		m_sQueueSample.m_nLoopCount = 0;
-		m_sQueueSample.m_bReleasingSoundFlag = false;
+		m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 		m_sQueueSample.m_nReleasingVolumeDivider = 7;
-		m_sQueueSample.m_bReverbFlag = false;
+		m_sQueueSample.m_bReverbFlag = FALSE;
 		m_sQueueSample.m_nEmittingVolume = m_sQueueSample.m_nVolume;
-		m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_bRequireReflection = false;
+		SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		AddSampleToRequestedQueue();
 		CObject::fDistToNearestTree = 999999.9f;
 	}
@@ -8783,11 +8777,11 @@ cAudioManager::ProcessWeather(int32 id)
 void
 cAudioManager::ProcessFrontEnd()
 {
-	bool stereo;
-	bool processedPickup;
-	bool processedMission;
-	bool staticFreq;
-	bool center;
+	bool8 stereo;
+	bool8 processedPickup;
+	bool8 processedMission;
+	bool8 staticFreq;
+	bool8 center;
 	int16 sample;
 
 	static uint8 iSound = 0;
@@ -8796,11 +8790,11 @@ cAudioManager::ProcessFrontEnd()
 	static uint32 radioDial = SFX_RADIO_DIAL_1;
 
 	for (uint32 i = 0; i < m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_AudioEvents; i++) {
-		staticFreq = false;
-		processedPickup = false;
-		center = false;
-		processedMission = false;
-		stereo = false;
+		staticFreq = FALSE;
+		processedPickup = FALSE;
+		center = FALSE;
+		processedMission = FALSE;
+		stereo = FALSE;
 		switch (m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i]) {
 		case SOUND_WEAPON_SNIPER_SHOT_NO_ZOOM:
 			m_sQueueSample.m_nSampleIndex = SFX_ERROR_FIRE_RIFLE;
@@ -8812,9 +8806,9 @@ cAudioManager::ProcessFrontEnd()
 		case SOUND_GARAGE_BAD_VEHICLE:
 		case SOUND_GARAGE_BOMB_ALREADY_SET:
 			m_sQueueSample.m_nSampleIndex = SFX_WEAPON_LEFT;
-			stereo = true;
-			staticFreq = true;
-			center = true;
+			stereo = TRUE;
+			staticFreq = TRUE;
+			center = TRUE;
 			break;
 		case SOUND_GARAGE_OPENING:
 		case SOUND_71: //case SOUND_41:
@@ -8822,8 +8816,8 @@ cAudioManager::ProcessFrontEnd()
 		case SOUND_GARAGE_VEHICLE_ACCEPTED:
 		case SOUND_EVIDENCE_PICKUP:
 		case SOUND_UNLOAD_GOLD:
-			stereo = true;
-			processedPickup = true;
+			stereo = TRUE;
+			processedPickup = TRUE;
 			m_sQueueSample.m_nSampleIndex = SFX_MONEY_LEFT;
 			break;
 		case SOUND_GARAGE_BOMB1_SET:
@@ -8831,70 +8825,70 @@ cAudioManager::ProcessFrontEnd()
 		case SOUND_GARAGE_BOMB3_SET:
 		case SOUND_PICKUP_WEAPON_BOUGHT:
 		case SOUND_PICKUP_WEAPON:
-			center = true;
-			processedPickup = true;
+			center = TRUE;
+			processedPickup = TRUE;
 			m_sQueueSample.m_nSampleIndex = SFX_WEAPON_LEFT;
-			stereo = true;
+			stereo = TRUE;
 			break;
 		case SOUND_PICKUP_HEALTH:
 		case SOUND_81: //case SOUND_4B:
 		case SOUND_PICKUP_ADRENALINE:
 		case SOUND_PICKUP_ARMOUR:
-			stereo = true;
-			processedPickup = true;
+			stereo = TRUE;
+			processedPickup = TRUE;
 			m_sQueueSample.m_nSampleIndex = SFX_MONEY_LEFT;
 			break;
 		case SOUND_80:
-			stereo = true;
-			processedPickup = true;
+			stereo = TRUE;
+			processedPickup = TRUE;
 			m_sQueueSample.m_nSampleIndex = SFX_WEAPON_LEFT;
-			center = true;
-			staticFreq = true;
+			center = TRUE;
+			staticFreq = TRUE;
 			break;
 		case SOUND_PICKUP_BONUS:
 		case SOUND_FRONTEND_MENU_STARTING:
-		case SOUND_HUD_SOUND:
-			stereo = true;
-			m_sQueueSample.m_nSampleIndex = SFX_INFO_LEFT;
-			center = true;
+		case SOUND_HUD:
+			stereo = TRUE;
+			m_sQueueSample.m_nSampleIndex = SFX_FE_INFO_LEFT;
+			center = TRUE;
 			break;
 		case SOUND_PICKUP_MONEY:
-			stereo = true;
-			processedPickup = true;
+			stereo = TRUE;
+			processedPickup = TRUE;
 			m_sQueueSample.m_nSampleIndex = SFX_MONEY_LEFT;
 			break;
 		case SOUND_PICKUP_HIDDEN_PACKAGE:
 		case SOUND_PICKUP_PACMAN_PILL:
 		case SOUND_PICKUP_PACMAN_PACKAGE:
 		case SOUND_PICKUP_FLOAT_PACKAGE:
-			center = true;
-			processedPickup = true;
+			center = TRUE;
+			processedPickup = TRUE;
 			m_sQueueSample.m_nSampleIndex = SFX_PART_MISSION_COMPLETE_LEFT;
-			stereo = true;
+			stereo = TRUE;
 			break;
 		case SOUND_RACE_START_3:
 		case SOUND_RACE_START_2:
 		case SOUND_RACE_START_1:
 		case SOUND_PART_MISSION_COMPLETE:
-			stereo = true;
+			stereo = TRUE;
 			m_sQueueSample.m_nSampleIndex = SFX_PART_MISSION_COMPLETE_LEFT;
-			processedMission = true;
-			center = true;
+			processedMission = TRUE;
+			center = TRUE;
 			break;
 		case SOUND_RACE_START_GO:
-			stereo = true;
+			stereo = TRUE;
 			m_sQueueSample.m_nSampleIndex = SFX_GO_LEFT;
-			center = true;
+			center = TRUE;
 			break;
 		case SOUND_CLOCK_TICK:
 			m_sQueueSample.m_nSampleIndex = SFX_TIMER;
 			break;
-		case SOUND_FRONTEND_NO_RADIO:
-		case SOUND_FRONTEND_RADIO_CHANGE:
+		case SOUND_FRONTEND_RADIO_TURN_OFF:
+		case SOUND_FRONTEND_RADIO_TURN_ON:
 			m_sQueueSample.m_nSampleIndex = SFX_RADIO_CLICK;
 			break;
-		case SOUND_FRONTEND_RADIO_CHANGE_2:
-			m_sQueueSample.m_nSampleIndex = SFX_HURRICANE_MA;
+		case SOUND_FRONTEND_HURRICANE:
+			//m_sQueueSample.m_nSampleIndex = SFX_HURRICANE_MA;
 			break;
 		case SOUND_BULLETTRACE_1:
 		case SOUND_BULLETTRACE_2:
@@ -8905,24 +8899,24 @@ cAudioManager::ProcessFrontEnd()
 			break;
 		case SOUND_RADIO_CHANGE:
 			m_sQueueSample.m_nSampleIndex = (m_anRandomTable[1] % 2) ? radioDial + 1 : radioDial + 2;
-			if (m_sQueueSample.m_nSampleIndex > SFX_RADIO_DIAL_12)
-				m_sQueueSample.m_nSampleIndex -= 12;
+			if (m_sQueueSample.m_nSampleIndex > SFX_RADIO_DIAL_3)
+				m_sQueueSample.m_nSampleIndex -= 3;
 			radioDial = m_sQueueSample.m_nSampleIndex;
 			break;
 		case SOUND_FRONTEND_HIGHLIGHT_OPTION:
-			stereo = true;
-			m_sQueueSample.m_nSampleIndex = SFX_FE_HIGHLIGHT_LEFT;
+			//stereo = TRUE;
+			m_sQueueSample.m_nSampleIndex = SFX_FE_HIGHLIGHT;
 			break;
 		case SOUND_FRONTEND_ENTER_OR_ADJUST:
-			stereo = true;
-			m_sQueueSample.m_nSampleIndex = SFX_FE_SELECT_LEFT;
+			//stereo = TRUE;
+			m_sQueueSample.m_nSampleIndex = SFX_FE_SELECT;
 			break;
 		case SOUND_FRONTEND_BACK:
-			stereo = true;
-			m_sQueueSample.m_nSampleIndex = SFX_FE_BACK_LEFT;
+			//stereo = TRUE;
+			m_sQueueSample.m_nSampleIndex = SFX_FE_BACK;
 			break;
 		case SOUND_FRONTEND_FAIL:
-			stereo = true;
+			stereo = TRUE;
 			m_sQueueSample.m_nSampleIndex = SFX_FE_ERROR_LEFT;
 			break;
 		case SOUND_FRONTEND_AUDIO_TEST:
@@ -8944,9 +8938,9 @@ cAudioManager::ProcessFrontEnd()
 
 		sample = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i];
 
-		if (sample == SOUND_FRONTEND_NO_RADIO)
+		if (sample == SOUND_FRONTEND_RADIO_TURN_OFF)
 			m_sQueueSample.m_nFrequency = 28509;
-		else if (sample == SOUND_FRONTEND_RADIO_CHANGE)
+		else if (sample == SOUND_FRONTEND_RADIO_TURN_ON)
 			m_sQueueSample.m_nFrequency = 32000;
 		else if (sample == SOUND_BULLETTRACE_1 || sample == SOUND_BULLETTRACE_2) {
 			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
@@ -8957,38 +8951,38 @@ cAudioManager::ProcessFrontEnd()
 			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 
 		m_sQueueSample.m_nVolume = 127;
-		if (m_sQueueSample.m_nSampleIndex == SFX_HURRICANE_MA && CWeather::Wind > 1.0f)
-			m_sQueueSample.m_nVolume = (CWeather::Wind - 1.0f) * m_sQueueSample.m_nVolume;
+		//if (m_sQueueSample.m_nSampleIndex == SFX_HURRICANE_MA && CWeather::Wind > 1.0f)
+		//	m_sQueueSample.m_nVolume = (CWeather::Wind - 1.0f) * m_sQueueSample.m_nVolume;
 		m_sQueueSample.m_nCounter = iSound++;
 		m_sQueueSample.m_nLoopCount = 1;
-		m_sQueueSample.m_bReleasingSoundFlag = true;
+		m_sQueueSample.m_bReleasingSoundFlag = TRUE;
 		m_sQueueSample.m_nBankIndex = SFX_BANK_FRONT_END_MENU;
 		m_sQueueSample.m_nReleasingVolumeModificator = 0;
-		m_sQueueSample.m_bIs2D = true;
+		m_sQueueSample.m_bIs2D = TRUE;
 		m_sQueueSample.m_nEmittingVolume = m_sQueueSample.m_nVolume;
-		m_sQueueSample.m_nLoopStart = 0;
-		m_sQueueSample.m_nLoopEnd = -1;
-		m_sQueueSample.m_fDistance = 1.0f;
-		if (stereo) 
+		RESET_LOOP_OFFSETS
+		if (stereo) {
 			m_sQueueSample.m_nOffset = 0;
-		else {
+			m_sQueueSample.m_fDistance = 1.0f;
+		} else {
 			sample = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i];
 			if (sample == SOUND_BULLETTRACE_1) {
 				m_sQueueSample.m_nOffset = 20;
 				m_sQueueSample.m_nVolume = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i];
 				m_sQueueSample.m_nReleasingVolumeModificator = 10;
 				m_sQueueSample.m_fDistance = 100.0f;
-			}
-			if (sample == SOUND_BULLETTRACE_2) {
+			} else if (sample == SOUND_BULLETTRACE_2) {
 				m_sQueueSample.m_nOffset = 107;
 				m_sQueueSample.m_nVolume = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i];
 				m_sQueueSample.m_nReleasingVolumeModificator = 10;
 				m_sQueueSample.m_fDistance = 100.0f;
+			} else {
+				m_sQueueSample.m_nOffset = 63;
+				m_sQueueSample.m_fDistance = 1.0f;
 			}
-			m_sQueueSample.m_nOffset = 63;
 		}
-		m_sQueueSample.m_bReverbFlag = false;
-		m_sQueueSample.m_bRequireReflection = false;
+		m_sQueueSample.m_bReverbFlag = FALSE;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 		AddSampleToRequestedQueue();
 		if (stereo) {
 			++m_sQueueSample.m_nSampleIndex;
@@ -9011,7 +9005,7 @@ cAudioManager::ProcessCrane()
 {
 	CCrane *crane = (CCrane *)m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_pEntity;
 	float distSquared;
-	bool distCalculated = false;
+	bool8 distCalculated = FALSE;
 	static const int intensity = 80;
 
 	if (crane) {
@@ -9026,19 +9020,18 @@ cAudioManager::ProcessCrane()
 						m_sQueueSample.m_nCounter = 0;
 						m_sQueueSample.m_nSampleIndex = SFX_CRANE_MAGNET;
 						m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-						m_sQueueSample.m_bIs2D = false;
+						m_sQueueSample.m_bIs2D = FALSE;
 						m_sQueueSample.m_nReleasingVolumeModificator = 2;
 						m_sQueueSample.m_nFrequency = 6000;
 						m_sQueueSample.m_nLoopCount = 0;
 						m_sQueueSample.m_nEmittingVolume = 100;
-						m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-						m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+						SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 						m_sQueueSample.m_fSpeedMultiplier = 4.0f;
 						m_sQueueSample.m_fSoundIntensity = intensity;
-						m_sQueueSample.m_bReleasingSoundFlag = false;
+						m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 						m_sQueueSample.m_nReleasingVolumeDivider = 3;
-						m_sQueueSample.m_bReverbFlag = true;
-						m_sQueueSample.m_bRequireReflection = false;
+						m_sQueueSample.m_bReverbFlag = TRUE;
+						m_sQueueSample.m_bRequireReflection = FALSE;
 						AddSampleToRequestedQueue();
 					}
 					if (m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_AudioEvents) {
@@ -9046,9 +9039,9 @@ cAudioManager::ProcessCrane()
 						m_sQueueSample.m_nSampleIndex = SFX_COL_CAR_2;
 						m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_COL_CAR_2);
 						m_sQueueSample.m_nLoopCount = 1;
-						m_sQueueSample.m_bReleasingSoundFlag = true;
-						m_sQueueSample.m_bReverbFlag = true;
-						m_sQueueSample.m_bRequireReflection = true;
+						m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+						m_sQueueSample.m_bReverbFlag = TRUE;
+						m_sQueueSample.m_bRequireReflection = TRUE;
 						AddSampleToRequestedQueue();
 					}
 				}
@@ -9102,14 +9095,13 @@ cAudioManager::ProcessProjectiles()
 				m_sQueueSample.m_nVolume = ComputeVolume(emittingVol, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
 				if (m_sQueueSample.m_nVolume != 0) {
 					m_sQueueSample.m_nCounter = i;
-					m_sQueueSample.m_bIs2D = false;
+					m_sQueueSample.m_bIs2D = FALSE;
 					m_sQueueSample.m_nLoopCount = 0;
 					m_sQueueSample.m_nEmittingVolume = emittingVol;
-					m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-					m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
-					m_sQueueSample.m_bReleasingSoundFlag = false;
-					m_sQueueSample.m_bReverbFlag = true;
-					m_sQueueSample.m_bRequireReflection = false;
+					SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
+					m_sQueueSample.m_bReleasingSoundFlag = FALSE;
+					m_sQueueSample.m_bReverbFlag = TRUE;
+					m_sQueueSample.m_bRequireReflection = FALSE;
 					AddSampleToRequestedQueue();
 				}
 			}
@@ -9127,7 +9119,7 @@ cAudioManager::ProcessGarages()
 	uint32 sampleIndex;
 	uint8 j;
 	float distSquared;
-	bool distCalculated;
+	bool8 distCalculated;
 
 	static uint8 iSound = 32;
 
@@ -9138,7 +9130,7 @@ cAudioManager::ProcessGarages()
 		if (entity == nil)
 			continue;
 		m_sQueueSample.m_vecPos = entity->GetPosition();
-		distCalculated = false;
+		distCalculated = FALSE;
 		distSquared = GetDistanceSquared(m_sQueueSample.m_vecPos);
 		if (distSquared < SQR(SOUND_INTENSITY)) {
 			state = CGarages::aGarages[i].m_eGarageState;
@@ -9158,7 +9150,7 @@ cAudioManager::ProcessGarages()
 								m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex) / 2;
 								m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
 								m_sQueueSample.m_nLoopCount = 1;
-								m_sQueueSample.m_bReleasingSoundFlag = true;
+								m_sQueueSample.m_bReleasingSoundFlag = TRUE;
 								m_sQueueSample.m_nCounter = iSound++;
 								if (iSound < 32)
 									iSound = 32;
@@ -9170,7 +9162,7 @@ cAudioManager::ProcessGarages()
 							m_sQueueSample.m_nCounter = i;
 							m_sQueueSample.m_nLoopCount = 0;
 							m_sQueueSample.m_nReleasingVolumeDivider = 3;
-							m_sQueueSample.m_bReleasingSoundFlag = false;
+							m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 						}
 					} else {
 						m_sQueueSample.m_nSampleIndex = SFX_GARAGE_DOOR_LOOP;
@@ -9179,19 +9171,18 @@ cAudioManager::ProcessGarages()
 						m_sQueueSample.m_nCounter = i;
 						m_sQueueSample.m_nLoopCount = 0;
 						m_sQueueSample.m_nReleasingVolumeDivider = 3;
-						m_sQueueSample.m_bReleasingSoundFlag = false;
+						m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 					}
 
 					m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-					m_sQueueSample.m_bIs2D = false;
+					m_sQueueSample.m_bIs2D = FALSE;
 					m_sQueueSample.m_nReleasingVolumeModificator = 3;
 					m_sQueueSample.m_nEmittingVolume = 90;
-					m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-					m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+					SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 					m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 					m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-					m_sQueueSample.m_bReverbFlag = true;
-					m_sQueueSample.m_bRequireReflection = false;
+					m_sQueueSample.m_bReverbFlag = TRUE;
+					m_sQueueSample.m_bRequireReflection = FALSE;
 					AddSampleToRequestedQueue();
 				}
 				break;
@@ -9220,16 +9211,15 @@ cAudioManager::ProcessGarages()
 						m_sQueueSample.m_nEmittingVolume = 60;
 						m_sQueueSample.m_fSpeedMultiplier = 0.0f;
 						m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-						m_sQueueSample.m_bReverbFlag = true; 
-						m_sQueueSample.m_bIs2D = false;
-						m_sQueueSample.m_bReleasingSoundFlag = true;
+						m_sQueueSample.m_bReverbFlag = TRUE; 
+						m_sQueueSample.m_bIs2D = FALSE;
+						m_sQueueSample.m_bReleasingSoundFlag = TRUE;
 						m_sQueueSample.m_nLoopCount = 1;
-						m_sQueueSample.m_nLoopStart = 0;
-						m_sQueueSample.m_nLoopEnd = -1;
+						RESET_LOOP_OFFSETS
 						m_sQueueSample.m_nCounter = iSound++;
 						if (iSound < 32)
 							iSound = 32;
-						m_sQueueSample.m_bRequireReflection = true;
+						m_sQueueSample.m_bRequireReflection = TRUE;
 						AddSampleToRequestedQueue();
 					}
 				}
@@ -9247,7 +9237,7 @@ cAudioManager::ProcessFireHydrant()
 	const float SOUND_INTENSITY = 35;
 
 	float distSquared;
-	bool distCalculated = false;
+	bool8 distCalculated = FALSE;
 
 	m_sQueueSample.m_vecPos = ((CEntity *)m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_pEntity)->GetPosition();
 	distSquared = GetDistanceSquared(m_sQueueSample.m_vecPos);
@@ -9261,13 +9251,12 @@ cAudioManager::ProcessFireHydrant()
 			m_sQueueSample.m_nCounter = 0;
 			m_sQueueSample.m_nEmittingVolume = 40;
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nLoopCount = 0;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 			m_sQueueSample.m_fSoundIntensity = SOUND_INTENSITY;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 3;
 			m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 			AddSampleToRequestedQueue();
@@ -9282,7 +9271,7 @@ void
 cAudioManager::ProcessBridge()
 {
 	float dist;
-	bool distCalculated = false;
+	bool8 distCalculated = FALSE;
 
 	if (CBridge::pLiftRoad) {
 		m_sQueueSample.m_vecPos = CBridge::pLiftRoad->GetPosition();
@@ -9318,19 +9307,18 @@ cAudioManager::ProcessBridgeWarning()
 			m_sQueueSample.m_nCounter = 0;
 			m_sQueueSample.m_nSampleIndex = SFX_BRIDGE_OPEN_WARNING;
 			m_sQueueSample.m_nBankIndex = SAMPLEBANK_EXTRAS;
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nReleasingVolumeModificator = 1;
 			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_BRIDGE_OPEN_WARNING);
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_nEmittingVolume = 100;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 			m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 			m_sQueueSample.m_fSoundIntensity = 450.0f;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 8;
-			m_sQueueSample.m_bReverbFlag = false;
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bReverbFlag = FALSE;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			AddSampleToRequestedQueue();
 		}
 	}*/
@@ -9345,18 +9333,17 @@ cAudioManager::ProcessBridgeMotor()
 			m_sQueueSample.m_nCounter = 1;
 			m_sQueueSample.m_nSampleIndex = SFX_FISHING_BOAT_IDLE; // todo check sfx name
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nReleasingVolumeModificator = 1;
 			m_sQueueSample.m_nFrequency = 5500;
 			m_sQueueSample.m_nLoopCount = 0;
 			m_sQueueSample.m_nEmittingVolume = MAX_VOLUME;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
+			SET_LOOP_OFFSETS(m_sQueueSample.m_nSampleIndex)
 			m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 			m_sQueueSample.m_fSoundIntensity = bridgeIntensity;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
+			m_sQueueSample.m_bReleasingSoundFlag = FALSE;
 			m_sQueueSample.m_nReleasingVolumeDivider = 3;
-			m_sQueueSample.m_bReverbFlag = false;
+			m_sQueueSample.m_bReverbFlag = FALSE;
 			AddSampleToRequestedQueue();
 		}
 	}
@@ -9380,18 +9367,17 @@ cAudioManager::ProcessBridgeOneShots()
 		if (m_sQueueSample.m_nVolume != 0) {
 			m_sQueueSample.m_nCounter = 2;
 			m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-			m_sQueueSample.m_bIs2D = false;
+			m_sQueueSample.m_bIs2D = FALSE;
 			m_sQueueSample.m_nReleasingVolumeModificator = 1;
 			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 			m_sQueueSample.m_nLoopCount = 1;
 			m_sQueueSample.m_nEmittingVolume = MAX_VOLUME;
-			m_sQueueSample.m_nLoopStart = 0;
-			m_sQueueSample.m_nLoopEnd = -1;
+			RESET_LOOP_OFFSETS
 			m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 			m_sQueueSample.m_fSoundIntensity = bridgeIntensity;
-			m_sQueueSample.m_bReleasingSoundFlag = true;
-			m_sQueueSample.m_bReverbFlag = false;
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bReleasingSoundFlag = TRUE;
+			m_sQueueSample.m_bReverbFlag = FALSE;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			AddSampleToRequestedQueue();
 		}
 	}
@@ -9400,7 +9386,7 @@ cAudioManager::ProcessBridgeOneShots()
 #endif
 
 #pragma region MISSION_AUDIO
-bool g_bMissionAudioLoadFailed[MISSION_AUDIO_SLOTS];
+bool8 g_bMissionAudioLoadFailed[MISSION_AUDIO_SLOTS];
 
 struct MissionAudioData {
 	const char *m_pName;
@@ -9409,380 +9395,1874 @@ struct MissionAudioData {
 
 
 const MissionAudioData MissionAudioNameSfxAssoc[] = {
-	/*{"mobring", STREAMED_SOUND_MISSION_MOBR1},    {"pagring", STREAMED_SOUND_MISSION_PAGER},    {"carrev", STREAMED_SOUND_MISSION_CARREV},
-	{"bikerev", STREAMED_SOUND_MISSION_BIKEREV},  {"liftop", STREAMED_SOUND_MISSION_LIFTOP},    {"liftcl", STREAMED_SOUND_MISSION_LIFTCL},
-	{"liftrun", STREAMED_SOUND_MISSION_LIFTRUN},  {"liftbel", STREAMED_SOUND_MISSION_LIFTBEL},  {"inlift", STREAMED_SOUND_MISSION_INLIFT},
-	{"caml", STREAMED_SOUND_MISSION_CAMERAL},     {"camr", STREAMED_SOUND_MISSION_CAMERAR},     {"cheer1", STREAMED_SOUND_MISSION_CHEER1},
-	{"cheer2", STREAMED_SOUND_MISSION_CHEER2},    {"cheer3", STREAMED_SOUND_MISSION_CHEER3},    {"cheer4", STREAMED_SOUND_MISSION_CHEER4},
-	{"ooh1", STREAMED_SOUND_MISSION_OOH1},        {"ooh2", STREAMED_SOUND_MISSION_OOH2},        {"race1", STREAMED_SOUND_MISSION_RACE1},
-	{"race2", STREAMED_SOUND_MISSION_RACE2},      {"race3", STREAMED_SOUND_MISSION_RACE3},      {"race4", STREAMED_SOUND_MISSION_RACE4},
-	{"race5", STREAMED_SOUND_MISSION_RACE5},      {"race6", STREAMED_SOUND_MISSION_RACE6},      {"race7", STREAMED_SOUND_MISSION_RACE7},
-	{"race8", STREAMED_SOUND_MISSION_RACE8},      {"race9", STREAMED_SOUND_MISSION_RACE9},      {"race10", STREAMED_SOUND_MISSION_RACE10},
-	{"race11", STREAMED_SOUND_MISSION_RACE11},    {"race12", STREAMED_SOUND_MISSION_RACE12},    {"race13", STREAMED_SOUND_MISSION_RACE13},
-	{"race14", STREAMED_SOUND_MISSION_RACE14},    {"race15", STREAMED_SOUND_MISSION_RACE15},    {"hot1", STREAMED_SOUND_MISSION_HOT1},
-	{"hot2", STREAMED_SOUND_MISSION_HOT2},        {"hot3", STREAMED_SOUND_MISSION_HOT3},        {"hot4", STREAMED_SOUND_MISSION_HOT4},
-	{"hot5", STREAMED_SOUND_MISSION_HOT5},        {"hot6", STREAMED_SOUND_MISSION_HOT6},        {"hot7", STREAMED_SOUND_MISSION_HOT7},
-	{"hot8", STREAMED_SOUND_MISSION_HOT8},        {"hot9", STREAMED_SOUND_MISSION_HOT9},        {"hot10", STREAMED_SOUND_MISSION_HOT10},
-	{"hot11", STREAMED_SOUND_MISSION_HOT11},      {"hot12", STREAMED_SOUND_MISSION_HOT12},      {"hot13", STREAMED_SOUND_MISSION_HOT13},
-	{"hot14", STREAMED_SOUND_MISSION_HOT14},      {"hot15", STREAMED_SOUND_MISSION_HOT15},      {"lanstp1", STREAMED_SOUND_MISSION_LANSTP1},
-	{"lanstp2", STREAMED_SOUND_MISSION_LANSTP2},  {"lanamu1", STREAMED_SOUND_MISSION_LANAMU1},  {"lanamu2", STREAMED_SOUND_MISSION_LANAMU2},
-	{"airhrnl", STREAMED_SOUND_MISSION_AIRHORNL}, {"airhrnr", STREAMED_SOUND_MISSION_AIRHORNR}, {"sniper", STREAMED_SOUND_MISSION_SNIPSCRL},
-	{"snipsh", STREAMED_SOUND_MISSION_SNIPSHORT}, {"bloroof", STREAMED_SOUND_MISSION_BLOWROOF}, {"sfx_01", STREAMED_SOUND_MISSION_SFX_01},
-	{"sfx_02", STREAMED_SOUND_MISSION_SFX_02},    {"LAW1_1", STREAMED_SOUND_MISSION_LAW1_1},    {"LAW1_2", STREAMED_SOUND_MISSION_LAW1_2},
-	{"LAW1_3", STREAMED_SOUND_MISSION_LAW1_3},    {"LAW1_4", STREAMED_SOUND_MISSION_LAW1_4},    {"LAW1_5", STREAMED_SOUND_MISSION_LAW1_5},
-	{"LAW1_6", STREAMED_SOUND_MISSION_LAW1_6},    {"LAW1_7", STREAMED_SOUND_MISSION_LAW1_7},    {"LAW1_8", STREAMED_SOUND_MISSION_LAW1_8},
-	{"LAW1_9", STREAMED_SOUND_MISSION_LAW1_9},    {"LAW1_10", STREAMED_SOUND_MISSION_LAW1_10},  {"LAW2_1", STREAMED_SOUND_MISSION_LAW2_1},
-	{"LAW2_2", STREAMED_SOUND_MISSION_LAW2_2},    {"LAW2_3", STREAMED_SOUND_MISSION_LAW2_3},    {"LAW2_4", STREAMED_SOUND_MISSION_LAW2_4},
-	{"LAW2_5", STREAMED_SOUND_MISSION_LAW2_5},    {"LAW2_6", STREAMED_SOUND_MISSION_LAW2_6},    {"LAW2_7", STREAMED_SOUND_MISSION_LAW2_7},
-	{"LAW2_8", STREAMED_SOUND_MISSION_LAW2_8},    {"LAW2_9", STREAMED_SOUND_MISSION_LAW2_9},    {"LAW2_10", STREAMED_SOUND_MISSION_LAW2_10},
-	{"LAW3_1", STREAMED_SOUND_MISSION_LAW3_1},    {"LAW3_2", STREAMED_SOUND_MISSION_LAW3_2},    {"LAW3_3", STREAMED_SOUND_MISSION_LAW3_3},
-	{"LAW3_4", STREAMED_SOUND_MISSION_LAW3_4},    {"LAW3_5", STREAMED_SOUND_MISSION_LAW3_5},    {"LAW3_6", STREAMED_SOUND_MISSION_LAW3_6},
-	{"LAW3_10", STREAMED_SOUND_MISSION_LAW3_10},  {"LAW3_11", STREAMED_SOUND_MISSION_LAW3_11},  {"LAW3_12", STREAMED_SOUND_MISSION_LAW3_12},
-	{"LAW3_13", STREAMED_SOUND_MISSION_LAW3_13},  {"LAW3_14", STREAMED_SOUND_MISSION_LAW3_14},  {"LAW3_16", STREAMED_SOUND_MISSION_LAW3_16},
-	{"LAW3_17", STREAMED_SOUND_MISSION_LAW3_17},  {"LAW3_18", STREAMED_SOUND_MISSION_LAW3_18},  {"LAW3_19", STREAMED_SOUND_MISSION_LAW3_19},
-	{"LAW3_20", STREAMED_SOUND_MISSION_LAW3_20},  {"LAW3_21", STREAMED_SOUND_MISSION_LAW3_21},  {"LAW3_22", STREAMED_SOUND_MISSION_LAW3_22},
-	{"LAW3_23", STREAMED_SOUND_MISSION_LAW3_23},  {"LAW3_24", STREAMED_SOUND_MISSION_LAW3_24},  {"LAW3_25", STREAMED_SOUND_MISSION_LAW3_25},
-	{"LAW4_1a", STREAMED_SOUND_MISSION_LAW4_1A},  {"LAW4_1b", STREAMED_SOUND_MISSION_LAW4_1B},  {"LAW4_1c", STREAMED_SOUND_MISSION_LAW4_1C},
-	{"LAW4_1d", STREAMED_SOUND_MISSION_LAW4_1D},  {"LAW4_10", STREAMED_SOUND_MISSION_LAW4_10},  {"LAW4_3", STREAMED_SOUND_MISSION_LAW4_3},
-	{"LAW4_4", STREAMED_SOUND_MISSION_LAW4_4},    {"LAW4_5", STREAMED_SOUND_MISSION_LAW4_5},    {"LAW4_6", STREAMED_SOUND_MISSION_LAW4_6},
-	{"LAW4_7", STREAMED_SOUND_MISSION_LAW4_7},    {"LAW4_8", STREAMED_SOUND_MISSION_LAW4_8},    {"LAW4_9", STREAMED_SOUND_MISSION_LAW4_9},
-	{"COL1_1", STREAMED_SOUND_MISSION_COL1_1},    {"COL1_2", STREAMED_SOUND_MISSION_COL1_2},    {"COL1_3", STREAMED_SOUND_MISSION_COL1_3},
-	{"COL1_4", STREAMED_SOUND_MISSION_COL1_4},    {"COL1_5", STREAMED_SOUND_MISSION_COL1_5},    {"COL1_6", STREAMED_SOUND_MISSION_COL1_6},
-	{"COL1_7", STREAMED_SOUND_MISSION_COL1_7},    {"COL1_8", STREAMED_SOUND_MISSION_COL1_8},    {"COL2_1", STREAMED_SOUND_MISSION_COL2_1},
-	{"COL2_2", STREAMED_SOUND_MISSION_COL2_2},    {"COL2_3", STREAMED_SOUND_MISSION_COL2_3},    {"COL2_4", STREAMED_SOUND_MISSION_COL2_4},
-	{"COL2_5", STREAMED_SOUND_MISSION_COL2_5},    {"COL2_6a", STREAMED_SOUND_MISSION_COL2_6A},  {"COL2_7", STREAMED_SOUND_MISSION_COL2_7},
-	{"COL2_8", STREAMED_SOUND_MISSION_COL2_8},    {"COL2_9", STREAMED_SOUND_MISSION_COL2_9},    {"COL2_10", STREAMED_SOUND_MISSION_COL2_10},
-	{"COL2_11", STREAMED_SOUND_MISSION_COL2_11},  {"COL2_12", STREAMED_SOUND_MISSION_COL2_12},  {"COL2_13", STREAMED_SOUND_MISSION_COL2_13},
-	{"COL2_14", STREAMED_SOUND_MISSION_COL2_14},  {"COL2_15", STREAMED_SOUND_MISSION_COL2_15},  {"COL2_16", STREAMED_SOUND_MISSION_COL2_16},
-	{"COL3_1", STREAMED_SOUND_MISSION_COL3_1},    {"COL3_2", STREAMED_SOUND_MISSION_COL3_2},    {"COL3_2a", STREAMED_SOUND_MISSION_COL3_2A},
-	{"COL3_2b", STREAMED_SOUND_MISSION_COL3_2B},  {"COL3_3", STREAMED_SOUND_MISSION_COL3_3},    {"COL3_4", STREAMED_SOUND_MISSION_COL3_4},
-	{"COL3_5", STREAMED_SOUND_MISSION_COL3_5},    {"COL3_6", STREAMED_SOUND_MISSION_COL3_6},    {"COL3_7", STREAMED_SOUND_MISSION_COL3_7},
-	{"COL3_8", STREAMED_SOUND_MISSION_COL3_8},    {"COL3_9", STREAMED_SOUND_MISSION_COL3_9},    {"COL3_10", STREAMED_SOUND_MISSION_COL3_10},
-	{"COL3_11", STREAMED_SOUND_MISSION_COL3_11},  {"COL3_12", STREAMED_SOUND_MISSION_COL3_12},  {"COL3_13", STREAMED_SOUND_MISSION_COL3_13},
-	{"COL3_14", STREAMED_SOUND_MISSION_COL3_14},  {"COL3_15", STREAMED_SOUND_MISSION_COL3_15},  {"COL3_16", STREAMED_SOUND_MISSION_COL3_16},
-	{"COL3_17", STREAMED_SOUND_MISSION_COL3_17},  {"COL3_18", STREAMED_SOUND_MISSION_COL3_18},  {"COL3_19", STREAMED_SOUND_MISSION_COL3_19},
-	{"COL3_20", STREAMED_SOUND_MISSION_COL3_20},  {"COL3_21", STREAMED_SOUND_MISSION_COL3_21},  {"COL3_23", STREAMED_SOUND_MISSION_COL3_23},
-	{"COL3_24", STREAMED_SOUND_MISSION_COL3_24},  {"COL3_25", STREAMED_SOUND_MISSION_COL3_25},  {"COL4_1", STREAMED_SOUND_MISSION_COL4_1},
-	{"COL4_2", STREAMED_SOUND_MISSION_COL4_2},    {"COL4_3", STREAMED_SOUND_MISSION_COL4_3},    {"COL4_4", STREAMED_SOUND_MISSION_COL4_4},
-	{"COL4_5", STREAMED_SOUND_MISSION_COL4_5},    {"COL4_6", STREAMED_SOUND_MISSION_COL4_6},    {"COL4_7", STREAMED_SOUND_MISSION_COL4_7},
-	{"COL4_8", STREAMED_SOUND_MISSION_COL4_8},    {"COL4_9", STREAMED_SOUND_MISSION_COL4_9},    {"COL4_10", STREAMED_SOUND_MISSION_COL4_10},
-	{"COL4_11", STREAMED_SOUND_MISSION_COL4_11},  {"COL4_12", STREAMED_SOUND_MISSION_COL4_12},  {"COL4_13", STREAMED_SOUND_MISSION_COL4_13},
-	{"COL4_14", STREAMED_SOUND_MISSION_COL4_14},  {"COL4_15", STREAMED_SOUND_MISSION_COL4_15},  {"COL4_16", STREAMED_SOUND_MISSION_COL4_16},
-	{"COL4_17", STREAMED_SOUND_MISSION_COL4_17},  {"COL4_18", STREAMED_SOUND_MISSION_COL4_18},  {"COL4_19", STREAMED_SOUND_MISSION_COL4_19},
-	{"COL4_20", STREAMED_SOUND_MISSION_COL4_20},  {"COL4_21", STREAMED_SOUND_MISSION_COL4_21},  {"COL4_22", STREAMED_SOUND_MISSION_COL4_22},
-	{"COL4_23", STREAMED_SOUND_MISSION_COL4_23},  {"COL4_24", STREAMED_SOUND_MISSION_COL4_24},  {"COL4_25", STREAMED_SOUND_MISSION_COL4_25},
-	{"COL4_26", STREAMED_SOUND_MISSION_COL4_26},  {"COL5_1", STREAMED_SOUND_MISSION_COL5_1},    {"COL5_2", STREAMED_SOUND_MISSION_COL5_2},
-	{"COL5_3", STREAMED_SOUND_MISSION_COL5_3},    {"COL5_4", STREAMED_SOUND_MISSION_COL5_4},    {"COL5_5", STREAMED_SOUND_MISSION_COL5_5},
-	{"COL5_6", STREAMED_SOUND_MISSION_COL5_6},    {"COL5_7", STREAMED_SOUND_MISSION_COL5_7},    {"COL5_8", STREAMED_SOUND_MISSION_COL5_8},
-	{"COL5_9", STREAMED_SOUND_MISSION_COL5_9},    {"COL5_10", STREAMED_SOUND_MISSION_COL5_10},  {"COL5_11", STREAMED_SOUND_MISSION_COL5_11},
-	{"COL5_12", STREAMED_SOUND_MISSION_COL5_12},  {"COL5_13", STREAMED_SOUND_MISSION_COL5_13},  {"COL5_14", STREAMED_SOUND_MISSION_COL5_14},
-	{"COL5_15", STREAMED_SOUND_MISSION_COL5_15},  {"COL5_16", STREAMED_SOUND_MISSION_COL5_16},  {"COL5_17", STREAMED_SOUND_MISSION_COL5_17},
-	{"COL5_18", STREAMED_SOUND_MISSION_COL5_18},  {"COL5_19", STREAMED_SOUND_MISSION_COL5_19},  {"COL5_20", STREAMED_SOUND_MISSION_COL5_20},
-	{"COL5_21", STREAMED_SOUND_MISSION_COL5_21},  {"COL5_22", STREAMED_SOUND_MISSION_COL5_22},  {"COK1_1", STREAMED_SOUND_MISSION_COK1_1},
-	{"COK1_2", STREAMED_SOUND_MISSION_COK1_2},    {"COK1_3", STREAMED_SOUND_MISSION_COK1_3},    {"COK1_4", STREAMED_SOUND_MISSION_COK1_4},
-	{"COK1_5", STREAMED_SOUND_MISSION_COK1_5},    {"COK1_6", STREAMED_SOUND_MISSION_COK1_6},    {"COK2_1", STREAMED_SOUND_MISSION_COK2_1},
-	{"COK2_2", STREAMED_SOUND_MISSION_COK2_2},    {"COK2_3", STREAMED_SOUND_MISSION_COK2_3},    {"COK2_4", STREAMED_SOUND_MISSION_COK2_4},
-	{"COK2_5", STREAMED_SOUND_MISSION_COK2_5},    {"COK2_6", STREAMED_SOUND_MISSION_COK2_6},    {"COK2_7a", STREAMED_SOUND_MISSION_COK2_7A},
-	{"COK2_7b", STREAMED_SOUND_MISSION_COK2_7B},  {"COK2_7c", STREAMED_SOUND_MISSION_COK2_7C},  {"COK2_8a", STREAMED_SOUND_MISSION_COK2_8A},
-	{"COK2_8b", STREAMED_SOUND_MISSION_COK2_8B},  {"COK2_8c", STREAMED_SOUND_MISSION_COK2_8C},  {"COK2_8d", STREAMED_SOUND_MISSION_COK2_8D},
-	{"COK2_9", STREAMED_SOUND_MISSION_COK2_9},    {"COK210a", STREAMED_SOUND_MISSION_COK210A},  {"COK210b", STREAMED_SOUND_MISSION_COK210B},
-	{"COK210c", STREAMED_SOUND_MISSION_COK210C},  {"COK212a", STREAMED_SOUND_MISSION_COK212A},  {"COK212b", STREAMED_SOUND_MISSION_COK212B},
-	{"COK2_13", STREAMED_SOUND_MISSION_COK2_13},  {"COK2_14", STREAMED_SOUND_MISSION_COK2_14},  {"COK2_15", STREAMED_SOUND_MISSION_COK2_15},
-	{"COK2_16", STREAMED_SOUND_MISSION_COK2_16},  {"COK2_20", STREAMED_SOUND_MISSION_COK2_20},  {"COK2_21", STREAMED_SOUND_MISSION_COK2_21},
-	{"COK2_22", STREAMED_SOUND_MISSION_COK2_22},  {"COK3_1", STREAMED_SOUND_MISSION_COK3_1},    {"COK3_2", STREAMED_SOUND_MISSION_COK3_2},
-	{"COK3_3", STREAMED_SOUND_MISSION_COK3_3},    {"COK3_4", STREAMED_SOUND_MISSION_COK3_4},    {"COK4_1", STREAMED_SOUND_MISSION_COK4_1},
-	{"COK4_2", STREAMED_SOUND_MISSION_COK4_2},    {"COK4_3", STREAMED_SOUND_MISSION_COK4_3},    {"COK4_4", STREAMED_SOUND_MISSION_COK4_4},
-	{"COK4_5", STREAMED_SOUND_MISSION_COK4_5},    {"COK4_6", STREAMED_SOUND_MISSION_COK4_6},    {"COK4_7", STREAMED_SOUND_MISSION_COK4_7},
-	{"COK4_8", STREAMED_SOUND_MISSION_COK4_8},    {"COK4_9", STREAMED_SOUND_MISSION_COK4_9},    {"COK4_9A", STREAMED_SOUND_MISSION_COK4_9A},
-	{"COK4_10", STREAMED_SOUND_MISSION_COK4_10},  {"COK4_11", STREAMED_SOUND_MISSION_COK4_11},  {"COK4_12", STREAMED_SOUND_MISSION_COK4_12},
-	{"COK4_13", STREAMED_SOUND_MISSION_COK4_13},  {"COK4_14", STREAMED_SOUND_MISSION_COK4_14},  {"COK4_15", STREAMED_SOUND_MISSION_COK4_15},
-	{"COK4_16", STREAMED_SOUND_MISSION_COK4_16},  {"COK4_17", STREAMED_SOUND_MISSION_COK4_17},  {"COK4_18", STREAMED_SOUND_MISSION_COK4_18},
-	{"COK4_19", STREAMED_SOUND_MISSION_COK4_19},  {"COK4_20", STREAMED_SOUND_MISSION_COK4_20},  {"COK4_21", STREAMED_SOUND_MISSION_COK4_21},
-	{"COK4_22", STREAMED_SOUND_MISSION_COK4_22},  {"COK4_23", STREAMED_SOUND_MISSION_COK4_23},  {"COK4_24", STREAMED_SOUND_MISSION_COK4_24},
-	{"COK4_25", STREAMED_SOUND_MISSION_COK4_25},  {"COK4_26", STREAMED_SOUND_MISSION_COK4_26},  {"COK4_27", STREAMED_SOUND_MISSION_COK4_27},
-	{"RESC_1", STREAMED_SOUND_MISSION_RESC_1},    {"RESC_2", STREAMED_SOUND_MISSION_RESC_2},    {"RESC_3", STREAMED_SOUND_MISSION_RESC_3},
-	{"RESC_4", STREAMED_SOUND_MISSION_RESC_4},    {"RESC_5", STREAMED_SOUND_MISSION_RESC_5},    {"RESC_6", STREAMED_SOUND_MISSION_RESC_6},
-	{"RESC_7", STREAMED_SOUND_MISSION_RESC_7},    {"RESC_8", STREAMED_SOUND_MISSION_RESC_8},    {"RESC_9", STREAMED_SOUND_MISSION_RESC_9},
-	{"RESC_10", STREAMED_SOUND_MISSION_RESC_10},  {"ASS_1", STREAMED_SOUND_MISSION_ASS_1},      {"ASS_2", STREAMED_SOUND_MISSION_ASS_2},
-	{"ASS_3", STREAMED_SOUND_MISSION_ASS_3},      {"ASS_4", STREAMED_SOUND_MISSION_ASS_4},      {"ASS_5", STREAMED_SOUND_MISSION_ASS_5},
-	{"ASS_6", STREAMED_SOUND_MISSION_ASS_6},      {"ASS_7", STREAMED_SOUND_MISSION_ASS_7},      {"ASS_8", STREAMED_SOUND_MISSION_ASS_8},
-	{"ASS_9", STREAMED_SOUND_MISSION_ASS_9},      {"ASS_10", STREAMED_SOUND_MISSION_ASS_10},    {"ASS_11", STREAMED_SOUND_MISSION_ASS_11},
-	{"ASS_12", STREAMED_SOUND_MISSION_ASS_12},    {"ASS_13", STREAMED_SOUND_MISSION_ASS_13},    {"ASS_14", STREAMED_SOUND_MISSION_ASS_14},
-	{"BUD1_1", STREAMED_SOUND_MISSION_BUD1_1},    {"BUD1_2", STREAMED_SOUND_MISSION_BUD1_2},    {"BUD1_3", STREAMED_SOUND_MISSION_BUD1_3},
-	{"BUD1_4", STREAMED_SOUND_MISSION_BUD1_4},    {"BUD1_5", STREAMED_SOUND_MISSION_BUD1_5},    {"BUD1_9", STREAMED_SOUND_MISSION_BUD1_9},
-	{"BUD1_10", STREAMED_SOUND_MISSION_BUD1_10},  {"BUD2_1", STREAMED_SOUND_MISSION_BUD2_1},    {"BUD2_2", STREAMED_SOUND_MISSION_BUD2_2},
-	{"BUD2_3", STREAMED_SOUND_MISSION_BUD2_3},    {"BUD2_4", STREAMED_SOUND_MISSION_BUD2_4},    {"BUD2_5", STREAMED_SOUND_MISSION_BUD2_5},
-	{"BUD2_6", STREAMED_SOUND_MISSION_BUD2_6},    {"BUD2_7", STREAMED_SOUND_MISSION_BUD2_7},    {"BUD3_1a", STREAMED_SOUND_MISSION_BUD3_1A},
-	{"BUD3_1b", STREAMED_SOUND_MISSION_BUD3_1B},  {"BUD3_1", STREAMED_SOUND_MISSION_BUD3_1},    {"BUD3_2", STREAMED_SOUND_MISSION_BUD3_2},
-	{"BUD3_3", STREAMED_SOUND_MISSION_BUD3_3},    {"BUD3_4", STREAMED_SOUND_MISSION_BUD3_4},    {"BUD3_1c", STREAMED_SOUND_MISSION_BUD3_1C},
-	{"BUD3_5", STREAMED_SOUND_MISSION_BUD3_5},    {"BUD3_6", STREAMED_SOUND_MISSION_BUD3_6},    {"BUD3_7", STREAMED_SOUND_MISSION_BUD3_7},
-	{"BUD3_8a", STREAMED_SOUND_MISSION_BUD3_8A},  {"BUD3_8b", STREAMED_SOUND_MISSION_BUD3_8B},  {"BUD3_8c", STREAMED_SOUND_MISSION_BUD3_8C},
-	{"BUD3_9a", STREAMED_SOUND_MISSION_BUD3_9A},  {"BUD3_9b", STREAMED_SOUND_MISSION_BUD3_9B},  {"BUD3_9c", STREAMED_SOUND_MISSION_BUD3_9C},
-	{"CAP1_2", STREAMED_SOUND_MISSION_CAP1_2},    {"CAP1_3", STREAMED_SOUND_MISSION_CAP1_3},    {"CAP1_4", STREAMED_SOUND_MISSION_CAP1_4},
-	{"CAP1_5", STREAMED_SOUND_MISSION_CAP1_5},    {"CAP1_6", STREAMED_SOUND_MISSION_CAP1_6},    {"CAP1_7", STREAMED_SOUND_MISSION_CAP1_7},
-	{"CAP1_8", STREAMED_SOUND_MISSION_CAP1_8},    {"CAP1_9", STREAMED_SOUND_MISSION_CAP1_9},    {"CAP1_10", STREAMED_SOUND_MISSION_CAP1_10},
-	{"CAP1_11", STREAMED_SOUND_MISSION_CAP1_11},  {"CAP1_12", STREAMED_SOUND_MISSION_CAP1_12},  {"FINKILL", STREAMED_SOUND_MISSION_FINKILL},
-	{"FIN_1a", STREAMED_SOUND_MISSION_FIN_1A},    {"FIN_1b", STREAMED_SOUND_MISSION_FIN_1B},    {"FIN_1c", STREAMED_SOUND_MISSION_FIN_1C},
-	{"FIN_2b", STREAMED_SOUND_MISSION_FIN_2B},    {"FIN_2c", STREAMED_SOUND_MISSION_FIN_2C},    {"FIN_3", STREAMED_SOUND_MISSION_FIN_3},
-	{"FIN_4", STREAMED_SOUND_MISSION_FIN_4},      {"FIN_5", STREAMED_SOUND_MISSION_FIN_5},      {"FIN_6", STREAMED_SOUND_MISSION_FIN_6},
-	{"FIN_10", STREAMED_SOUND_MISSION_FIN_10},    {"FIN_11a", STREAMED_SOUND_MISSION_FIN_11A},  {"FIN_11b", STREAMED_SOUND_MISSION_FIN_11B},
-	{"FIN_12a", STREAMED_SOUND_MISSION_FIN_12A},  {"FIN_12b", STREAMED_SOUND_MISSION_FIN_12B},  {"FIN_12c", STREAMED_SOUND_MISSION_FIN_12C},
-	{"FIN_13", STREAMED_SOUND_MISSION_FIN_13},    {"BNK1_1", STREAMED_SOUND_MISSION_BNK1_1},    {"BNK1_2", STREAMED_SOUND_MISSION_BNK1_2},
-	{"BNK1_3", STREAMED_SOUND_MISSION_BNK1_3},    {"BNK1_4", STREAMED_SOUND_MISSION_BNK1_4},    {"BNK1_5", STREAMED_SOUND_MISSION_BNK1_5},
-	{"BNK1_6", STREAMED_SOUND_MISSION_BNK1_6},    {"BNK1_7", STREAMED_SOUND_MISSION_BNK1_7},    {"BNK1_8", STREAMED_SOUND_MISSION_BNK1_8},
-	{"BNK1_10", STREAMED_SOUND_MISSION_BNK1_10},  {"BNK1_11", STREAMED_SOUND_MISSION_BNK1_11},  {"BNK1_12", STREAMED_SOUND_MISSION_BNK1_12},
-	{"BNK1_13", STREAMED_SOUND_MISSION_BNK1_13},  {"BNK1_14", STREAMED_SOUND_MISSION_BNK1_14},  {"BNK2_1", STREAMED_SOUND_MISSION_BNK2_1},
-	{"BNK2_2", STREAMED_SOUND_MISSION_BNK2_2},    {"BNK2_3", STREAMED_SOUND_MISSION_BNK2_3},    {"BNK2_4", STREAMED_SOUND_MISSION_BNK2_4},
-	{"BNK2_5", STREAMED_SOUND_MISSION_BNK2_5},    {"BNK2_6", STREAMED_SOUND_MISSION_BNK2_6},    {"BNK2_7", STREAMED_SOUND_MISSION_BNK2_7},
-	{"BNK2_8", STREAMED_SOUND_MISSION_BNK2_8},    {"BNK2_9", STREAMED_SOUND_MISSION_BNK2_9},    {"BNK3_1", STREAMED_SOUND_MISSION_BNK3_1},
-	{"BNK3_2", STREAMED_SOUND_MISSION_BNK3_2},    {"BNK3_3a", STREAMED_SOUND_MISSION_BNK3_3A},  {"BNK3_3b", STREAMED_SOUND_MISSION_BNK3_3B},
-	{"BNK3_3c", STREAMED_SOUND_MISSION_BNK3_3C},  {"BNK3_4a", STREAMED_SOUND_MISSION_BNK3_4A},  {"BNK3_4b", STREAMED_SOUND_MISSION_BNK3_4B},
-	{"BNK3_4c", STREAMED_SOUND_MISSION_BNK3_4C},  {"BNK4_1", STREAMED_SOUND_MISSION_BNK4_1},    {"BNK4_2", STREAMED_SOUND_MISSION_BNK4_2},
-	{"BNK4_3A", STREAMED_SOUND_MISSION_BNK4_3A},  {"BNK4_3B", STREAMED_SOUND_MISSION_BNK4_3B},  {"BNK4_3C", STREAMED_SOUND_MISSION_BNK4_3C},
-	{"BNK4_3D", STREAMED_SOUND_MISSION_BNK4_3D},  {"BNK4_3E", STREAMED_SOUND_MISSION_BNK4_3E},  {"BNK4_3F", STREAMED_SOUND_MISSION_BNK4_3F},
-	{"BNK4_3G", STREAMED_SOUND_MISSION_BNK4_3G},  {"BNK4_3H", STREAMED_SOUND_MISSION_BNK4_3H},  {"BNK4_3I", STREAMED_SOUND_MISSION_BNK4_3I},
-	{"BNK4_3J", STREAMED_SOUND_MISSION_BNK4_3J},  {"BNK4_3K", STREAMED_SOUND_MISSION_BNK4_3K},  {"BNK4_3M", STREAMED_SOUND_MISSION_BNK4_3M},
-	{"BNK4_3O", STREAMED_SOUND_MISSION_BNK4_3O},  {"BNK4_3P", STREAMED_SOUND_MISSION_BNK4_3P},  {"BNK4_3Q", STREAMED_SOUND_MISSION_BNK4_3Q},
-	{"BNK4_3R", STREAMED_SOUND_MISSION_BNK4_3R},  {"BNK4_3S", STREAMED_SOUND_MISSION_BNK4_3S},  {"BNK4_3T", STREAMED_SOUND_MISSION_BNK4_3T},
-	{"BNK4_3U", STREAMED_SOUND_MISSION_BNK4_3U},  {"BNK4_3V", STREAMED_SOUND_MISSION_BNK4_3V},  {"BNK4_4a", STREAMED_SOUND_MISSION_BNK4_4A},
-	{"BNK4_4b", STREAMED_SOUND_MISSION_BNK4_4B},  {"BNK4_5", STREAMED_SOUND_MISSION_BNK4_5},    {"BNK4_6", STREAMED_SOUND_MISSION_BNK4_6},
-	{"BNK4_7", STREAMED_SOUND_MISSION_BNK4_7},    {"BNK4_8", STREAMED_SOUND_MISSION_BNK4_8},    {"BNK4_9", STREAMED_SOUND_MISSION_BNK4_9},
-	{"BNK4_10", STREAMED_SOUND_MISSION_BNK4_10},  {"BNK4_11", STREAMED_SOUND_MISSION_BNK4_11},  {"BK4_12a", STREAMED_SOUND_MISSION_BK4_12A},
-	{"BK4_12b", STREAMED_SOUND_MISSION_BK4_12B},  {"BK4_12c", STREAMED_SOUND_MISSION_BK4_12C},  {"BNK4_13", STREAMED_SOUND_MISSION_BNK4_13},
-	{"BK4_14a", STREAMED_SOUND_MISSION_BK4_14A},  {"BK4_14b", STREAMED_SOUND_MISSION_BK4_14B},  {"BNK4_15", STREAMED_SOUND_MISSION_BNK4_15},
-	{"BNK4_16", STREAMED_SOUND_MISSION_BNK4_16},  {"BNK4_17", STREAMED_SOUND_MISSION_BNK4_17},  {"BNK4_18", STREAMED_SOUND_MISSION_BNK4_18},
-	{"BK4_19a", STREAMED_SOUND_MISSION_BK4_19A},  {"BK4_19b", STREAMED_SOUND_MISSION_BK4_19B},  {"BK4_20a", STREAMED_SOUND_MISSION_BK4_20A},
-	{"BK4_20b", STREAMED_SOUND_MISSION_BK4_20B},  {"BNK4_21", STREAMED_SOUND_MISSION_BNK4_21},  {"BNK422a", STREAMED_SOUND_MISSION_BNK422A},
-	{"BNK422b", STREAMED_SOUND_MISSION_BNK422B},  {"BK4_23a", STREAMED_SOUND_MISSION_BK4_23A},  {"BK4_23b", STREAMED_SOUND_MISSION_BK4_23B},
-	{"BK4_23c", STREAMED_SOUND_MISSION_BK4_23C},  {"BK4_23d", STREAMED_SOUND_MISSION_BK4_23D},  {"BK4_24a", STREAMED_SOUND_MISSION_BK4_24A},
-	{"BK4_24b", STREAMED_SOUND_MISSION_BK4_24B},  {"BNK4_25", STREAMED_SOUND_MISSION_BNK4_25},  {"BNK4_26", STREAMED_SOUND_MISSION_BNK4_26},
-	{"BNK4_27", STREAMED_SOUND_MISSION_BNK4_27},  {"BNK4_28", STREAMED_SOUND_MISSION_BNK4_28},  {"BNK4_29", STREAMED_SOUND_MISSION_BNK4_29},
-	{"BNK4_30", STREAMED_SOUND_MISSION_BNK4_30},  {"BK4_31a", STREAMED_SOUND_MISSION_BK4_31A},  {"BK4_31b", STREAMED_SOUND_MISSION_BK4_31B},
-	{"BNK4_32", STREAMED_SOUND_MISSION_BNK4_32},  {"BK4_34a", STREAMED_SOUND_MISSION_BK4_34A},  {"BK4_34b", STREAMED_SOUND_MISSION_BK4_34B},
-	{"BK4_35a", STREAMED_SOUND_MISSION_BK4_35A},  {"BK4_35b", STREAMED_SOUND_MISSION_BK4_35B},  {"BNK4_36", STREAMED_SOUND_MISSION_BNK4_36},
-	{"BNK4_37", STREAMED_SOUND_MISSION_BNK4_37},  {"BNK4_38", STREAMED_SOUND_MISSION_BNK4_38},  {"BNK_39", STREAMED_SOUND_MISSION_BNK4_39},
-	{"BK4_40a", STREAMED_SOUND_MISSION_BK4_40A},  {"BK4_40b", STREAMED_SOUND_MISSION_BK4_40B},  {"BNK4_41", STREAMED_SOUND_MISSION_BNK4_41},
-	{"BNK4_42", STREAMED_SOUND_MISSION_BNK4_42},  {"BNK4_43", STREAMED_SOUND_MISSION_BNK4_43},  {"BNK4_44", STREAMED_SOUND_MISSION_BNK4_44},
-	{"BNK4_45", STREAMED_SOUND_MISSION_BNK4_45},  {"BNK4_46", STREAMED_SOUND_MISSION_BNK4_46},  {"BNK4_47", STREAMED_SOUND_MISSION_BNK4_47},
-	{"BNK4_48", STREAMED_SOUND_MISSION_BNK4_48},  {"BNK4_49", STREAMED_SOUND_MISSION_BNK4_49},  {"BNK450A", STREAMED_SOUND_MISSION_BNK450A},
-	{"BNK450B", STREAMED_SOUND_MISSION_BNK450B},  {"BNK4_51", STREAMED_SOUND_MISSION_BNK4_51},  {"BNK4_94", STREAMED_SOUND_MISSION_BNK4_94},
-	{"BNK4_95", STREAMED_SOUND_MISSION_BNK4_95},  {"BNK4_96", STREAMED_SOUND_MISSION_BNK4_96},  {"BNK4_97", STREAMED_SOUND_MISSION_BNK4_97},
-	{"BNK4_98", STREAMED_SOUND_MISSION_BNK4_98},  {"BNK4_99", STREAMED_SOUND_MISSION_BNK4_99},  {"CNT1_1", STREAMED_SOUND_MISSION_CNT1_1},
-	{"CNT1_2", STREAMED_SOUND_MISSION_CNT1_2},    {"CNT1_3", STREAMED_SOUND_MISSION_CNT1_3},    {"CNT1_4", STREAMED_SOUND_MISSION_CNT1_4},
-	{"CNT1_5", STREAMED_SOUND_MISSION_CNT1_5},    {"CNT2_1", STREAMED_SOUND_MISSION_CNT2_1},    {"CNT2_2", STREAMED_SOUND_MISSION_CNT2_2},
-	{"CNT2_3", STREAMED_SOUND_MISSION_CNT2_3},    {"CNT2_4", STREAMED_SOUND_MISSION_CNT2_4},    {"PORN1_1", STREAMED_SOUND_MISSION_PORN1_1},
-	{"PORN1_2", STREAMED_SOUND_MISSION_PORN1_2},  {"PORN1_3", STREAMED_SOUND_MISSION_PORN1_3},  {"PRN1_3A", STREAMED_SOUND_MISSION_PRN1_3A},
-	{"PORN1_4", STREAMED_SOUND_MISSION_PORN1_4},  {"PORN1_5", STREAMED_SOUND_MISSION_PORN1_5},  {"PORN1_6", STREAMED_SOUND_MISSION_PORN1_6},
-	{"PORN1_7", STREAMED_SOUND_MISSION_PORN1_7},  {"PORN1_8", STREAMED_SOUND_MISSION_PORN1_8},  {"PORN1_9", STREAMED_SOUND_MISSION_PORN1_9},
-	{"PRN1_10", STREAMED_SOUND_MISSION_PRN1_10},  {"PRN1_11", STREAMED_SOUND_MISSION_PRN1_11},  {"PRN1_12", STREAMED_SOUND_MISSION_PRN1_12},
-	{"PRN1_13", STREAMED_SOUND_MISSION_PRN1_13},  {"PRN1_14", STREAMED_SOUND_MISSION_PRN1_14},  {"PRN1_15", STREAMED_SOUND_MISSION_PRN1_15},
-	{"PRN1_16", STREAMED_SOUND_MISSION_PRN1_16},  {"PRN1_17", STREAMED_SOUND_MISSION_PRN1_17},  {"PRN1_18", STREAMED_SOUND_MISSION_PRN1_18},
-	{"PRN1_19", STREAMED_SOUND_MISSION_PRN1_19},  {"PRN1_20", STREAMED_SOUND_MISSION_PRN1_20},  {"PRN1_21", STREAMED_SOUND_MISSION_PRN1_21},
-	{"PORN3_1", STREAMED_SOUND_MISSION_PORN3_1},  {"PORN3_2", STREAMED_SOUND_MISSION_PORN3_2},  {"PORN3_3", STREAMED_SOUND_MISSION_PORN3_3},
-	{"PORN3_4", STREAMED_SOUND_MISSION_PORN3_4},  {"TAX1_1", STREAMED_SOUND_MISSION_TAX1_1},    {"TAX1_2", STREAMED_SOUND_MISSION_TAX1_2},
-	{"TAX1_3", STREAMED_SOUND_MISSION_TAX1_3},    {"TAX1_4", STREAMED_SOUND_MISSION_TAX1_4},    {"TAX1_5", STREAMED_SOUND_MISSION_TAX1_5},
-	{"TAX2_1", STREAMED_SOUND_MISSION_TAX2_1},    {"TAX2_2", STREAMED_SOUND_MISSION_TAX2_2},    {"TAX2_3", STREAMED_SOUND_MISSION_TAX2_3},
-	{"TAX2_4", STREAMED_SOUND_MISSION_TAX2_4},    {"TAX2_5", STREAMED_SOUND_MISSION_TAX2_5},    {"TAX2_6", STREAMED_SOUND_MISSION_TAX2_6},
-	{"TAX2_7", STREAMED_SOUND_MISSION_TAX2_7},    {"TAX3_1", STREAMED_SOUND_MISSION_TAX3_1},    {"TAX3_2", STREAMED_SOUND_MISSION_TAX3_2},
-	{"TAX3_3", STREAMED_SOUND_MISSION_TAX3_3},    {"TAX3_4", STREAMED_SOUND_MISSION_TAX3_4},    {"TAX3_5", STREAMED_SOUND_MISSION_TAX3_5},
-	{"TEX1_1", STREAMED_SOUND_MISSION_TEX1_1},    {"TEX1_2", STREAMED_SOUND_MISSION_TEX1_2},    {"TEX1_3", STREAMED_SOUND_MISSION_TEX1_3},
-	{"TEX1_4", STREAMED_SOUND_MISSION_TEX1_4},    {"TEX1_5", STREAMED_SOUND_MISSION_TEX1_5},    {"TEX1_6", STREAMED_SOUND_MISSION_TEX1_6},
-	{"TEX2_1", STREAMED_SOUND_MISSION_TEX2_1},    {"TEX3_1", STREAMED_SOUND_MISSION_TEX3_1},    {"TEX3_2", STREAMED_SOUND_MISSION_TEX3_2},
-	{"TEX3_3", STREAMED_SOUND_MISSION_TEX3_3},    {"TEX3_4", STREAMED_SOUND_MISSION_TEX3_4},    {"TEX3_5", STREAMED_SOUND_MISSION_TEX3_5},
-	{"TEX3_6", STREAMED_SOUND_MISSION_TEX3_6},    {"TEX3_7", STREAMED_SOUND_MISSION_TEX3_7},    {"TEX3_8", STREAMED_SOUND_MISSION_TEX3_8},
-	{"PHIL1_2", STREAMED_SOUND_MISSION_PHIL1_2},  {"PHIL1_3", STREAMED_SOUND_MISSION_PHIL1_3},  {"PHIL2_1", STREAMED_SOUND_MISSION_PHIL2_1},
-	{"PHIL2_2", STREAMED_SOUND_MISSION_PHIL2_2},  {"PHIL2_3", STREAMED_SOUND_MISSION_PHIL2_3},  {"PHIL2_4", STREAMED_SOUND_MISSION_PHIL2_4},
-	{"PHIL2_5", STREAMED_SOUND_MISSION_PHIL2_5},  {"PHIL2_6", STREAMED_SOUND_MISSION_PHIL2_6},  {"PHIL2_7", STREAMED_SOUND_MISSION_PHIL2_7},
-	{"PHIL2_8", STREAMED_SOUND_MISSION_PHIL2_8},  {"PHIL2_9", STREAMED_SOUND_MISSION_PHIL2_9},  {"PHIL210", STREAMED_SOUND_MISSION_PHIL210},
-	{"PHIL211", STREAMED_SOUND_MISSION_PHIL211},  {"BIKE1_1", STREAMED_SOUND_MISSION_BIKE1_1},  {"BIKE1_2", STREAMED_SOUND_MISSION_BIKE1_2},
-	{"BIKE1_3", STREAMED_SOUND_MISSION_BIKE1_3},  {"ROK1_1a", STREAMED_SOUND_MISSION_ROK1_1A},  {"ROK1_1b", STREAMED_SOUND_MISSION_ROK1_1B},
-	{"ROK1_5", STREAMED_SOUND_MISSION_ROK1_5},    {"ROK1_6", STREAMED_SOUND_MISSION_ROK1_6},    {"ROK1_7", STREAMED_SOUND_MISSION_ROK1_7},
-	{"ROK1_8", STREAMED_SOUND_MISSION_ROK1_8},    {"ROK1_9", STREAMED_SOUND_MISSION_ROK1_9},    {"PSYCH_1", STREAMED_SOUND_MISSION_PSYCH_1},
-	{"PSYCH_2", STREAMED_SOUND_MISSION_PSYCH_2},  {"ROK2_01", STREAMED_SOUND_MISSION_ROK2_01},  {"ROK3_1", STREAMED_SOUND_MISSION_ROK3_1},
-	{"ROK3_2", STREAMED_SOUND_MISSION_ROK3_2},    {"ROK3_3", STREAMED_SOUND_MISSION_ROK3_3},    {"ROK3_4", STREAMED_SOUND_MISSION_ROK3_4},
-	{"ROK3_5", STREAMED_SOUND_MISSION_ROK3_5},    {"ROK3_6", STREAMED_SOUND_MISSION_ROK3_6},    {"ROK3_7", STREAMED_SOUND_MISSION_ROK3_7},
-	{"ROK3_8", STREAMED_SOUND_MISSION_ROK3_8},    {"ROK3_9", STREAMED_SOUND_MISSION_ROK3_9},    {"ROK3_10", STREAMED_SOUND_MISSION_ROK3_10},
-	{"ROK3_11", STREAMED_SOUND_MISSION_ROK3_11},  {"ROK3_12", STREAMED_SOUND_MISSION_ROK3_12},  {"ROK3_13", STREAMED_SOUND_MISSION_ROK3_13},
-	{"ROK3_14", STREAMED_SOUND_MISSION_ROK3_14},  {"ROK3_15", STREAMED_SOUND_MISSION_ROK3_15},  {"ROK3_16", STREAMED_SOUND_MISSION_ROK3_16},
-	{"ROK3_17", STREAMED_SOUND_MISSION_ROK3_17},  {"ROK3_18", STREAMED_SOUND_MISSION_ROK3_18},  {"ROK3_19", STREAMED_SOUND_MISSION_ROK3_19},
-	{"ROK3_20", STREAMED_SOUND_MISSION_ROK3_20},  {"ROK3_21", STREAMED_SOUND_MISSION_ROK3_21},  {"ROK3_22", STREAMED_SOUND_MISSION_ROK3_22},
-	{"ROK3_23", STREAMED_SOUND_MISSION_ROK3_23},  {"ROK3_24", STREAMED_SOUND_MISSION_ROK3_24},  {"ROK3_25", STREAMED_SOUND_MISSION_ROK3_25},
-	{"ROK3_26", STREAMED_SOUND_MISSION_ROK3_26},  {"ROK3_27", STREAMED_SOUND_MISSION_ROK3_27},  {"ROK3_62", STREAMED_SOUND_MISSION_ROK3_62},
-	{"ROK3_63", STREAMED_SOUND_MISSION_ROK3_63},  {"ROK3_64", STREAMED_SOUND_MISSION_ROK3_64},  {"ROK3_65", STREAMED_SOUND_MISSION_ROK3_65},
-	{"ROK3_66", STREAMED_SOUND_MISSION_ROK3_66},  {"ROK3_67", STREAMED_SOUND_MISSION_ROK3_67},  {"ROK3_68", STREAMED_SOUND_MISSION_ROK3_68},
-	{"ROK3_69", STREAMED_SOUND_MISSION_ROK3_69},  {"ROK3_70", STREAMED_SOUND_MISSION_ROK3_70},  {"ROK3_71", STREAMED_SOUND_MISSION_ROK3_71},
-	{"ROK3_73", STREAMED_SOUND_MISSION_ROK3_73},  {"HAT_1a", STREAMED_SOUND_MISSION_HAT_1A},    {"intro1", STREAMED_SOUND_MISSION_INTRO1},
-	{"intro2", STREAMED_SOUND_MISSION_INTRO2},    {"intro3", STREAMED_SOUND_MISSION_INTRO3},    {"intro4", STREAMED_SOUND_MISSION_INTRO4},
-	{"CUB1_1", STREAMED_SOUND_MISSION_CUB1_1},    {"CUB1_2", STREAMED_SOUND_MISSION_CUB1_2},    {"CUB1_3", STREAMED_SOUND_MISSION_CUB1_3},
-	{"CUB1_4", STREAMED_SOUND_MISSION_CUB1_4},    {"CUB1_5", STREAMED_SOUND_MISSION_CUB1_5},    {"CUB1_6", STREAMED_SOUND_MISSION_CUB1_6},
-	{"CUB1_7", STREAMED_SOUND_MISSION_CUB1_7},    {"CUB1_8", STREAMED_SOUND_MISSION_CUB1_8},    {"CUB1_9", STREAMED_SOUND_MISSION_CUB1_9},
-	{"CUB1_10", STREAMED_SOUND_MISSION_CUB1_10},  {"CUB2_1", STREAMED_SOUND_MISSION_CUB2_1},    {"CUB2_2", STREAMED_SOUND_MISSION_CUB2_2},
-	{"CUB2_3a", STREAMED_SOUND_MISSION_CUB2_3A},  {"CUB2_3b", STREAMED_SOUND_MISSION_CUB2_3B},  {"CUB2_3c", STREAMED_SOUND_MISSION_CUB2_3C},
-	{"CUB2_4a", STREAMED_SOUND_MISSION_CUB2_4A},  {"CUB2_5", STREAMED_SOUND_MISSION_CUB2_5},    {"CUB2_6", STREAMED_SOUND_MISSION_CUB2_6},
-	{"CUB2_7", STREAMED_SOUND_MISSION_CUB2_7},    {"CUB2_8", STREAMED_SOUND_MISSION_CUB2_8},    {"CUB2_9", STREAMED_SOUND_MISSION_CUB2_9},
-	{"CUB2_10", STREAMED_SOUND_MISSION_CUB2_10},  {"CUB2_11", STREAMED_SOUND_MISSION_CUB2_11},  {"CUB3_1", STREAMED_SOUND_MISSION_CUB3_1},
-	{"CUB3_2", STREAMED_SOUND_MISSION_CUB3_2},    {"CUB3_3", STREAMED_SOUND_MISSION_CUB3_3},    {"CUB3_4", STREAMED_SOUND_MISSION_CUB3_4},
-	{"CUB4_1", STREAMED_SOUND_MISSION_CUB4_1},    {"CUB4_2", STREAMED_SOUND_MISSION_CUB4_2},    {"CUB4_3", STREAMED_SOUND_MISSION_CUB4_3},
-	{"CUB4_4", STREAMED_SOUND_MISSION_CUB4_4},    {"CUB4_5", STREAMED_SOUND_MISSION_CUB4_5},    {"CUB4_5A", STREAMED_SOUND_MISSION_CUB4_5A},
-	{"CUB4_6", STREAMED_SOUND_MISSION_CUB4_6},    {"CUB4_7", STREAMED_SOUND_MISSION_CUB4_7},    {"CUB4_8", STREAMED_SOUND_MISSION_CUB4_8},
-	{"CUB4_9", STREAMED_SOUND_MISSION_CUB4_9},    {"CUB4_10", STREAMED_SOUND_MISSION_CUB4_10},  {"CUB4_11", STREAMED_SOUND_MISSION_CUB4_11},
-	{"CUB4_12", STREAMED_SOUND_MISSION_CUB4_12},  {"CUB4_13", STREAMED_SOUND_MISSION_CUB4_13},  {"CUB4_14", STREAMED_SOUND_MISSION_CUB4_14},
-	{"CUB4_15", STREAMED_SOUND_MISSION_CUB4_15},  {"CUB4_16", STREAMED_SOUND_MISSION_CUB4_16},  {"golf_1", STREAMED_SOUND_MISSION_GOLF_1},
-	{"golf_2", STREAMED_SOUND_MISSION_GOLF_2},    {"golf_3", STREAMED_SOUND_MISSION_GOLF_3},    {"bar_1", STREAMED_SOUND_MISSION_BAR_1},
-	{"bar_2", STREAMED_SOUND_MISSION_BAR_2},      {"bar_3", STREAMED_SOUND_MISSION_BAR_3},      {"bar_4", STREAMED_SOUND_MISSION_BAR_4},
-	{"bar_5", STREAMED_SOUND_MISSION_BAR_5},      {"bar_6", STREAMED_SOUND_MISSION_BAR_6},      {"bar_7", STREAMED_SOUND_MISSION_BAR_7},
-	{"bar_8", STREAMED_SOUND_MISSION_BAR_8},      {"strip_1", STREAMED_SOUND_MISSION_STRIP_1},  {"strip_2", STREAMED_SOUND_MISSION_STRIP_2},
-	{"strip_3", STREAMED_SOUND_MISSION_STRIP_3},  {"strip_4", STREAMED_SOUND_MISSION_STRIP_4},  {"strip_5", STREAMED_SOUND_MISSION_STRIP_5},
-	{"strip_6", STREAMED_SOUND_MISSION_STRIP_6},  {"strip_7", STREAMED_SOUND_MISSION_STRIP_7},  {"strip_8", STREAMED_SOUND_MISSION_STRIP_8},
-	{"strip_9", STREAMED_SOUND_MISSION_STRIP_9},  {"star_1", STREAMED_SOUND_MISSION_STAR_1},    {"star_2", STREAMED_SOUND_MISSION_STAR_2},
-	{"star_3", STREAMED_SOUND_MISSION_STAR_3},    {"star_4", STREAMED_SOUND_MISSION_STAR_4},    {"mob_01a", STREAMED_SOUND_MISSION_MOB_01A},
-	{"mob_01b", STREAMED_SOUND_MISSION_MOB_01B},  {"mob_01c", STREAMED_SOUND_MISSION_MOB_01C},  {"mob_02a", STREAMED_SOUND_MISSION_MOB_02A},
-	{"mob_02b", STREAMED_SOUND_MISSION_MOB_02B},  {"mob_02c", STREAMED_SOUND_MISSION_MOB_02C},  {"mob_03a", STREAMED_SOUND_MISSION_MOB_03A},
-	{"mob_03b", STREAMED_SOUND_MISSION_MOB_03B},  {"mob_03c", STREAMED_SOUND_MISSION_MOB_03C},  {"mob_03d", STREAMED_SOUND_MISSION_MOB_03D},
-	{"mob_03e", STREAMED_SOUND_MISSION_MOB_03E},  {"shark_1", STREAMED_SOUND_MISSION_SHARK_1},  {"shark_2", STREAMED_SOUND_MISSION_SHARK_2},
-	{"shark_3", STREAMED_SOUND_MISSION_SHARK_3},  {"shark_4", STREAMED_SOUND_MISSION_SHARK_4},  {"shark_5", STREAMED_SOUND_MISSION_SHARK_5},
-	{"mob_04a", STREAMED_SOUND_MISSION_MOB_04A},  {"mob_04b", STREAMED_SOUND_MISSION_MOB_04B},  {"mob_04c", STREAMED_SOUND_MISSION_MOB_04C},
-	{"mob_04d", STREAMED_SOUND_MISSION_MOB_04D},  {"mob_05a", STREAMED_SOUND_MISSION_MOB_05A},  {"mob_05b", STREAMED_SOUND_MISSION_MOB_05B},
-	{"mob_05c", STREAMED_SOUND_MISSION_MOB_05C},  {"mob_05d", STREAMED_SOUND_MISSION_MOB_05D},  {"mob_06a", STREAMED_SOUND_MISSION_MOB_06A},
-	{"mob_06b", STREAMED_SOUND_MISSION_MOB_06B},  {"mob_06c", STREAMED_SOUND_MISSION_MOB_06C},  {"mob_07a", STREAMED_SOUND_MISSION_MOB_07A},
-	{"mob_07b", STREAMED_SOUND_MISSION_MOB_07B},  {"mob_08a", STREAMED_SOUND_MISSION_MOB_08A},  {"mob_08b", STREAMED_SOUND_MISSION_MOB_08B},
-	{"mob_08c", STREAMED_SOUND_MISSION_MOB_08C},  {"mob_08d", STREAMED_SOUND_MISSION_MOB_08D},  {"mob_08e", STREAMED_SOUND_MISSION_MOB_08E},
-	{"mob_08f", STREAMED_SOUND_MISSION_MOB_08F},  {"mob_08g", STREAMED_SOUND_MISSION_MOB_08G},  {"mob_09a", STREAMED_SOUND_MISSION_MOB_09A},
-	{"mob_09b", STREAMED_SOUND_MISSION_MOB_09B},  {"mob_09c", STREAMED_SOUND_MISSION_MOB_09C},  {"mob_09d", STREAMED_SOUND_MISSION_MOB_09D},
-	{"mob_09e", STREAMED_SOUND_MISSION_MOB_09E},  {"mob_09f", STREAMED_SOUND_MISSION_MOB_09F},  {"mob_10a", STREAMED_SOUND_MISSION_MOB_10A},
-	{"mob_10b", STREAMED_SOUND_MISSION_MOB_10B},  {"mob_10c", STREAMED_SOUND_MISSION_MOB_10C},  {"mob_10d", STREAMED_SOUND_MISSION_MOB_10D},
-	{"mob_10e", STREAMED_SOUND_MISSION_MOB_10E},  {"mob_11a", STREAMED_SOUND_MISSION_MOB_11A},  {"mob_11b", STREAMED_SOUND_MISSION_MOB_11B},
-	{"mob_11c", STREAMED_SOUND_MISSION_MOB_11C},  {"mob_11d", STREAMED_SOUND_MISSION_MOB_11D},  {"mob_11e", STREAMED_SOUND_MISSION_MOB_11E},
-	{"mob_11f", STREAMED_SOUND_MISSION_MOB_11F},  {"mob_14a", STREAMED_SOUND_MISSION_MOB_14A},  {"mob_14b", STREAMED_SOUND_MISSION_MOB_14B},
-	{"mob_14c", STREAMED_SOUND_MISSION_MOB_14C},  {"mob_14d", STREAMED_SOUND_MISSION_MOB_14D},  {"mob_14e", STREAMED_SOUND_MISSION_MOB_14E},
-	{"mob_14f", STREAMED_SOUND_MISSION_MOB_14F},  {"mob_14g", STREAMED_SOUND_MISSION_MOB_14G},  {"mob_14h", STREAMED_SOUND_MISSION_MOB_14H},
-	{"mob_16a", STREAMED_SOUND_MISSION_MOB_16A},  {"mob_16b", STREAMED_SOUND_MISSION_MOB_16B},  {"mob_16c", STREAMED_SOUND_MISSION_MOB_16C},
-	{"mob_16d", STREAMED_SOUND_MISSION_MOB_16D},  {"mob_16e", STREAMED_SOUND_MISSION_MOB_16E},  {"mob_16f", STREAMED_SOUND_MISSION_MOB_16F},
-	{"mob_16g", STREAMED_SOUND_MISSION_MOB_16G},  {"mob_17a", STREAMED_SOUND_MISSION_MOB_17A},  {"mob_17b", STREAMED_SOUND_MISSION_MOB_17B},
-	{"mob_17c", STREAMED_SOUND_MISSION_MOB_17C},  {"mob_17d", STREAMED_SOUND_MISSION_MOB_17D},  {"mob_17e", STREAMED_SOUND_MISSION_MOB_17E},
-	{"mob_17g", STREAMED_SOUND_MISSION_MOB_17G},  {"mob_17h", STREAMED_SOUND_MISSION_MOB_17H},  {"mob_17i", STREAMED_SOUND_MISSION_MOB_17I},
-	{"mob_17j", STREAMED_SOUND_MISSION_MOB_17J},  {"mob_17k", STREAMED_SOUND_MISSION_MOB_17K},  {"mob_17l", STREAMED_SOUND_MISSION_MOB_17L},
-	{"mob_18a", STREAMED_SOUND_MISSION_MOB_18A},  {"mob_18b", STREAMED_SOUND_MISSION_MOB_18B},  {"mob_18c", STREAMED_SOUND_MISSION_MOB_18C},
-	{"mob_18d", STREAMED_SOUND_MISSION_MOB_18D},  {"mob_18e", STREAMED_SOUND_MISSION_MOB_18E},  {"mob_18f", STREAMED_SOUND_MISSION_MOB_18F},
-	{"mob_18g", STREAMED_SOUND_MISSION_MOB_18G},  {"mob_20a", STREAMED_SOUND_MISSION_MOB_20A},  {"mob_20b", STREAMED_SOUND_MISSION_MOB_20B},
-	{"mob_20c", STREAMED_SOUND_MISSION_MOB_20C},  {"mob_20d", STREAMED_SOUND_MISSION_MOB_20D},  {"mob_20e", STREAMED_SOUND_MISSION_MOB_20E},
-	{"mob_24a", STREAMED_SOUND_MISSION_MOB_24A},  {"mob_24b", STREAMED_SOUND_MISSION_MOB_24B},  {"mob_24c", STREAMED_SOUND_MISSION_MOB_24C},
-	{"mob_24d", STREAMED_SOUND_MISSION_MOB_24D},  {"mob_24e", STREAMED_SOUND_MISSION_MOB_24E},  {"mob_24f", STREAMED_SOUND_MISSION_MOB_24F},
-	{"mob_24g", STREAMED_SOUND_MISSION_MOB_24G},  {"mob_24h", STREAMED_SOUND_MISSION_MOB_24H},  {"mob_25a", STREAMED_SOUND_MISSION_MOB_25A},
-	{"mob_25b", STREAMED_SOUND_MISSION_MOB_25B},  {"mob_25c", STREAMED_SOUND_MISSION_MOB_25C},  {"mob_25d", STREAMED_SOUND_MISSION_MOB_25D},
-	{"mob_26a", STREAMED_SOUND_MISSION_MOB_26A},  {"mob_26b", STREAMED_SOUND_MISSION_MOB_26B},  {"mob_26c", STREAMED_SOUND_MISSION_MOB_26C},
-	{"mob_26d", STREAMED_SOUND_MISSION_MOB_26D},  {"mob_26e", STREAMED_SOUND_MISSION_MOB_26E},  {"mob_29a", STREAMED_SOUND_MISSION_MOB_29A},
-	{"mob_29b", STREAMED_SOUND_MISSION_MOB_29B},  {"mob_29c", STREAMED_SOUND_MISSION_MOB_29C},  {"mob_29d", STREAMED_SOUND_MISSION_MOB_29D},
-	{"mob_29e", STREAMED_SOUND_MISSION_MOB_29E},  {"mob_29f", STREAMED_SOUND_MISSION_MOB_29F},  {"mob_29g", STREAMED_SOUND_MISSION_MOB_29G},
-	{"mob_30a", STREAMED_SOUND_MISSION_MOB_30A},  {"mob_30b", STREAMED_SOUND_MISSION_MOB_30B},  {"mob_30c", STREAMED_SOUND_MISSION_MOB_30C},
-	{"mob_30d", STREAMED_SOUND_MISSION_MOB_30D},  {"mob_30e", STREAMED_SOUND_MISSION_MOB_30E},  {"mob_30f", STREAMED_SOUND_MISSION_MOB_30F},
-	{"mob_33a", STREAMED_SOUND_MISSION_MOB_33A},  {"mob_33b", STREAMED_SOUND_MISSION_MOB_33B},  {"mob_33c", STREAMED_SOUND_MISSION_MOB_33C},
-	{"mob_33d", STREAMED_SOUND_MISSION_MOB_33D},  {"mob_34a", STREAMED_SOUND_MISSION_MOB_34A},  {"mob_34b", STREAMED_SOUND_MISSION_MOB_34B},
-	{"mob_34c", STREAMED_SOUND_MISSION_MOB_34C},  {"mob_34d", STREAMED_SOUND_MISSION_MOB_34D},  {"mob_35a", STREAMED_SOUND_MISSION_MOB_35A},
-	{"mob_35b", STREAMED_SOUND_MISSION_MOB_35B},  {"mob_35c", STREAMED_SOUND_MISSION_MOB_35C},  {"mob_35d", STREAMED_SOUND_MISSION_MOB_35D},
-	{"mob_36a", STREAMED_SOUND_MISSION_MOB_36A},  {"mob_36b", STREAMED_SOUND_MISSION_MOB_36B},  {"mob_36c", STREAMED_SOUND_MISSION_MOB_36C},
-	{"mob_40a", STREAMED_SOUND_MISSION_MOB_40A},  {"mob_40b", STREAMED_SOUND_MISSION_MOB_40B},  {"mob_40c", STREAMED_SOUND_MISSION_MOB_40C},
-	{"mob_40d", STREAMED_SOUND_MISSION_MOB_40D},  {"mob_40e", STREAMED_SOUND_MISSION_MOB_40E},  {"mob_40f", STREAMED_SOUND_MISSION_MOB_40F},
-	{"mob_40g", STREAMED_SOUND_MISSION_MOB_40G},  {"mob_40h", STREAMED_SOUND_MISSION_MOB_40H},  {"mob_40i", STREAMED_SOUND_MISSION_MOB_40I},
-	{"mob_41a", STREAMED_SOUND_MISSION_MOB_41A},  {"mob_41b", STREAMED_SOUND_MISSION_MOB_41B},  {"mob_41c", STREAMED_SOUND_MISSION_MOB_41C},
-	{"mob_41d", STREAMED_SOUND_MISSION_MOB_41D},  {"mob_41e", STREAMED_SOUND_MISSION_MOB_41E},  {"mob_41f", STREAMED_SOUND_MISSION_MOB_41F},
-	{"mob_41g", STREAMED_SOUND_MISSION_MOB_41G},  {"mob_41h", STREAMED_SOUND_MISSION_MOB_41H},  {"mob_42a", STREAMED_SOUND_MISSION_MOB_42A},
-	{"mob_42b", STREAMED_SOUND_MISSION_MOB_42B},  {"mob_42c", STREAMED_SOUND_MISSION_MOB_42C},  {"mob_42d", STREAMED_SOUND_MISSION_MOB_42D},
-	{"mob_42e", STREAMED_SOUND_MISSION_MOB_42E},  {"mob_43a", STREAMED_SOUND_MISSION_MOB_43A},  {"mob_43b", STREAMED_SOUND_MISSION_MOB_43B},
-	{"mob_43c", STREAMED_SOUND_MISSION_MOB_43C},  {"mob_43d", STREAMED_SOUND_MISSION_MOB_43D},  {"mob_43e", STREAMED_SOUND_MISSION_MOB_43E},
-	{"mob_43f", STREAMED_SOUND_MISSION_MOB_43F},  {"mob_43g", STREAMED_SOUND_MISSION_MOB_43G},  {"mob_43h", STREAMED_SOUND_MISSION_MOB_43H},
-	{"mob_45a", STREAMED_SOUND_MISSION_MOB_45A},  {"mob_45b", STREAMED_SOUND_MISSION_MOB_45B},  {"mob_45c", STREAMED_SOUND_MISSION_MOB_45C},
-	{"mob_45d", STREAMED_SOUND_MISSION_MOB_45D},  {"mob_45e", STREAMED_SOUND_MISSION_MOB_45E},  {"mob_45f", STREAMED_SOUND_MISSION_MOB_45F},
-	{"mob_45g", STREAMED_SOUND_MISSION_MOB_45G},  {"mob_45h", STREAMED_SOUND_MISSION_MOB_45H},  {"mob_45i", STREAMED_SOUND_MISSION_MOB_45I},
-	{"mob_45j", STREAMED_SOUND_MISSION_MOB_45J},  {"mob_45k", STREAMED_SOUND_MISSION_MOB_45K},  {"mob_45l", STREAMED_SOUND_MISSION_MOB_45L},
-	{"mob_45m", STREAMED_SOUND_MISSION_MOB_45M},  {"mob_45n", STREAMED_SOUND_MISSION_MOB_45N},  {"mob_46a", STREAMED_SOUND_MISSION_MOB_46A},
-	{"mob_46b", STREAMED_SOUND_MISSION_MOB_46B},  {"mob_46c", STREAMED_SOUND_MISSION_MOB_46C},  {"mob_46d", STREAMED_SOUND_MISSION_MOB_46D},
-	{"mob_46e", STREAMED_SOUND_MISSION_MOB_46E},  {"mob_46f", STREAMED_SOUND_MISSION_MOB_46F},  {"mob_46g", STREAMED_SOUND_MISSION_MOB_46G},
-	{"mob_46h", STREAMED_SOUND_MISSION_MOB_46H},  {"mob_47a", STREAMED_SOUND_MISSION_MOB_47A},  {"mob_52a", STREAMED_SOUND_MISSION_MOB_52A},
-	{"mob_52b", STREAMED_SOUND_MISSION_MOB_52B},  {"mob_52c", STREAMED_SOUND_MISSION_MOB_52C},  {"mob_52d", STREAMED_SOUND_MISSION_MOB_52D},
-	{"mob_52e", STREAMED_SOUND_MISSION_MOB_52E},  {"mob_52f", STREAMED_SOUND_MISSION_MOB_52F},  {"mob_52g", STREAMED_SOUND_MISSION_MOB_52G},
-	{"mob_52h", STREAMED_SOUND_MISSION_MOB_52H},  {"mob_54a", STREAMED_SOUND_MISSION_MOB_54A},  {"mob_54b", STREAMED_SOUND_MISSION_MOB_54B},
-	{"mob_54c", STREAMED_SOUND_MISSION_MOB_54C},  {"mob_54d", STREAMED_SOUND_MISSION_MOB_54D},  {"mob_54e", STREAMED_SOUND_MISSION_MOB_54E},
-	{"mob_55a", STREAMED_SOUND_MISSION_MOB_55A},  {"mob_55b", STREAMED_SOUND_MISSION_MOB_55B},  {"mob_55c", STREAMED_SOUND_MISSION_MOB_55C},
-	{"mob_55d", STREAMED_SOUND_MISSION_MOB_55D},  {"mob_55e", STREAMED_SOUND_MISSION_MOB_55E},  {"mob_55f", STREAMED_SOUND_MISSION_MOB_55F},
-	{"mob_56a", STREAMED_SOUND_MISSION_MOB_56A},  {"mob_56b", STREAMED_SOUND_MISSION_MOB_56B},  {"mob_56c", STREAMED_SOUND_MISSION_MOB_56C},
-	{"mob_56d", STREAMED_SOUND_MISSION_MOB_56D},  {"mob_56e", STREAMED_SOUND_MISSION_MOB_56E},  {"mob_56f", STREAMED_SOUND_MISSION_MOB_56F},
-	{"mob_57a", STREAMED_SOUND_MISSION_MOB_57A},  {"mob_57b", STREAMED_SOUND_MISSION_MOB_57B},  {"mob_57c", STREAMED_SOUND_MISSION_MOB_57C},
-	{"mob_57d", STREAMED_SOUND_MISSION_MOB_57D},  {"mob_57e", STREAMED_SOUND_MISSION_MOB_57E},  {"mob_58a", STREAMED_SOUND_MISSION_MOB_58A},
-	{"mob_58b", STREAMED_SOUND_MISSION_MOB_58B},  {"mob_58c", STREAMED_SOUND_MISSION_MOB_58C},  {"mob_58d", STREAMED_SOUND_MISSION_MOB_58D},
-	{"mob_58e", STREAMED_SOUND_MISSION_MOB_58E},  {"mob_58f", STREAMED_SOUND_MISSION_MOB_58F},  {"mob_58g", STREAMED_SOUND_MISSION_MOB_58G},
-	{"mob_61a", STREAMED_SOUND_MISSION_MOB_61A},  {"mob_61b", STREAMED_SOUND_MISSION_MOB_61B},  {"mob_62a", STREAMED_SOUND_MISSION_MOB_62A},
-	{"mob_62b", STREAMED_SOUND_MISSION_MOB_62B},  {"mob_62c", STREAMED_SOUND_MISSION_MOB_62C},  {"mob_62d", STREAMED_SOUND_MISSION_MOB_62D},
-	{"mob_63a", STREAMED_SOUND_MISSION_MOB_63A},  {"mob_63b", STREAMED_SOUND_MISSION_MOB_63B},  {"mob_63c", STREAMED_SOUND_MISSION_MOB_63C},
-	{"mob_63d", STREAMED_SOUND_MISSION_MOB_63D},  {"mob_63e", STREAMED_SOUND_MISSION_MOB_63E},  {"mob_63f", STREAMED_SOUND_MISSION_MOB_63F},
-	{"mob_63g", STREAMED_SOUND_MISSION_MOB_63G},  {"mob_63h", STREAMED_SOUND_MISSION_MOB_63H},  {"mob_63i", STREAMED_SOUND_MISSION_MOB_63I},
-	{"mob_63j", STREAMED_SOUND_MISSION_MOB_63J},  {"mob_66a", STREAMED_SOUND_MISSION_MOB_66A},  {"mob_66b", STREAMED_SOUND_MISSION_MOB_66B},
-	{"mob_68a", STREAMED_SOUND_MISSION_MOB_68A},  {"mob_68b", STREAMED_SOUND_MISSION_MOB_68B},  {"mob_68c", STREAMED_SOUND_MISSION_MOB_68C},
-	{"mob_68d", STREAMED_SOUND_MISSION_MOB_68D},  {"mob_70a", STREAMED_SOUND_MISSION_MOB_70A},  {"mob_70b", STREAMED_SOUND_MISSION_MOB_70B},
-	{"mob_71a", STREAMED_SOUND_MISSION_MOB_71A},  {"mob_71b", STREAMED_SOUND_MISSION_MOB_71B},  {"mob_71c", STREAMED_SOUND_MISSION_MOB_71C},
-	{"mob_71d", STREAMED_SOUND_MISSION_MOB_71D},  {"mob_71e", STREAMED_SOUND_MISSION_MOB_71E},  {"mob_71f", STREAMED_SOUND_MISSION_MOB_71F},
-	{"mob_71g", STREAMED_SOUND_MISSION_MOB_71G},  {"mob_71h", STREAMED_SOUND_MISSION_MOB_71H},  {"mob_71i", STREAMED_SOUND_MISSION_MOB_71I},
-	{"mob_71j", STREAMED_SOUND_MISSION_MOB_71J},  {"mob_71k", STREAMED_SOUND_MISSION_MOB_71K},  {"mob_71l", STREAMED_SOUND_MISSION_MOB_71L},
-	{"mob_71m", STREAMED_SOUND_MISSION_MOB_71M},  {"mob_71n", STREAMED_SOUND_MISSION_MOB_71N},  {"mob_72a", STREAMED_SOUND_MISSION_MOB_72A},
-	{"mob_72b", STREAMED_SOUND_MISSION_MOB_72B},  {"mob_72c", STREAMED_SOUND_MISSION_MOB_72C},  {"mob_72d", STREAMED_SOUND_MISSION_MOB_72D},
-	{"mob_72e", STREAMED_SOUND_MISSION_MOB_72E},  {"mob_72f", STREAMED_SOUND_MISSION_MOB_72F},  {"mob_72g", STREAMED_SOUND_MISSION_MOB_72G},
-	{"mob_73a", STREAMED_SOUND_MISSION_MOB_73A},  {"mob_73c", STREAMED_SOUND_MISSION_MOB_73C},  {"mob_73d", STREAMED_SOUND_MISSION_MOB_73D},
-	{"mob_73f", STREAMED_SOUND_MISSION_MOB_73F},  {"mob_73g", STREAMED_SOUND_MISSION_MOB_73G},  {"mob_73i", STREAMED_SOUND_MISSION_MOB_73I},
-	{"mob_95a", STREAMED_SOUND_MISSION_MOB_95A},  {"mob_96a", STREAMED_SOUND_MISSION_MOB_96A},  {"mob_98a", STREAMED_SOUND_MISSION_MOB_98A},
-	{"mob_99a", STREAMED_SOUND_MISSION_MOB_99A},  {"job1_1b", STREAMED_SOUND_MISSION_JOB1_1B},  {"job1_1c", STREAMED_SOUND_MISSION_JOB1_1C},
-	{"job1_1d", STREAMED_SOUND_MISSION_JOB1_1D},  {"job2_1b", STREAMED_SOUND_MISSION_JOB2_1B},  {"job2_2", STREAMED_SOUND_MISSION_JOB2_2},
-	{"job2_3", STREAMED_SOUND_MISSION_JOB2_3},    {"job2_4", STREAMED_SOUND_MISSION_JOB2_4},    {"job2_5", STREAMED_SOUND_MISSION_JOB2_5},
-	{"job2_6", STREAMED_SOUND_MISSION_JOB2_6},    {"job2_7", STREAMED_SOUND_MISSION_JOB2_7},    {"job2_8", STREAMED_SOUND_MISSION_JOB2_8},
-	{"job2_9", STREAMED_SOUND_MISSION_JOB2_9},    {"job3_1", STREAMED_SOUND_MISSION_JOB3_1},    {"job3_2", STREAMED_SOUND_MISSION_JOB3_2},
-	{"job3_3", STREAMED_SOUND_MISSION_JOB3_3},    {"job4_1", STREAMED_SOUND_MISSION_JOB4_1},    {"job4_2", STREAMED_SOUND_MISSION_JOB4_2},
-	{"job4_3", STREAMED_SOUND_MISSION_JOB4_3},    {"job5_1", STREAMED_SOUND_MISSION_JOB5_1},    {"job5_2", STREAMED_SOUND_MISSION_JOB5_2},
-	{"job5_3", STREAMED_SOUND_MISSION_JOB5_3},    {"bjm1_20", STREAMED_SOUND_MISSION_BJM1_20},  {"bjm1_4", STREAMED_SOUND_MISSION_BJM1_4},
-	{"bjm1_5", STREAMED_SOUND_MISSION_BJM1_5},    {"merc_39", STREAMED_SOUND_MISSION_MERC_39},  {"mono_1", STREAMED_SOUND_MISSION_MONO_1},
-	{"mono_2", STREAMED_SOUND_MISSION_MONO_2},    {"mono_3", STREAMED_SOUND_MISSION_MONO_3},    {"mono_4", STREAMED_SOUND_MISSION_MONO_4},
-	{"mono_5", STREAMED_SOUND_MISSION_MONO_5},    {"mono_6", STREAMED_SOUND_MISSION_MONO_6},    {"mono_7", STREAMED_SOUND_MISSION_MONO_7},
-	{"mono_8", STREAMED_SOUND_MISSION_MONO_8},    {"mono_9", STREAMED_SOUND_MISSION_MONO_9},    {"mono10", STREAMED_SOUND_MISSION_MONO10},
-	{"mono11", STREAMED_SOUND_MISSION_MONO11},    {"mono12", STREAMED_SOUND_MISSION_MONO12},    {"mono13", STREAMED_SOUND_MISSION_MONO13},
-	{"mono14", STREAMED_SOUND_MISSION_MONO14},    {"mono15", STREAMED_SOUND_MISSION_MONO15},    {"mono16", STREAMED_SOUND_MISSION_MONO16},
-	{"fud_01", STREAMED_SOUND_MISSION_FUD_01},    {"fud_02", STREAMED_SOUND_MISSION_FUD_02},    {"fud_03", STREAMED_SOUND_MISSION_FUD_03},
-	{"fud_04", STREAMED_SOUND_MISSION_FUD_04},    {"fud_05", STREAMED_SOUND_MISSION_FUD_05},    {"fud_06", STREAMED_SOUND_MISSION_FUD_06},
-	{"fud_07", STREAMED_SOUND_MISSION_FUD_07},    {"fud_08", STREAMED_SOUND_MISSION_FUD_08},    {"fud_09", STREAMED_SOUND_MISSION_FUD_09},
-	{"fud_10", STREAMED_SOUND_MISSION_FUD_10},    {"fud_11", STREAMED_SOUND_MISSION_FUD_11},    {"fud_12", STREAMED_SOUND_MISSION_FUD_12},
-	{"fud_13", STREAMED_SOUND_MISSION_FUD_13},    {"fud_14", STREAMED_SOUND_MISSION_FUD_14},    {"fud_15", STREAMED_SOUND_MISSION_FUD_15},
-	{"fud_16", STREAMED_SOUND_MISSION_FUD_16},    {"fud_17", STREAMED_SOUND_MISSION_FUD_17},    {"fud_18", STREAMED_SOUND_MISSION_FUD_18},
-	{"fud_19", STREAMED_SOUND_MISSION_FUD_19},    {"fud_20", STREAMED_SOUND_MISSION_FUD_20},    {"burg_01", STREAMED_SOUND_MISSION_BURG_01},
-	{"burg_02", STREAMED_SOUND_MISSION_BURG_02},  {"burg_03", STREAMED_SOUND_MISSION_BURG_03},  {"burg_04", STREAMED_SOUND_MISSION_BURG_04},
-	{"burg_05", STREAMED_SOUND_MISSION_BURG_05},  {"burg_06", STREAMED_SOUND_MISSION_BURG_06},  {"burg_07", STREAMED_SOUND_MISSION_BURG_07},
-	{"burg_08", STREAMED_SOUND_MISSION_BURG_08},  {"burg_09", STREAMED_SOUND_MISSION_BURG_09},  {"burg_10", STREAMED_SOUND_MISSION_BURG_10},
-	{"burg_11", STREAMED_SOUND_MISSION_BURG_11},  {"burg_12", STREAMED_SOUND_MISSION_BURG_12},  {"crust01", STREAMED_SOUND_MISSION_CRUST01},
-	{"crust02", STREAMED_SOUND_MISSION_CRUST02},  {"crust03", STREAMED_SOUND_MISSION_CRUST03},  {"crust04", STREAMED_SOUND_MISSION_CRUST04},
-	{"crust05", STREAMED_SOUND_MISSION_CRUST05},  {"crust06", STREAMED_SOUND_MISSION_CRUST06},  {"crust07", STREAMED_SOUND_MISSION_CRUST07},
-	{"crust08", STREAMED_SOUND_MISSION_CRUST08},  {"crust09", STREAMED_SOUND_MISSION_CRUST09},  {"band_01", STREAMED_SOUND_MISSION_BAND_01},
-	{"band_02", STREAMED_SOUND_MISSION_BAND_02},  {"band_03", STREAMED_SOUND_MISSION_BAND_03},  {"band_04", STREAMED_SOUND_MISSION_BAND_04},
-	{"band_05", STREAMED_SOUND_MISSION_BAND_05},  {"band_06", STREAMED_SOUND_MISSION_BAND_06},  {"band_07", STREAMED_SOUND_MISSION_BAND_07},
-	{"band_08", STREAMED_SOUND_MISSION_BAND_08},  {"shaft01", STREAMED_SOUND_MISSION_SHAFT01},  {"shaft02", STREAMED_SOUND_MISSION_SHAFT02},
-	{"shaft03", STREAMED_SOUND_MISSION_SHAFT03},  {"shaft04", STREAMED_SOUND_MISSION_SHAFT04},  {"shaft05", STREAMED_SOUND_MISSION_SHAFT05},
-	{"shaft06", STREAMED_SOUND_MISSION_SHAFT06},  {"shaft07", STREAMED_SOUND_MISSION_SHAFT07},  {"shaft08", STREAMED_SOUND_MISSION_SHAFT08},
-	{"piss_01", STREAMED_SOUND_MISSION_PISS_01},  {"piss_02", STREAMED_SOUND_MISSION_PISS_02},  {"piss_03", STREAMED_SOUND_MISSION_PISS_03},
-	{"piss_04", STREAMED_SOUND_MISSION_PISS_04},  {"piss_05", STREAMED_SOUND_MISSION_PISS_05},  {"piss_06", STREAMED_SOUND_MISSION_PISS_06},
-	{"piss_07", STREAMED_SOUND_MISSION_PISS_07},  {"piss_08", STREAMED_SOUND_MISSION_PISS_08},  {"piss_09", STREAMED_SOUND_MISSION_PISS_09},
-	{"piss_10", STREAMED_SOUND_MISSION_PISS_10},  {"piss_11", STREAMED_SOUND_MISSION_PISS_11},  {"piss_12", STREAMED_SOUND_MISSION_PISS_12},
-	{"piss_13", STREAMED_SOUND_MISSION_PISS_13},  {"piss_14", STREAMED_SOUND_MISSION_PISS_14},  {"piss_15", STREAMED_SOUND_MISSION_PISS_15},
-	{"piss_16", STREAMED_SOUND_MISSION_PISS_16},  {"piss_17", STREAMED_SOUND_MISSION_PISS_17},  {"piss_18", STREAMED_SOUND_MISSION_PISS_18},
-	{"piss_19", STREAMED_SOUND_MISSION_PISS_19},  {"gimme01", STREAMED_SOUND_MISSION_GIMME01},  {"gimme02", STREAMED_SOUND_MISSION_GIMME02},
-	{"gimme03", STREAMED_SOUND_MISSION_GIMME03},  {"gimme04", STREAMED_SOUND_MISSION_GIMME04},  {"gimme05", STREAMED_SOUND_MISSION_GIMME05},
-	{"gimme06", STREAMED_SOUND_MISSION_GIMME06},  {"gimme07", STREAMED_SOUND_MISSION_GIMME07},  {"gimme08", STREAMED_SOUND_MISSION_GIMME08},
-	{"gimme09", STREAMED_SOUND_MISSION_GIMME09},  {"gimme10", STREAMED_SOUND_MISSION_GIMME10},  {"gimme11", STREAMED_SOUND_MISSION_GIMME11},
-	{"gimme12", STREAMED_SOUND_MISSION_GIMME12},  {"gimme13", STREAMED_SOUND_MISSION_GIMME13},  {"gimme14", STREAMED_SOUND_MISSION_GIMME14},
-	{"gimme15", STREAMED_SOUND_MISSION_GIMME15},  {"bust_01", STREAMED_SOUND_MISSION_BUST_01},  {"bust_02", STREAMED_SOUND_MISSION_BUST_02},
-	{"bust_03", STREAMED_SOUND_MISSION_BUST_03},  {"bust_04", STREAMED_SOUND_MISSION_BUST_04},  {"bust_05", STREAMED_SOUND_MISSION_BUST_05},
-	{"bust_06", STREAMED_SOUND_MISSION_BUST_06},  {"bust_07", STREAMED_SOUND_MISSION_BUST_07},  {"bust_08", STREAMED_SOUND_MISSION_BUST_08},
-	{"bust_09", STREAMED_SOUND_MISSION_BUST_09},  {"bust_10", STREAMED_SOUND_MISSION_BUST_10},  {"bust_11", STREAMED_SOUND_MISSION_BUST_11},
-	{"bust_12", STREAMED_SOUND_MISSION_BUST_12},  {"bust_13", STREAMED_SOUND_MISSION_BUST_13},  {"bust_14", STREAMED_SOUND_MISSION_BUST_14},
-	{"bust_15", STREAMED_SOUND_MISSION_BUST_15},  {"bust_16", STREAMED_SOUND_MISSION_BUST_16},  {"bust_17", STREAMED_SOUND_MISSION_BUST_17},
-	{"bust_18", STREAMED_SOUND_MISSION_BUST_18},  {"bust_19", STREAMED_SOUND_MISSION_BUST_19},  {"bust_20", STREAMED_SOUND_MISSION_BUST_20},
-	{"bust_21", STREAMED_SOUND_MISSION_BUST_21},  {"bust_22", STREAMED_SOUND_MISSION_BUST_22},  {"bust_23", STREAMED_SOUND_MISSION_BUST_23},
-	{"bust_24", STREAMED_SOUND_MISSION_BUST_24},  {"bust_25", STREAMED_SOUND_MISSION_BUST_25},  {"bust_26", STREAMED_SOUND_MISSION_BUST_26},
-	{"bust_27", STREAMED_SOUND_MISSION_BUST_27},  {"bust_28", STREAMED_SOUND_MISSION_BUST_28}, */ {nil, 0} };
+	{"JDAISH2", SFX_JD_SHOCKED_2},
+	{"JDAICR2", SFX_JD_CRASH_CAR_2},
+	{"JDAICR1", SFX_JD_CRASH_CAR_1},
+	{"MHAIJC1", SFX_MICKEY_JACKED_CAR_1},
+	{"JDAICR3", SFX_JD_CRASH_CAR_3},
+	{"CSHUTR", SFX_CSHUTR},
+	{"DRKNOCK", SFX_DRKNOCK},
+	{"NEDS4CA", SFX_NEDS4CA},
+	{"RUNPAST", SFX_RUNPAST},
+	{"LEAR", SFX_LEAR},
+	{"TING", SFX_TING},
+	{"CLICK", SFX_CLICK},
+	{"BBell", SFX_BRIDGE_BELL},
+	{"CHOP_1", SFX_CHOP_1},
+	{"CHOP_2", SFX_CHOP_2},
+	{"MAC4_CM", SFX_MAC4_CM},
+	{"MAC4_CN", SFX_MAC4_CN},
+	{"MAC4_CO", SFX_MAC4_CO},
+	{"MAC4_CP", SFX_MAC4_CP},
+	{"MAC4_CQ", SFX_MAC4_CQ},
+	{"MAC4_CR", SFX_MAC4_CR},
+	{"MAC4_CS", SFX_MAC4_CS},
+	{"SBell", SFX_SHOPBELL},
+	{"PROSCR1", SFX_PROSTITUTE_SHOCKED_2},
+	{"PROSCR2", SFX_PROSTITUTE_SHOCKED_3},
+	{"COLT_45", SFX_COLT_45},
+	{"SAL4_AJ", SFX_SAL4_AJ},
+	{"JD_SLPN", SFX_JD_SLPN},
+	{"MDON2AH", SFX_MDON2AH},
+	{"SAL4_EA", SFX_SAL4_EA},
+	{"mobring", SFX_SFX_RING},
+	{"pagring", SFX_SFX_PAGER_RING},
+	{"carrev", SFX_SFX_WILLIE_CAR_REV},
+	{"bikerev", SFX_SFX_WILLIE_BIKE_REV},
+	{"liftop", SFX_SFX_LIFT_OPEN},
+	{"liftcl", SFX_SFX_LIFT_CLOSE},
+	{"liftrun", SFX_SFX_LIFT_RUNNING},
+	{"liftbel", SFX_SFX_LIFT_BELL},
+	{"inlift", SFX_SFX_IN_LIFT},
+	{"caml", SFX_SFX_CAMERA_LEFT},
+	{"camr", SFX_SFX_CAMERA_RIGHT},
+	{"cheer1", SFX_SFX_CHEER1},
+	{"cheer2", SFX_SFX_CHEER2},
+	{"cheer3", SFX_SFX_CHEER3},
+	{"cheer4", SFX_SFX_CHEER4},
+	{"ooh1", SFX_SFX_OOH1},
+	{"ooh2", SFX_SFX_OOH2},
+	{"lanstp1", SFX_SFX_LANSTP1},
+	{"lanstp2", SFX_SFX_LANSTP2},
+	{"lanamu1", SFX_SFX_LANAMU1},
+	{"lanamu2", SFX_SFX_LANAMU2},
+	{"airhrnl", SFX_SFX_AIRHORN_LEFT},
+	{"airhrnr", SFX_SFX_AIRHORN_RIGH},
+	{"sniper", SFX_SFX_SNIPER_SHOT_1},
+	{"snipsh", SFX_SFX_SNIPER_SHOT_2},
+	{"bloroof", SFX_SFX_BLOW_ROOF},
+	{"sfx_01", SFX_SFX_SFX_01},
+	{"sfx_02", SFX_SFX_SFX_02},
+	{"ANG1_AA", SFX_SFX_ANG1_AA},
+	{"ANG1_AB", SFX_SFX_ANG1_AB},
+	{"ANG1_AC", SFX_SFX_ANG1_AC},
+	{"ANG1_AD", SFX_SFX_ANG1_AD},
+	{"ANG1_AE", SFX_SFX_ANG1_AE},
+	{"ANG1_AF", SFX_SFX_ANG1_AF},
+	{"ANG1_AG", SFX_SFX_ANG1_AG},
+	{"ANG1_AH", SFX_SFX_ANG1_AH},
+	{"ANG1_AI", SFX_SFX_ANG1_AI},
+	{"ANG1_AJ", SFX_SFX_ANG1_AJ},
+	{"ANG1_AK", SFX_SFX_ANG1_AK},
+	{"ANG1_AL", SFX_SFX_ANG1_AL},
+	{"ANG1_AM", SFX_SFX_ANG1_AM},
+	{"ANG1_AN", SFX_SFX_ANG1_AN},
+	{"ANG1_AO", SFX_SFX_ANG1_AO},
+	{"ANG1_AP", SFX_SFX_ANG1_AP},
+	{"ANG1_AQ", SFX_SFX_ANG1_AQ},
+	{"ANG1_AR", SFX_SFX_ANG1_AR},
+	{"ANG1_AS", SFX_SFX_ANG1_AS},
+	{"ANG1_AT", SFX_SFX_ANG1_AT},
+	{"ANG1_AU", SFX_SFX_ANG1_AU},
+	{"ANG1_AV", SFX_SFX_ANG1_AV},
+	{"ANG1_AW", SFX_SFX_ANG1_AW},
+	{"JDT3_AA", SFX_SFX_JDT3_AA},
+	{"JDT3_AB", SFX_SFX_JDT3_AB},
+	{"JDT3_AC", SFX_SFX_JDT3_AC},
+	{"JDT3_AD", SFX_SFX_JDT3_AD},
+	{"JDT3_AE", SFX_SFX_JDT3_AE},
+	{"JDT3_AG", SFX_SFX_JDT3_AG},
+	{"JDT3_AH", SFX_SFX_JDT3_AH},
+	{"JDT3_BA", SFX_SFX_JDT3_BA},
+	{"JDT3_BB", SFX_SFX_JDT3_BB},
+	{"JDT3_BC", SFX_SFX_JDT3_BC},
+	{"JDT3_BD", SFX_SFX_JDT3_BD},
+	{"JDT3_BE", SFX_SFX_JDT3_BE},
+	{"JDT3_BF", SFX_SFX_JDT3_BF},
+	{"MAR4_AA", SFX_SFX_MAR4_AA},
+	{"MAR4_AB", SFX_SFX_MAR4_AB},
+	{"MAR4_AC", SFX_SFX_MAR4_AC},
+	{"MAR4_AD", SFX_SFX_MAR4_AD},
+	{"MAR4_BA", SFX_SFX_MAR4_BA},
+	{"MAR4_BB", SFX_SFX_MAR4_BB},
+	{"MAR4_BC", SFX_SFX_MAR4_BC},
+	{"MAR4_BD", SFX_SFX_MAR4_BD},
+	{"MAR4_BE", SFX_SFX_MAR4_BE},
+	{"MAR4_BF", SFX_SFX_MAR4_BF},
+	{"MAR4_BG", SFX_SFX_MAR4_BG},
+	{"AVEN_AA", SFX_AVEN_AA},
+	{"AVEN_AB", SFX_AVEN_AB},
+	{"AVEN_AC", SFX_AVEN_AC},
+	{"AVEN_AD", SFX_AVEN_AD},
+	{"AVEN_AE", SFX_AVEN_AE},
+	{"AVEN_AF", SFX_AVEN_AF},
+	{"AVEN_AG", SFX_AVEN_AG},
+	{"AVEN_AH", SFX_AVEN_AH},
+	{"AVEN_AI", SFX_AVEN_AI},
+	{"AVEN_AJ", SFX_AVEN_AJ},
+	{"AVEN_AK", SFX_AVEN_AK},
+	{"AVEN_AL", SFX_AVEN_AL},
+	{"AVEN_AM", SFX_AVEN_AM},
+	{"AVEN_AN", SFX_AVEN_AN},
+	{"AVEN_AO", SFX_AVEN_AO},
+	{"AVEN_AP", SFX_AVEN_AP},
+	{"AVEN_AQ", SFX_AVEN_AQ},
+	{"AVEN_AR", SFX_AVEN_AR},
+	{"AVEN_AS", SFX_AVEN_AS},
+	{"AVEN_AT", SFX_AVEN_AT},
+	{"AVEN_AU", SFX_AVEN_AU},
+	{"AVEN_AV", SFX_AVEN_AV},
+	{"AVEN_AW", SFX_AVEN_AW},
+	{"AVE1_AA", SFX_AVE1_AA},
+	{"AVE1_AB", SFX_AVE1_AB},
+	{"AVE1_AC", SFX_AVE1_AC},
+	{"AVE1_AD", SFX_AVE1_AD},
+	{"AVE1_AE", SFX_AVE1_AE},
+	{"AVE1_AF", SFX_AVE1_AF},
+	{"AVE1_AG", SFX_AVE1_AG},
+	{"AVE2_AA", SFX_AVE2_AA},
+	{"AVE2_AC", SFX_AVE2_AC},
+	{"AVE2_AD", SFX_AVE2_AD},
+	{"AVE2_AE", SFX_AVE2_AE},
+	{"AVE2_AG", SFX_AVE2_AG},
+	{"AVE2_AH", SFX_AVE2_AH},
+	{"AVE3_AA", SFX_AVE3_AA},
+	{"AVE3_AB", SFX_AVE3_AB},
+	{"AVE3_AC", SFX_AVE3_AC},
+	{"AVE3_AD", SFX_AVE3_AD},
+	{"AVE3_AE", SFX_AVE3_AE},
+	{"AVE3_AF", SFX_AVE3_AF},
+	{"AVE3_AG", SFX_AVE3_AG},
+	{"AVE4_AA", SFX_AVE4_AA},
+	{"AVE4_AB", SFX_AVE4_AB},
+	{"AVE4_AD", SFX_AVE4_AD},
+	{"AVE4_AE", SFX_AVE4_AE},
+	{"AVE4_AF", SFX_AVE4_AF},
+	{"AVE4_AG", SFX_AVE4_AG},
+	{"AVE4_AH", SFX_AVE4_AH},
+	{"AVE5_AA", SFX_AVE5_AA},
+	{"AVE5_AB", SFX_AVE5_AB},
+	{"AVE5_AC", SFX_AVE5_AC},
+	{"AVE5_AD", SFX_AVE5_AD},
+	{"AVE5_AE", SFX_AVE5_AE},
+	{"AVE5_AF", SFX_AVE5_AF},
+	{"AVE5_AG", SFX_AVE5_AG},
+	{"AVE6_AA", SFX_AVE6_AA},
+	{"AVE6_AB", SFX_AVE6_AB},
+	{"AVE6_AC", SFX_AVE6_AC},
+	{"AVE6_AD", SFX_AVE6_AD},
+	{"AVE6_AE", SFX_AVE6_AE},
+	{"BONS2BA", SFX_BONS2BA},
+	{"BONS2BB", SFX_BONS2BB},
+	{"BONS2BC", SFX_BONS2BC},
+	{"BONS2BD", SFX_BONS2BD},
+	{"BONS2BE", SFX_BONS2BE},
+	{"CAD1_AA", SFX_CAD1_AA},
+	{"CAD1_AB", SFX_CAD1_AB},
+	{"CAD1_AC", SFX_CAD1_AC},
+	{"CAD1_AD", SFX_CAD1_AD},
+	{"CAD1_AE", SFX_CAD1_AE},
+	{"CAD2_AA", SFX_CAD2_AA},
+	{"CAD2_AB", SFX_CAD2_AB},
+	{"CAD2_AC", SFX_CAD2_AC},
+	{"CAD2_AD", SFX_CAD2_AD},
+	{"CAD2_AE", SFX_CAD2_AE},
+	{"CAD2_AF", SFX_CAD2_AF},
+	{"CAD3_AA", SFX_CAD3_AA},
+	{"CAD3_AB", SFX_CAD3_AB},
+	{"CAD3_AC", SFX_CAD3_AC},
+	{"CAD3_AD", SFX_CAD3_AD},
+	{"CAD3_AE", SFX_CAD3_AE},
+	{"CAD3_AF", SFX_CAD3_AF},
+	{"CAD4_AA", SFX_CAD4_AA},
+	{"CAD4_AB", SFX_CAD4_AB},
+	{"CAD4_AC", SFX_CAD4_AC},
+	{"CAD4_AD", SFX_CAD4_AD},
+	{"CAD4_AE", SFX_CAD4_AE},
+	{"CAD4_AF", SFX_CAD4_AF},
+	{"CAD5_AA", SFX_CAD5_AA},
+	{"CAD5_AB", SFX_CAD5_AB},
+	{"CAD5_AC", SFX_CAD5_AC},
+	{"CAD5_AD", SFX_CAD5_AD},
+	{"CAD5_AE", SFX_CAD5_AE},
+	{"CAD5_AF", SFX_CAD5_AF},
+	{"CAD6_AA", SFX_CAD6_AA},
+	{"CAD6_AB", SFX_CAD6_AB},
+	{"CAD6_AC", SFX_CAD6_AC},
+	{"CAD6_AD", SFX_CAD6_AD},
+	{"CAD6_AE", SFX_CAD6_AE},
+	{"CAD6_AF", SFX_CAD6_AF},
+	{"CAD7_AB", SFX_CAD7_AB},
+	{"CAD7_AC", SFX_CAD7_AC},
+	{"CAD7_AD", SFX_CAD7_AD},
+	{"CAD7_AE", SFX_CAD7_AE},
+	{"CAD8_AB", SFX_CAD8_AB},
+	{"CAD8_AC", SFX_CAD8_AC},
+	{"CAD8_AD", SFX_CAD8_AD},
+	{"CAD8_AE", SFX_CAD8_AE},
+	{"CAD8_AF", SFX_CAD8_AF},
+	{"CAD9_AA", SFX_CAD9_AA},
+	{"CAD9_AB", SFX_CAD9_AB},
+	{"CAD9_AC", SFX_CAD9_AC},
+	{"CAD9_AD", SFX_CAD9_AD},
+	{"CAD9_AE", SFX_CAD9_AE},
+	{"CAD9_AF", SFX_CAD9_AF},
+	{"DONH1CA", SFX_DONH1CA},
+	{"DONH1DA", SFX_DONH1DA},
+	{"DONH1DB", SFX_DONH1DB},
+	{"DONH1EA", SFX_DONH1EA},
+	{"DONH1EB", SFX_DONH1EB},
+	{"DONH1EC", SFX_DONH1EC},
+	{"DONH1ED", SFX_DONH1ED},
+	{"DONH1EE", SFX_DONH1EE},
+	{"DONH1FA", SFX_DONH1FA},
+	{"DONH1GA", SFX_DONH1GA},
+	{"DONH1GB", SFX_DONH1GB},
+	{"DONH1GC", SFX_DONH1GC},
+	{"DONH1HA", SFX_DONH1HA},
+	{"DONH1IA", SFX_DONH1IA},
+	{"DONH1IB", SFX_DONH1IB},
+	{"DONH1JA", SFX_DONH1JA},
+	{"DONH1JB", SFX_DONH1JB},
+	{"DONH1JC", SFX_DONH1JC},
+	{"DONH1JD", SFX_DONH1JD},
+	{"DONH1JE", SFX_DONH1JE},
+	{"DONH2AA", SFX_DONH2AA},
+	{"DONH2AB", SFX_DONH2AB},
+	{"DONH2AC", SFX_DONH2AC},
+	{"DONH2AD", SFX_DONH2AD},
+	{"DONH2AF", SFX_DONH2AF},
+	{"DONH2AG", SFX_DONH2AG},
+	{"DONH2AH", SFX_DONH2AH},
+	{"DONH2BA", SFX_DONH2BA},
+	{"DONH2BB", SFX_DONH2BB},
+	{"DONH2BC", SFX_DONH2BC},
+	{"DONH2BD", SFX_DONH2BD},
+	{"DONH2BE", SFX_DONH2BE},
+	{"DONH2BF", SFX_DONH2BF},
+	{"DONH2BG", SFX_DONH2BG},
+	{"DONH2BH", SFX_DONH2BH},
+	{"DONH2BI", SFX_DONH2BI},
+	{"DONH2BJ", SFX_DONH2BJ},
+	{"DONH2BK", SFX_DONH2BK},
+	{"DONH2BL", SFX_DONH2BL},
+	{"DONH2CA", SFX_DONH2CA},
+	{"DONH2CB", SFX_DONH2CB},
+	{"DONH2CC", SFX_DONH2CC},
+	{"DONH2CD", SFX_DONH2CD},
+	{"DONH2CE", SFX_DONH2CE},
+	{"DONH2CF", SFX_DONH2CF},
+	{"DONH2CG", SFX_DONH2CG},
+	{"DONH2DA", SFX_DONH2DA},
+	{"DONH2DB", SFX_DONH2DB},
+	{"DONH2DC", SFX_DONH2DC},
+	{"DONH2EA", SFX_DONH2EA},
+	{"DONH2EC", SFX_DONH2EC},
+	{"DONH3AA", SFX_DONH3AA},
+	{"DONH3AB", SFX_DONH3AB},
+	{"DONH3AC", SFX_DONH3AC},
+	{"DONH3AD", SFX_DONH3AD},
+	{"DONH3AE", SFX_DONH3AE},
+	{"DONH3AF", SFX_DONH3AF},
+	{"DONH3AG", SFX_DONH3AG},
+	{"DONH3AH", SFX_DONH3AH},
+	{"DONH3AI", SFX_DONH3AI},
+	{"DONH3BA", SFX_DONH3BA},
+	{"DONH3BB", SFX_DONH3BB},
+	{"DONH3CA", SFX_DONH3CA},
+	{"DONH3DA", SFX_DONH3DA},
+	{"DONH3EA", SFX_DONH3EA},
+	{"DONH3EB", SFX_DONH3EB},
+	{"DONH3EC", SFX_DONH3EC},
+	{"DONH3ED", SFX_DONH3ED},
+	{"DONH3EE", SFX_DONH3EE},
+	{"DONH3EF", SFX_DONH3EF},
+	{"DONH3FA", SFX_DONH3FA},
+	{"DONH3GA", SFX_DONH3GA},
+	{"DONH3GB", SFX_DONH3GB},
+	{"DONH3GC", SFX_DONH3GC},
+	{"DONH3GD", SFX_DONH3GD},
+	{"DONH3GE", SFX_DONH3GE},
+	{"DONH3GF", SFX_DONH3GF},
+	{"DONH3HA", SFX_DONH3HA},
+	{"DONH3HB", SFX_DONH3HB},
+	{"DONH4AA", SFX_DONH4AA},
+	{"DONH4AB", SFX_DONH4AB},
+	{"DONH4AC", SFX_DONH4AC},
+	{"DONH4AD", SFX_DONH4AD},
+	{"DONH4AE", SFX_DONH4AE},
+	{"DONH4AF", SFX_DONH4AF},
+	{"DONH4AG", SFX_DONH4AG},
+	{"DONH4AH", SFX_DONH4AH},
+	{"DONH4AI", SFX_DONH4AI},
+	{"DONH4AJ", SFX_DONH4AJ},
+	{"DONH5AA", SFX_DONH5AA},
+	{"DONH5AB", SFX_DONH5AB},
+	{"DONH5AC", SFX_DONH5AC},
+	{"DONH5AD", SFX_DONH5AD},
+	{"DONH5AE", SFX_DONH5AE},
+	{"DONH5AF", SFX_DONH5AF},
+	{"DONH5AG", SFX_DONH5AG},
+	{"DONH5AH", SFX_DONH5AH},
+	{"DONH5AI", SFX_DONH5AI},
+	{"DONH5AJ", SFX_DONH5AJ},
+	{"DONH5BA", SFX_DONH5BA},
+	{"DONH6BA", SFX_DONH6BA},
+	{"DONH6CA", SFX_DONH6CA},
+	{"DONH6CB", SFX_DONH6CB},
+	{"DONH6DA", SFX_DONH6DA},
+	{"DONH6DB", SFX_DONH6DB},
+	{"DONH6EA", SFX_DONH6EA},
+	{"DONH6EB", SFX_DONH6EB},
+	{"DONH6EC", SFX_DONH6EC},
+	{"DONH6FA", SFX_DONH6FA},
+	{"DONH6GA", SFX_DONH6GA},
+	{"DONH6GB", SFX_DONH6GB},
+	{"DONH6GC", SFX_DONH6GC},
+	{"DONH6GD", SFX_DONH6GD},
+	{"DONH6GF", SFX_DONH6GF},
+	{"DONS1AA", SFX_DONS1AA},
+	{"DONS1AB", SFX_DONS1AB},
+	{"DONS1AC", SFX_DONS1AC},
+	{"DONS1BA", SFX_DONS1BA},
+	{"DONS1BB", SFX_DONS1BB},
+	{"DONS2AA", SFX_DONS2AA},
+	{"DONS2AB", SFX_DONS2AB},
+	{"DONS2AC", SFX_DONS2AC},
+	{"DONS2AD", SFX_DONS2AD},
+	{"DONS2AE", SFX_DONS2AE},
+	{"DONS2AF", SFX_DONS2AF},
+	{"DONS2BA", SFX_DONS2BA},
+	{"DONS2BB", SFX_DONS2BB},
+	{"DONS2BC", SFX_DONS2BC},
+	{"DONS2BD", SFX_DONS2BD},
+	{"DONS2BE", SFX_DONS2BE},
+	{"DONS2CA", SFX_DONS2CA},
+	{"DONS2CB", SFX_DONS2CB},
+	{"DONS2CC", SFX_DONS2CC},
+	{"DONS2CD", SFX_DONS2CD},
+	{"DONS2CE", SFX_DONS2CE},
+	{"DONS2CF", SFX_DONS2CF},
+	{"DONS2CG", SFX_DONS2CG},
+	{"DONS2CH", SFX_DONS2CH},
+	{"DONS2CI", SFX_DONS2CI},
+	{"DONS2CJ", SFX_DONS2CJ},
+	{"DONS2CK", SFX_DONS2CK},
+	{"DONS2CL", SFX_DONS2CL},
+	{"DONS2CM", SFX_DONS2CM},
+	{"DONS2CN", SFX_DONS2CN},
+	{"DONS4AA", SFX_DONS4AA},
+	{"DONS4AB", SFX_DONS4AB},
+	{"DONS4AC", SFX_DONS4AC},
+	{"DONS4AD", SFX_DONS4AD},
+	{"DONS4AE", SFX_DONS4AE},
+	{"DONS4AF", SFX_DONS4AF},
+	{"DONS5AA", SFX_DONS5AA},
+	{"DONS5AB", SFX_DONS5AB},
+	{"DONS5AC", SFX_DONS5AC},
+	{"DONS5AD", SFX_DONS5AD},
+	{"DONS5AE", SFX_DONS5AE},
+	{"DONS5BA", SFX_DONS5BA},
+	{"DONS5BB", SFX_DONS5BB},
+	{"DONS5BC", SFX_DONS5BC},
+	{"DONS5BD", SFX_DONS5BD},
+	{"DONS5BE", SFX_DONS5BE},
+	{"DONS5CA", SFX_DONS5CA},
+	{"DONS5DA", SFX_DONS5DA},
+	{"DONS5EA", SFX_DONS5EA},
+	{"DONS5EB", SFX_DONS5EB},
+	{"DONS6AA", SFX_DONS6AA},
+	{"DONS6AB", SFX_DONS6AB},
+	{"DONS6AC", SFX_DONS6AC},
+	{"DONS6AD", SFX_DONS6AD},
+	{"DONS6AE", SFX_DONS6AE},
+	{"DONS6AF", SFX_DONS6AF},
+	{"DONS6AG", SFX_DONS6AG},
+	{"DONS7AA", SFX_DONS7AA},
+	{"DONS7AB", SFX_DONS7AB},
+	{"DONS7AC", SFX_DONS7AC},
+	{"DONS7AD", SFX_DONS7AD},
+	{"DONS7AE", SFX_DONS7AE},
+	{"DONS7AF", SFX_DONS7AF},
+	{"DONS7AG", SFX_DONS7AG},
+	{"HIT1_AA", SFX_HIT1_AA},
+	{"HIT1_AB", SFX_HIT1_AB},
+	{"HIT1_AC", SFX_HIT1_AC},
+	{"HIT1_AD", SFX_HIT1_AD},
+	{"HIT1_AE", SFX_HIT1_AE},
+	{"HIT1_AF", SFX_HIT1_AF},
+	{"HIT1_AG", SFX_HIT1_AG},
+	{"HIT2_AA", SFX_HIT2_AA},
+	{"HIT2_AB", SFX_HIT2_AB},
+	{"HIT2_AC", SFX_HIT2_AC},
+	{"HIT2_AD", SFX_HIT2_AD},
+	{"HIT2_AE", SFX_HIT2_AE},
+	{"HIT2_AF", SFX_HIT2_AF},
+	{"HIT2_AG", SFX_HIT2_AG},
+	{"HIT2_AH", SFX_HIT2_AH},
+	{"HIT3_AA", SFX_HIT3_AA},
+	{"HIT3_AB", SFX_HIT3_AB},
+	{"HIT3_AC", SFX_HIT3_AC},
+	{"HIT3_AD", SFX_HIT3_AD},
+	{"HIT3_AE", SFX_HIT3_AE},
+	{"HIT3_AF", SFX_HIT3_AF},
+	{"HIT3_AG", SFX_HIT3_AG},
+	{"HITM_AA", SFX_HITM_AA},
+	{"HITM_AB", SFX_HITM_AB},
+	{"HITM_AC", SFX_HITM_AC},
+	{"HITM_AD", SFX_HITM_AD},
+	{"JDT1_BA", SFX_JDT1_BA},
+	{"JDT1_BB", SFX_JDT1_BB},
+	{"JDT1_CA", SFX_JDT1_CA},
+	{"JDT1_CB", SFX_JDT1_CB},
+	{"JDT1_DA", SFX_JDT1_DA},
+	{"JDT1_DB", SFX_JDT1_DB},
+	{"JDT1_DC", SFX_JDT1_DC},
+	{"JDT1_DD", SFX_JDT1_DD},
+	{"JDT1_DE", SFX_JDT1_DE},
+	{"JDT1_DF", SFX_JDT1_DF},
+	{"JDT1_DG", SFX_JDT1_DG},
+	{"JDT1_DH", SFX_JDT1_DH},
+	{"JDT1_DI", SFX_JDT1_DI},
+	{"JDT1_DJ", SFX_JDT1_DJ},
+	{"JDT1_EA", SFX_JDT1_EA},
+	{"JDT1_EB", SFX_JDT1_EB},
+	{"JDT1_EC", SFX_JDT1_EC},
+	{"JDT1_ED", SFX_JDT1_ED},
+	{"JDT1_EE", SFX_JDT1_EE},
+	{"JDT1_FA", SFX_JDT1_FA},
+	{"JDT1_FB", SFX_JDT1_FB},
+	{"JDT1_FC", SFX_JDT1_FC},
+	{"JDT1_FD", SFX_JDT1_FD},
+	{"JDT1_FE", SFX_JDT1_FE},
+	{"JDT1_FF", SFX_JDT1_FF},
+	{"JDT1_GA", SFX_JDT1_GA},
+	{"JDT1_HA", SFX_JDT1_HA},
+	{"JDT1_HB", SFX_JDT1_HB},
+	{"JDT1_HC", SFX_JDT1_HC},
+	{"JDT1_HD", SFX_JDT1_HD},
+	{"JDT1_HE", SFX_JDT1_HE},
+	{"JDT1_HF", SFX_JDT1_HF},
+	{"JDT1_IA", SFX_JDT1_IA},
+	{"JDT1_JA", SFX_JDT1_JA},
+	{"JDT1_JB", SFX_JDT1_JB},
+	{"JDT1_KA", SFX_JDT1_KA},
+	{"JDT1_KB", SFX_JDT1_KB},
+	{"JDT1_KC", SFX_JDT1_KC},
+	{"JDT1_KD", SFX_JDT1_KD},
+	{"JDT1_KE", SFX_JDT1_KE},
+	{"JDT1_KF", SFX_JDT1_KF},
+	{"JDT1_LA", SFX_JDT1_LA},
+	{"JDT1_LB", SFX_JDT1_LB},
+	{"JDT2_AA", SFX_JDT2_AA},
+	{"JDT2_AB", SFX_JDT2_AB},
+	{"JDT2_AC", SFX_JDT2_AC},
+	{"JDT2_AD", SFX_JDT2_AD},
+	{"JDT2_AE", SFX_JDT2_AE},
+	{"JDT2_AF", SFX_JDT2_AF},
+	{"JDT2_AG", SFX_JDT2_AG},
+	{"JDT2_AH", SFX_JDT2_AH},
+	{"JDT2_BA", SFX_JDT2_BA},
+	{"JDT2_BB", SFX_JDT2_BB},
+	{"JDT2_BC", SFX_JDT2_BC},
+	{"JDT2_CA", SFX_JDT2_CA},
+	{"JDT2_CB", SFX_JDT2_CB},
+	{"JDT2_DA", SFX_JDT2_DA},
+	{"JDT2_DC", SFX_JDT2_DC},
+	{"JDT2_DD", SFX_JDT2_DD},
+	{"JDT2_DE", SFX_JDT2_DE},
+	{"JDT2_DF", SFX_JDT2_DF},
+	{"JDT3_AA", SFX_JDT3_AA},
+	{"JDT3_AB", SFX_JDT3_AB},
+	{"JDT3_AC", SFX_JDT3_AC},
+	{"JDT3_AD", SFX_JDT3_AD},
+	{"JDT3_AE", SFX_JDT3_AE},
+	{"JDT3_AG", SFX_JDT3_AG},
+	{"JDT3_AH", SFX_JDT3_AH},
+	{"JDT3_BA", SFX_JDT3_BA},
+	{"JDT3_BB", SFX_JDT3_BB},
+	{"JDT3_BC", SFX_JDT3_BC},
+	{"JDT3_BD", SFX_JDT3_BD},
+	{"JDT3_BE", SFX_JDT3_BE},
+	{"JDT3_BF", SFX_JDT3_BF},
+	{"JDT4_AA", SFX_JDT4_AA},
+	{"JDT4_AB", SFX_JDT4_AB},
+	{"JDT4_AC", SFX_JDT4_AC},
+	{"JDT4_AD", SFX_JDT4_AD},
+	{"JDT4_AE", SFX_JDT4_AE},
+	{"JDT4_AF", SFX_JDT4_AF},
+	{"JDT5_BA", SFX_JDT5_BA},
+	{"JDT5_CA", SFX_JDT5_CA},
+	{"JDT5_CC", SFX_JDT5_CC},
+	{"JDT5_CD", SFX_JDT5_CD},
+	{"JDT5_CE", SFX_JDT5_CE},
+	{"JDT5_CG", SFX_JDT5_CG},
+	{"JDT5_CI", SFX_JDT5_CI},
+	{"JDT5_DA", SFX_JDT5_DA},
+	{"JDT5_EA", SFX_JDT5_EA},
+	{"JDT5_EB", SFX_JDT5_EB},
+	{"JDT5_EC", SFX_JDT5_EC},
+	{"JDT5_ED", SFX_JDT5_ED},
+	{"JDT5_EE", SFX_JDT5_EE},
+	{"JDT6_AA", SFX_JDT6_AA},
+	{"JDT6_AB", SFX_JDT6_AB},
+	{"JDT6_AC", SFX_JDT6_AC},
+	{"JDT6_AE", SFX_JDT6_AE},
+	{"JDT6_AF", SFX_JDT6_AF},
+	{"JDT6_AG", SFX_JDT6_AG},
+	{"JDT6_AH", SFX_JDT6_AH},
+	{"JDT6_BA", SFX_JDT6_BA},
+	{"JDT6_BB", SFX_JDT6_BB},
+	{"JDT6_BC", SFX_JDT6_BC},
+	{"JDT6_BD", SFX_JDT6_BD},
+	{"JDT6_BE", SFX_JDT6_BE},
+	{"JDT6_BF", SFX_JDT6_BF},
+	{"JDT6_BG", SFX_JDT6_BG},
+	{"JDT7_AA", SFX_JDT7_AA},
+	{"JDT7_AB", SFX_JDT7_AB},
+	{"JDT7_AC", SFX_JDT7_AC},
+	{"JDT7_AD", SFX_JDT7_AD},
+	{"JDT7_AE", SFX_JDT7_AE},
+	{"JDT7_AF", SFX_JDT7_AF},
+	{"JDT7_AG", SFX_JDT7_AG},
+	{"JDT7_BA", SFX_JDT7_BA},
+	{"JDT7_BB", SFX_JDT7_BB},
+	{"JDT7_BC", SFX_JDT7_BC},
+	{"JDT7_CA", SFX_JDT7_CA},
+	{"JDT7_CB", SFX_JDT7_CB},
+	{"JDT7_CC", SFX_JDT7_CC},
+	{"JDT8_AA", SFX_JDT8_AA},
+	{"JDT8_AB", SFX_JDT8_AB},
+	{"JDT8_AC", SFX_JDT8_AC},
+	{"JDT8_AD", SFX_JDT8_AD},
+	{"JDT8_AE", SFX_JDT8_AE},
+	{"JDT8_AF", SFX_JDT8_AF},
+	{"JDT8_AG", SFX_JDT8_AG},
+	{"JDT8_AH", SFX_JDT8_AH},
+	{"JDT8_CA", SFX_JDT8_CA},
+	{"JDT8_CB", SFX_JDT8_CB},
+	{"JDT8_DA", SFX_JDT8_DA},
+	{"JDT8_DB", SFX_JDT8_DB},
+	{"JDT8_DC", SFX_JDT8_DC},
+	{"JDT8_DD", SFX_JDT8_DD},
+	{"JDT8_DE", SFX_JDT8_DE},
+	{"JDT8_DF", SFX_JDT8_DF},
+	{"JDT8_DG", SFX_JDT8_DG},
+	{"JDT8_EA", SFX_JDT8_EA},
+	{"JDT8_EB", SFX_JDT8_EB},
+	{"JDT8_EC", SFX_JDT8_EC},
+	{"JDT8_ED", SFX_JDT8_ED},
+	{"JDT8_EE", SFX_JDT8_EE},
+	{"JDT8_FA", SFX_JDT8_FA},
+	{"JDT8_FB", SFX_JDT8_FB},
+	{"JDT8_FC", SFX_JDT8_FC},
+	{"JDX_AA", SFX_JDX_AA},
+	{"JDX_AB", SFX_JDX_AB},
+	{"JDX_AC", SFX_JDX_AC},
+	{"M8B1AA", SFX_M8B1AA},
+	{"M8B1AB", SFX_M8B1AB},
+	{"MAC1_AA", SFX_MAC1_AA},
+	{"MAC1_AB", SFX_MAC1_AB},
+	{"MAC1_AC", SFX_MAC1_AC},
+	{"MAC1_AD", SFX_MAC1_AD},
+	{"MAC1_AE", SFX_MAC1_AE},
+	{"MAC1_AF", SFX_MAC1_AF},
+	{"MAC1_AG", SFX_MAC1_AG},
+	{"MAC1_AH", SFX_MAC1_AH},
+	{"MAC1_AI", SFX_MAC1_AI},
+	{"MAC1_AJ", SFX_MAC1_AJ},
+	{"MAC1_AK", SFX_MAC1_AK},
+	{"MAC1_AL", SFX_MAC1_AL},
+	{"MAC1_AM", SFX_MAC1_AM},
+	{"MAC1_AN", SFX_MAC1_AN},
+	{"MAC1_AO", SFX_MAC1_AO},
+	{"MAC1_BA", SFX_MAC1_BA},
+	{"MAC1_BB", SFX_MAC1_BB},
+	{"MAC1_BC", SFX_MAC1_BC},
+	{"MAC1_BD", SFX_MAC1_BD},
+	{"MAC1_BE", SFX_MAC1_BE},
+	{"MAC1_BF", SFX_MAC1_BF},
+	{"MAC1_BG", SFX_MAC1_BG},
+	{"MAC1_CA", SFX_MAC1_CA},
+	{"MAC1_CB", SFX_MAC1_CB},
+	{"MAC1_DA", SFX_MAC1_DA},
+	{"MAC1_EA", SFX_MAC1_EA},
+	{"MAC1_FA", SFX_MAC1_FA},
+	{"MAC1_FB", SFX_MAC1_FB},
+	{"MAC1_GA", SFX_MAC1_GA},
+	{"MAC1_GB", SFX_MAC1_GB},
+	{"MAC1_HA", SFX_MAC1_HA},
+	{"MAC1_IA", SFX_MAC1_IA},
+	{"MAC1_IB", SFX_MAC1_IB},
+	{"MAC1_JA", SFX_MAC1_JA},
+	{"MAC1_JB", SFX_MAC1_JB},
+	{"MAC2_AA", SFX_MAC2_AA},
+	{"MAC2_AB", SFX_MAC2_AB},
+	{"MAC2_AC", SFX_MAC2_AC},
+	{"MAC2_AD", SFX_MAC2_AD},
+	{"MAC2_AE", SFX_MAC2_AE},
+	{"MAC2_AF", SFX_MAC2_AF},
+	{"MAC2_AG", SFX_MAC2_AG},
+	{"MAC2_AH", SFX_MAC2_AH},
+	{"MAC2_AI", SFX_MAC2_AI},
+	{"MAC2_BA", SFX_MAC2_BA},
+	{"MAC2_BB", SFX_MAC2_BB},
+	{"MAC2_BC", SFX_MAC2_BC},
+	{"MAC3_AA", SFX_MAC3_AA},
+	{"MAC3_AB", SFX_MAC3_AB},
+	{"MAC3_AC", SFX_MAC3_AC},
+	{"MAC3_AD", SFX_MAC3_AD},
+	{"MAC3_AE", SFX_MAC3_AE},
+	{"MAC3_AF", SFX_MAC3_AF},
+	{"MAC3_AG", SFX_MAC3_AG},
+	{"MAC3_AH", SFX_MAC3_AH},
+	{"MAC3_AI", SFX_MAC3_AI},
+	{"MAC3_AJ", SFX_MAC3_AJ},
+	{"MAC3_AK", SFX_MAC3_AK},
+	{"MAC3_AL", SFX_MAC3_AL},
+	{"MAC3_AM", SFX_MAC3_AM},
+	{"MAC3_AN", SFX_MAC3_AN},
+	{"MAC3_BA", SFX_MAC3_BA},
+	{"MAC4_AA", SFX_MAC4_AA},
+	{"MAC4_AB", SFX_MAC4_AB},
+	{"MAC4_AC", SFX_MAC4_AC},
+	{"MAC4_AD", SFX_MAC4_AD},
+	{"MAC4_AE", SFX_MAC4_AE},
+	{"MAC4_AF", SFX_MAC4_AF},
+	{"MAC4_AG", SFX_MAC4_AG},
+	{"MAC4_AH", SFX_MAC4_AH},
+	{"MAC4_AI", SFX_MAC4_AI},
+	{"MAC4_AJ", SFX_MAC4_AJ},
+	{"MAC4_AK", SFX_MAC4_AK},
+	{"MAC4_AL", SFX_MAC4_AL},
+	{"MAC4_BA", SFX_MAC4_BA},
+	{"MAC4_BB", SFX_MAC4_BB},
+	{"MAC4_BC", SFX_MAC4_BC},
+	{"MAC4_BD", SFX_MAC4_BD},
+	{"MAC4_BE", SFX_MAC4_BE},
+	{"MAC4_BF", SFX_MAC4_BF},
+	{"MAC4_BG", SFX_MAC4_BG},
+	{"MAC4_BI", SFX_MAC4_BI},
+	{"MAC4_BJ", SFX_MAC4_BJ},
+	{"MAC4_BL", SFX_MAC4_BL},
+	{"MAC4_BM", SFX_MAC4_BM},
+	{"MAC4_BO", SFX_MAC4_BO},
+	{"MAC4_BP", SFX_MAC4_BP},
+	{"MAC4_BQ", SFX_MAC4_BQ},
+	{"MAC4_BR", SFX_MAC4_BR},
+	{"MAC4_BS", SFX_MAC4_BS},
+	{"MAC4_BT", SFX_MAC4_BT},
+	{"MAC4_BU", SFX_MAC4_BU},
+	{"MAC4_CA", SFX_MAC4_CA},
+	{"MAC4_CB", SFX_MAC4_CB},
+	{"MAC4_CC", SFX_MAC4_CC},
+	{"MAC4_CD", SFX_MAC4_CD},
+	{"MAC4_CE", SFX_MAC4_CE},
+	{"MAC4_CF", SFX_MAC4_CF},
+	{"MAC4_CG", SFX_MAC4_CG},
+	{"MAC4_CH", SFX_MAC4_CH},
+	{"MAC4_CI", SFX_MAC4_CI},
+	{"MAC4_CK", SFX_MAC4_CK},
+	{"MAC4_CM", SFX_MAC4_CM},
+	{"MAC5_AA", SFX_MAC5_AA},
+	{"MAC5_AB", SFX_MAC5_AB},
+	{"MAC5_AC", SFX_MAC5_AC},
+	{"MAC5_AD", SFX_MAC5_AD},
+	{"MAC5_AE", SFX_MAC5_AE},
+	{"MAC5_AF", SFX_MAC5_AF},
+	{"MAC5_AG", SFX_MAC5_AG},
+	{"MAC5_AH", SFX_MAC5_AH},
+	{"MAC5_AI", SFX_MAC5_AI},
+	{"MAC5_AJ", SFX_MAC5_AJ},
+	{"MAC5_AK", SFX_MAC5_AK},
+	{"MAC5_AL", SFX_MAC5_AL},
+	{"MAC5_AM", SFX_MAC5_AM},
+	{"MAC5_AN", SFX_MAC5_AN},
+	{"MAR1_AA", SFX_MAR1_AA},
+	{"MAR1_AB", SFX_MAR1_AB},
+	{"MAR1_AC", SFX_MAR1_AC},
+	{"MAR1_AD", SFX_MAR1_AD},
+	{"MAR1_AE", SFX_MAR1_AE},
+	{"MAR1_BA", SFX_MAR1_BA},
+	{"MAR1_CA", SFX_MAR1_CA},
+	{"MAR1_DA", SFX_MAR1_DA},
+	{"MAR1_DB", SFX_MAR1_DB},
+	{"MAR1_EA", SFX_MAR1_EA},
+	{"MAR1_FA", SFX_MAR1_FA},
+	{"MAR1_FB", SFX_MAR1_FB},
+	{"MAR1_FC", SFX_MAR1_FC},
+	{"MAR1_FD", SFX_MAR1_FD},
+	{"MAR1_GA", SFX_MAR1_GA},
+	{"MAR1_GB", SFX_MAR1_GB},
+	{"MAR1_GC", SFX_MAR1_GC},
+	{"MAR1_HA", SFX_MAR1_HA},
+	{"MAR1_HB", SFX_MAR1_HB},
+	{"MAR1_HC", SFX_MAR1_HC},
+	{"MAR1_IA", SFX_MAR1_IA},
+	{"MAR1_IB", SFX_MAR1_IB},
+	{"MAR1_IC", SFX_MAR1_IC},
+	{"MAR2_AA", SFX_MAR2_AA},
+	{"MAR2_AB", SFX_MAR2_AB},
+	{"MAR2_AC", SFX_MAR2_AC},
+	{"MAR2_AD", SFX_MAR2_AD},
+	{"MAR2_AE", SFX_MAR2_AE},
+	{"MAR2_AF", SFX_MAR2_AF},
+	{"MAR2_AG", SFX_MAR2_AG},
+	{"MAR2_AH", SFX_MAR2_AH},
+	{"MAR2_BA", SFX_MAR2_BA},
+	{"MAR2_BB", SFX_MAR2_BB},
+	{"MAR2_BC", SFX_MAR2_BC},
+	{"MAR2_CA", SFX_MAR2_CA},
+	{"MAR2_CB", SFX_MAR2_CB},
+	{"MAR2_CC", SFX_MAR2_CC},
+	{"MAR2_CD", SFX_MAR2_CD},
+	{"MAR2_CE", SFX_MAR2_CE},
+	{"MAR2_DA", SFX_MAR2_DA},
+	{"MAR2_EA", SFX_MAR2_EA},
+	{"MAR2_EB", SFX_MAR2_EB},
+	{"MAR2_EC", SFX_MAR2_EC},
+	{"MAR2_FA", SFX_MAR2_FA},
+	{"MAR2_FB", SFX_MAR2_FB},
+	{"MAR2_GA", SFX_MAR2_GA},
+	{"MAR2_GB", SFX_MAR2_GB},
+	{"MAR2_GC", SFX_MAR2_GC},
+	{"MAR2_GE", SFX_MAR2_GE},
+	{"MAR2_GG", SFX_MAR2_GG},
+	{"MAR2_GH", SFX_MAR2_GH},
+	{"MAR2_HA", SFX_MAR2_HA},
+	{"MAR2_HB", SFX_MAR2_HB},
+	{"MAR2_HC", SFX_MAR2_HC},
+	{"MAR3_AA", SFX_MAR3_AA},
+	{"MAR3_AB", SFX_MAR3_AB},
+	{"MAR3_AC", SFX_MAR3_AC},
+	{"MAR3_AD", SFX_MAR3_AD},
+	{"MAR3_BA", SFX_MAR3_BA},
+	{"MAR3_BB", SFX_MAR3_BB},
+	{"MAR3_BC", SFX_MAR3_BC},
+	{"MAR3_BD", SFX_MAR3_BD},
+	{"MAR3_BE", SFX_MAR3_BE},
+	{"MAR3_BF", SFX_MAR3_BF},
+	{"MAR4_BA", SFX_MAR4_BA},
+	{"MAR4_BC", SFX_MAR4_BC},
+	{"MAR4_BD", SFX_MAR4_BD},
+	{"MAR4_BF", SFX_MAR4_BF},
+	{"MAR5_AA", SFX_MAR5_AA},
+	{"MAR5_AB", SFX_MAR5_AB},
+	{"MAR5_AC", SFX_MAR5_AC},
+	{"MAR5_AD", SFX_MAR5_AD},
+	{"MAR5_AE", SFX_MAR5_AE},
+	{"MAR5_BA", SFX_MAR5_BA},
+	{"MAR5_BB", SFX_MAR5_BB},
+	{"MAR5_CA", SFX_MAR5_CA},
+	{"MAR5_CB", SFX_MAR5_CB},
+	{"MAR5_CC", SFX_MAR5_CC},
+	{"MAR5_CD", SFX_MAR5_CD},
+	{"MAR5_CE", SFX_MAR5_CE},
+	{"MAR5_EA", SFX_MAR5_EA},
+	{"MAR5_EB", SFX_MAR5_EB},
+	{"MAR5_EC", SFX_MAR5_EC},
+	{"MAR5_FA", SFX_MAR5_FA},
+	{"MAR5_FB", SFX_MAR5_FB},
+	{"MAR5_FC", SFX_MAR5_FC},
+	{"MAR5_FD", SFX_MAR5_FD},
+	{"MAR5_FE", SFX_MAR5_FE},
+	{"MAR5_FF", SFX_MAR5_FF},
+	{"MARX_AA", SFX_MARX_AA},
+	{"MARX_AB", SFX_MARX_AB},
+	{"MARX_AC", SFX_MARX_AC},
+	{"MDON1AA", SFX_MDON1AA},
+	{"MDON1AB", SFX_MDON1AB},
+	{"MDON1AC", SFX_MDON1AC},
+	{"MDON2AA", SFX_MDON2AA},
+	{"MDON2AB", SFX_MDON2AB},
+	{"MDON2AC", SFX_MDON2AC},
+	{"MDON2AD", SFX_MDON2AD},
+	{"MDON2AE", SFX_MDON2AE},
+	{"MDON2AF", SFX_MDON2AF},
+	{"MDON2AG", SFX_MDON2AG},
+	{"MDON3AA", SFX_MDON3AA},
+	{"MDON3AB", SFX_MDON3AB},
+	{"MDON3AC", SFX_MDON3AC},
+	{"MDON3AD", SFX_MDON3AD},
+	{"MDON3AE", SFX_MDON3AE},
+	{"MDON3AF", SFX_MDON3AF},
+	{"MDON3AG", SFX_MDON3AG},
+	{"MJDT1AA", SFX_MJDT1AA},
+	{"MJDT1AB", SFX_MJDT1AB},
+	{"MJDT1AC", SFX_MJDT1AC},
+	{"MJDT1AE", SFX_MJDT1AE},
+	{"MMA1AA", SFX_MMA1AA},
+	{"MMA1AB", SFX_MMA1AB},
+	{"MMA1AC", SFX_MMA1AC},
+	{"MMA1AD", SFX_MMA1AD},
+	{"MMA1AE", SFX_MMA1AE},
+	{"MMA2AA", SFX_MMA2AA},
+	{"MMA2AB", SFX_MMA2AB},
+	{"MMA2AC", SFX_MMA2AC},
+	{"MMA2AD", SFX_MMA2AD},
+	{"MMA2AE", SFX_MMA2AE},
+	{"MMA2AF", SFX_MMA2AF},
+	{"MMA2AG", SFX_MMA2AG},
+	{"MMA2AH", SFX_MMA2AH},
+	{"MMA2AI", SFX_MMA2AI},
+	{"MMA2AJ", SFX_MMA2AJ},
+	{"MMAR1AA", SFX_MMAR1AA},
+	{"MMAR1AB", SFX_MMAR1AB},
+	{"MMAR1AC", SFX_MMAR1AC},
+	{"MMAR1AD", SFX_MMAR1AD},
+	{"MMCA1AA", SFX_MMCA1AA},
+	{"MMCA1AB", SFX_MMCA1AB},
+	{"MMCA1AC", SFX_MMCA1AC},
+	{"MMCA1AD", SFX_MMCA1AD},
+	{"MMCA2AA", SFX_MMCA2AA},
+	{"MMCA2AB", SFX_MMCA2AB},
+	{"MMCA2AC", SFX_MMCA2AC},
+	{"MMCA2AD", SFX_MMCA2AD},
+	{"MMCA2AE", SFX_MMCA2AE},
+	{"MMCA2AF", SFX_MMCA2AF},
+	{"MSA10AA", SFX_MSA10AA},
+	{"MSA10AB", SFX_MSA10AB},
+	{"MSA10AC", SFX_MSA10AC},
+	{"MSA10AD", SFX_MSA10AD},
+	{"MSA11AA", SFX_MSA11AA},
+	{"MSA11AB", SFX_MSA11AB},
+	{"MSA11AC", SFX_MSA11AC},
+	{"MSA11AD", SFX_MSA11AD},
+	{"MSA12AA", SFX_MSA12AA},
+	{"MSA12AC", SFX_MSA12AC},
+	{"MSA12AD", SFX_MSA12AD},
+	{"MSA13AA", SFX_MSA13AA},
+	{"MSA13AB", SFX_MSA13AB},
+	{"MSA13AC", SFX_MSA13AC},
+	{"MSA13AD", SFX_MSA13AD},
+	{"MSA13AE", SFX_MSA13AE},
+	{"MSA13AF", SFX_MSA13AF},
+	{"MSA13AG", SFX_MSA13AG},
+	{"MSA13AH", SFX_MSA13AH},
+	{"MSA14AA", SFX_MSA14AA},
+	{"MSA14AB", SFX_MSA14AB},
+	{"MSA14AC", SFX_MSA14AC},
+	{"MSA14AD", SFX_MSA14AD},
+	{"MSAL5AA", SFX_MSAL5AA},
+	{"MSAL5AB", SFX_MSAL5AB},
+	{"MSAL6AA", SFX_MSAL6AA},
+	{"MSAL6AB", SFX_MSAL6AB},
+	{"MSAL6AC", SFX_MSAL6AC},
+	{"MSAL6AD", SFX_MSAL6AD},
+	{"MSAL7AA", SFX_MSAL7AA},
+	{"MSAL7AB", SFX_MSAL7AB},
+	{"MSAL7AC", SFX_MSAL7AC},
+	{"MSAL7AD", SFX_MSAL7AD},
+	{"MSAL7AE", SFX_MSAL7AE},
+	{"MSAL7AF", SFX_MSAL7AF},
+	{"MSAL7AG", SFX_MSAL7AG},
+	{"MSAL8AA", SFX_MSAL8AA},
+	{"MSAL8AB", SFX_MSAL8AB},
+	{"MSAL8AC", SFX_MSAL8AC},
+	{"MSAL8AD", SFX_MSAL8AD},
+	{"MSAL8AF", SFX_MSAL8AF},
+	{"MSAL8AG", SFX_MSAL8AG},
+	{"MSAL9AA", SFX_MSAL9AA},
+	{"MSAL9AB", SFX_MSAL9AB},
+	{"MSAL9AC", SFX_MSAL9AC},
+	{"MSAL9AD", SFX_MSAL9AD},
+	{"MSAL9AE", SFX_MSAL9AE},
+	{"MSAL9AF", SFX_MSAL9AF},
+	{"MTOS1AA", SFX_MTOS1AA},
+	{"MTOS1AB", SFX_MTOS1AB},
+	{"MTOS1AC", SFX_MTOS1AC},
+	{"MTOS1AD", SFX_MTOS1AD},
+	{"MTOS1AE", SFX_MTOS1AE},
+	{"MTOS1AF", SFX_MTOS1AF},
+	{"MTOS1AG", SFX_MTOS1AG},
+	{"MTOS2AA", SFX_MTOS2AA},
+	{"MTOS2AB", SFX_MTOS2AB},
+	{"MTOS2AC", SFX_MTOS2AC},
+	{"MTOS2AD", SFX_MTOS2AD},
+	{"MTOS2AE", SFX_MTOS2AE},
+	{"MTOS2AF", SFX_MTOS2AF},
+	{"MTOS2AG", SFX_MTOS2AG},
+	{"MVIC1AA", SFX_MVIC1AA},
+	{"MVIC1AB", SFX_MVIC1AB},
+	{"MVIC1AC", SFX_MVIC1AC},
+	{"MVIC1AD", SFX_MVIC1AD},
+	{"MVIC1AE", SFX_MVIC1AE},
+	{"MVIC1AF", SFX_MVIC1AF},
+	{"MVIC1AG", SFX_MVIC1AG},
+	{"MVIC1AH", SFX_MVIC1AH},
+	{"MVIC1AI", SFX_MVIC1AI},
+	{"MVIC1AJ", SFX_MVIC1AJ},
+	{"MVIC1AK", SFX_MVIC1AK},
+	{"NEDS1AA", SFX_NEDS1AA},
+	{"NEDS1AB", SFX_NEDS1AB},
+	{"NEDS1AC", SFX_NEDS1AC},
+	{"NEDS1AD", SFX_NEDS1AD},
+	{"NEDS1AE", SFX_NEDS1AE},
+	{"NEDS1AF", SFX_NEDS1AF},
+	{"NEDS1AG", SFX_NEDS1AG},
+	{"NEDS1BC", SFX_NEDS1BC},
+	{"NEDS1BE", SFX_NEDS1BE},
+	{"NEDS2AA", SFX_NEDS2AA},
+	{"NEDS2AB", SFX_NEDS2AB},
+	{"NEDS2AC", SFX_NEDS2AC},
+	{"NEDS2AD", SFX_NEDS2AD},
+	{"NEDS2AE", SFX_NEDS2AE},
+	{"NEDS2AF", SFX_NEDS2AF},
+	{"NEDS2BA", SFX_NEDS2BA},
+	{"NEDS3AA", SFX_NEDS3AA},
+	{"NEDS3AB", SFX_NEDS3AB},
+	{"NEDS3AC", SFX_NEDS3AC},
+	{"NEDS3AD", SFX_NEDS3AD},
+	{"NEDS4AA", SFX_NEDS4AA},
+	{"NEDS4AB", SFX_NEDS4AB},
+	{"NEDS4AC", SFX_NEDS4AC},
+	{"NEDS4AD", SFX_NEDS4AD},
+	{"NEDS4AE", SFX_NEDS4AE},
+	{"NEDS4BA", SFX_NEDS4BA},
+	{"NEDS4BB", SFX_NEDS4BB},
+	{"NEDS4BC", SFX_NEDS4BC},
+	{"NEDS4BD", SFX_NEDS4BD},
+	{"NEDS4BE", SFX_NEDS4BE},
+	{"NEDS4BF", SFX_NEDS4BF},
+	{"RAC1_AA", SFX_RAC1_AA},
+	{"RAC1_AB", SFX_RAC1_AB},
+	{"RAC1_AC", SFX_RAC1_AC},
+	{"RAC1_AD", SFX_RAC1_AD},
+	{"RAC1_AE", SFX_RAC1_AE},
+	{"RAC1_AF", SFX_RAC1_AF},
+	{"RAC1_AG", SFX_RAC1_AG},
+	{"RAC2_AA", SFX_RAC2_AA},
+	{"RAC2_AB", SFX_RAC2_AB},
+	{"RAC2_AC", SFX_RAC2_AC},
+	{"RAC2_AD", SFX_RAC2_AD},
+	{"RAC2_AE", SFX_RAC2_AE},
+	{"RAC2_AF", SFX_RAC2_AF},
+	{"RAC3_AB", SFX_RAC3_AB},
+	{"RAC3_AC", SFX_RAC3_AC},
+	{"RAC3_AD", SFX_RAC3_AD},
+	{"RAC3_AE", SFX_RAC3_AE},
+	{"RAC3_AF", SFX_RAC3_AF},
+	{"RAC3_AG", SFX_RAC3_AG},
+	{"RAYS1AA", SFX_RAYS1AA},
+	{"RAYS1AB", SFX_RAYS1AB},
+	{"RAYS1AC", SFX_RAYS1AC},
+	{"RAYS1BA", SFX_RAYS1BA},
+	{"RAYS1BB", SFX_RAYS1BB},
+	{"RAYS1CA", SFX_RAYS1CA},
+	{"RAYS1CB", SFX_RAYS1CB},
+	{"RAYS1CC", SFX_RAYS1CC},
+	{"RAYS1CD", SFX_RAYS1CD},
+	{"RAYS1CE", SFX_RAYS1CE},
+	{"RAYS1CF", SFX_RAYS1CF},
+	{"RAYS1DA", SFX_RAYS1DA},
+	{"RAYS1DB", SFX_RAYS1DB},
+	{"RAYS1DC", SFX_RAYS1DC},
+	{"RAYS2AA", SFX_RAYS2AA},
+	{"RAYS2AB", SFX_RAYS2AB},
+	{"RAYS2AD", SFX_RAYS2AD},
+	{"RAYS2AE", SFX_RAYS2AE},
+	{"RAYS2AF", SFX_RAYS2AF},
+	{"RAYS2AG", SFX_RAYS2AG},
+	{"RAYS2AH", SFX_RAYS2AH},
+	{"RAYS2AI", SFX_RAYS2AI},
+	{"RAYS2CA", SFX_RAYS2CA},
+	{"RAYS2DA", SFX_RAYS2DA},
+	{"RAYS4AA", SFX_RAYS4AA},
+	{"RAYS4AB", SFX_RAYS4AB},
+	{"RAYS4AC", SFX_RAYS4AC},
+	{"RAYS4AD", SFX_RAYS4AD},
+	{"RAYS4AE", SFX_RAYS4AE},
+	{"RAYS4AF", SFX_RAYS4AF},
+	{"RAYS5AA", SFX_RAYS5AA},
+	{"RAYS5AB", SFX_RAYS5AB},
+	{"RAYS5AC", SFX_RAYS5AC},
+	{"RAYS5AD", SFX_RAYS5AD},
+	{"RAYS5AE", SFX_RAYS5AE},
+	{"RAYS5AF", SFX_RAYS5AF},
+	{"RAYS5AG", SFX_RAYS5AG},
+	{"RAYS5AH", SFX_RAYS5AH},
+	{"RAYS5AI", SFX_RAYS5AI},
+	{"SAL1_AA", SFX_SAL1_AA},
+	{"SAL1_AB", SFX_SAL1_AB},
+	{"SAL1_AC", SFX_SAL1_AC},
+	{"SAL1_AE", SFX_SAL1_AE},
+	{"SAL2_AA", SFX_SAL2_AA},
+	{"SAL2_AB", SFX_SAL2_AB},
+	{"SAL2_AC", SFX_SAL2_AC},
+	{"SAL2_AD", SFX_SAL2_AD},
+	{"SAL2_AF", SFX_SAL2_AF},
+	{"SAL2_AG", SFX_SAL2_AG},
+	{"SAL2_CK", SFX_SAL2_CK},
+	{"SAL2_DA", SFX_SAL2_DA},
+	{"SAL2_DB", SFX_SAL2_DB},
+	{"SAL2_DC", SFX_SAL2_DC},
+	{"SAL2_EA", SFX_SAL2_EA},
+	{"SAL3_AA", SFX_SAL3_AA},
+	{"SAL3_AD", SFX_SAL3_AD},
+	{"SAL3_AE", SFX_SAL3_AE},
+	{"SAL3_AF", SFX_SAL3_AF},
+	{"SAL3_AG", SFX_SAL3_AG},
+	{"SAL3_AI", SFX_SAL3_AI},
+	{"SAL3_BB", SFX_SAL3_BB},
+	{"SAL3_CB", SFX_SAL3_CB},
+	{"SALH4AB", SFX_SALH4AB},
+	{"SALH4AC", SFX_SALH4AC},
+	{"SALH4AE", SFX_SALH4AE},
+	{"SALH4AF", SFX_SALH4AF},
+	{"SALH4AH", SFX_SALH4AH},
+	{"SALH4AI", SFX_SALH4AI},
+	{"SALH4AJ", SFX_SALH4AJ},
+	{"SAL4_AA", SFX_SAL4_AA},
+	{"SAL4_AB", SFX_SAL4_AB},
+	{"SAL4_AC", SFX_SAL4_AC},
+	{"SAL4_AD", SFX_SAL4_AD},
+	{"SAL4_AE", SFX_SAL4_AE},
+	{"SAL4_AF", SFX_SAL4_AF},
+	{"SAL4_AH", SFX_SAL4_AH},
+	{"SAL4_AI", SFX_SAL4_AI},
+	{"SAL4_BA", SFX_SAL4_BA},
+	{"SAL4_CA", SFX_SAL4_CA},
+	{"SAL4_CB", SFX_SAL4_CB},
+	{"SAL4_CC", SFX_SAL4_CC},
+	{"SAL4_CD", SFX_SAL4_CD},
+	{"SAL4_CE", SFX_SAL4_CE},
+	{"SAL4_CF", SFX_SAL4_CF},
+	{"SAL4_CG", SFX_SAL4_CG},
+	{"SAL4_CH", SFX_SAL4_CH},
+	{"SAL4_CI", SFX_SAL4_CI},
+	{"SAL4_CJ", SFX_SAL4_CJ},
+	{"SAL4_CK", SFX_SAL4_CK},
+	{"SAL4_CL", SFX_SAL4_CL},
+	{"SAL4_CM", SFX_SAL4_CM},
+	{"SAL4_CN", SFX_SAL4_CN},
+	{"SAL4_CO", SFX_SAL4_CO},
+	{"SAL4_CP", SFX_SAL4_CP},
+	{"SAL4_CQ", SFX_SAL4_CQ},
+	{"SAL4_DA", SFX_SAL4_DA},
+	{"SAL5_AB", SFX_SAL5_AB},
+	{"SAL5_AE", SFX_SAL5_AE},
+	{"SAL5_AH", SFX_SAL5_AH},
+	{"SAL5_AI", SFX_SAL5_AI},
+	{"SAL5_AJ", SFX_SAL5_AJ},
+	{"SAL6_AA", SFX_SAL6_AA},
+	{"SAL6_AB", SFX_SAL6_AB},
+	{"SAL6_AC", SFX_SAL6_AC},
+	{"SAL6_AE", SFX_SAL6_AE},
+	{"SAL6_AF", SFX_SAL6_AF},
+	{"SAL6_AG", SFX_SAL6_AG},
+	{"SAL6_AH", SFX_SAL6_AH},
+	{"SAL6_AI", SFX_SAL6_AI},
+	{"SAL6_AJ", SFX_SAL6_AJ},
+	{"SAL6_BA", SFX_SAL6_BA},
+	{"SAL6_BB", SFX_SAL6_BB},
+	{"SAL6_BC", SFX_SAL6_BC},
+	{"SAL6_BD", SFX_SAL6_BD},
+	{"SAL6_BE", SFX_SAL6_BE},
+	{"SAL6_BF", SFX_SAL6_BF},
+	{"SAL6_BH", SFX_SAL6_BH},
+	{"SAL6_BJ", SFX_SAL6_BJ},
+	{"SAL6_BK", SFX_SAL6_BK},
+	{"SAL7_AA", SFX_SAL7_AA},
+	{"SAL7_AB", SFX_SAL7_AB},
+	{"SAL7_AC", SFX_SAL7_AC},
+	{"SAL7_AD", SFX_SAL7_AD},
+	{"SAL7_AE", SFX_SAL7_AE},
+	{"SAL7_AF", SFX_SAL7_AF},
+	{"SAL7_AG", SFX_SAL7_AG},
+	{"SAL7_AI", SFX_SAL7_AI},
+	{"SAL7_AJ", SFX_SAL7_AJ},
+	{"SAL7_AK", SFX_SAL7_AK},
+	{"SAL7_BA", SFX_SAL7_BA},
+	{"SAL7_BB", SFX_SAL7_BB},
+	{"SAL7_BC", SFX_SAL7_BC},
+	{"SAL7_BD", SFX_SAL7_BD},
+	{"SAL7_BE", SFX_SAL7_BE},
+	{"SAL7_BF", SFX_SAL7_BF},
+	{"SAL7_BG", SFX_SAL7_BG},
+	{"SAL7_BH", SFX_SAL7_BH},
+	{"SAL7_CA", SFX_SAL7_CA},
+	{"SAL7_CB", SFX_SAL7_CB},
+	{"SAL7_CC", SFX_SAL7_CC},
+	{"SAL8_AA", SFX_SAL8_AA},
+	{"SAL8_AB", SFX_SAL8_AB},
+	{"SAL8_AC", SFX_SAL8_AC},
+	{"SAL8_BA", SFX_SAL8_BA},
+	{"SAL8_BC", SFX_SAL8_BC},
+	{"SAL8_BD", SFX_SAL8_BD},
+	{"SAL8_BE", SFX_SAL8_BE},
+	{"SAL8_BF", SFX_SAL8_BF},
+	{"SAL8_CA", SFX_SAL8_CA},
+	{"SAL8_CC", SFX_SAL8_CC},
+	{"SAL8_DA", SFX_SAL8_DA},
+	{"SAL8_DB", SFX_SAL8_DB},
+	{"SAL8_DC", SFX_SAL8_DC},
+	{"SAL8_EA", SFX_SAL8_EA},
+	{"SAL8_EC", SFX_SAL8_EC},
+	{"SAL8_ED", SFX_SAL8_ED},
+	{"SAL8_EE", SFX_SAL8_EE},
+	{"SAL8_FA", SFX_SAL8_FA},
+	{"SAL8_GA", SFX_SAL8_GA},
+	{"SAL8_GB", SFX_SAL8_GB},
+	{"SALH1GB", SFX_SALH1GB},
+	{"SALH1HB", SFX_SALH1HB},
+	{"SALH2AA", SFX_SALH2AA},
+	{"SALH2AB", SFX_SALH2AB},
+	{"SALH2AC", SFX_SALH2AC},
+	{"SALH2AD", SFX_SALH2AD},
+	{"SALH2AE", SFX_SALH2AE},
+	{"SALH2AF", SFX_SALH2AF},
+	{"SALH2AG", SFX_SALH2AG},
+	{"SALH2AH", SFX_SALH2AH},
+	{"SALH2BA", SFX_SALH2BA},
+	{"SALH2BB", SFX_SALH2BB},
+	{"SALH2BC", SFX_SALH2BC},
+	{"SALH2BD", SFX_SALH2BD},
+	{"SALH2BH", SFX_SALH2BH},
+	{"SALH2BI", SFX_SALH2BI},
+	{"SALH2CA", SFX_SALH2CA},
+	{"SALH3AA", SFX_SALH3AA},
+	{"SALH3AB", SFX_SALH3AB},
+	{"SALH3AC", SFX_SALH3AC},
+	{"SALH3AD", SFX_SALH3AD},
+	{"SALH3AE", SFX_SALH3AE},
+	{"SALH3AF", SFX_SALH3AF},
+	{"SALH3AG", SFX_SALH3AG},
+	{"SALH3AH", SFX_SALH3AH},
+	{"SALH3AI", SFX_SALH3AI},
+	{"SALH3AJ", SFX_SALH3AJ},
+	{"SALH3AK", SFX_SALH3AK},
+	{"SALH3BA", SFX_SALH3BA},
+	{"SALH3BB", SFX_SALH3BB},
+	{"SALH3CA", SFX_SALH3CA},
+	{"SALH3CC", SFX_SALH3CC},
+	{"SALH3CD", SFX_SALH3CD},
+	{"SALH4AA", SFX_SALH4AA},
+	{"SALH4AD", SFX_SALH4AD},
+	{"SALH4AG", SFX_SALH4AG},
+	{"SALH4BA", SFX_SALH4BA},
+	{"SALH4BB", SFX_SALH4BB},
+	{"SALH4BC", SFX_SALH4BC},
+	{"SALH4CA", SFX_SALH4CA},
+	{"SALH5CA", SFX_SALH5CA},
+	{"SALH5CB", SFX_SALH5CB},
+	{"SALH5CC", SFX_SALH5CC},
+	{"SALH5DA", SFX_SALH5DA},
+	{"SALH5DB", SFX_SALH5DB},
+	{"SALH5EA", SFX_SALH5EA},
+	{"SALH5EB", SFX_SALH5EB},
+	{"SALH5FA", SFX_SALH5FA},
+	{"SALH5GA", SFX_SALH5GA},
+	{"SALH5GB", SFX_SALH5GB},
+	{"SALH5GC", SFX_SALH5GC},
+	{"SALH5HA", SFX_SALH5HA},
+	{"SALH5IA", SFX_SALH5IA},
+	{"SALH5IB", SFX_SALH5IB},
+	{"SALH5JA", SFX_SALH5JA},
+	{"SALH5KA", SFX_SALH5KA},
+	{"SALH5KB", SFX_SALH5KB},
+	{"SALH5LA", SFX_SALH5LA},
+	{"SALH5LB", SFX_SALH5LB},
+	{"SALH5MA", SFX_SALH5MA},
+	{"SALH5MB", SFX_SALH5MB},
+	{"SALH5MC", SFX_SALH5MC},
+	{"SALH5NA", SFX_SALH5NA},
+	{"SALH5OA", SFX_SALH5OA},
+	{"SALH5OB", SFX_SALH5OB},
+	{"SALH5OC", SFX_SALH5OC},
+	{"SALH5OD", SFX_SALH5OD},
+	{"SALH5OE", SFX_SALH5OE},
+	{"SALH5OF", SFX_SALH5OF},
+	{"SALH5OG", SFX_SALH5OG},
+	{"SALH5OH", SFX_SALH5OH},
+	{"SALH5OI", SFX_SALH5OI},
+	{"SALH5OJ", SFX_SALH5OJ},
+	{"SALH5OK", SFX_SALH5OK},
+	{"SALS1AA", SFX_SALS1AA},
+	{"SALS1AB", SFX_SALS1AB},
+	{"SALS1AC", SFX_SALS1AC},
+	{"SALS1AD", SFX_SALS1AD},
+	{"SALS1AE", SFX_SALS1AE},
+	{"SALS1AF", SFX_SALS1AF},
+	{"SALS1AG", SFX_SALS1AG},
+	{"SALS1AH", SFX_SALS1AH},
+	{"SALS1AI", SFX_SALS1AI},
+	{"SALS2AA", SFX_SALS2AA},
+	{"SALS2AB", SFX_SALS2AB},
+	{"SALS2AC", SFX_SALS2AC},
+	{"SALS2AD", SFX_SALS2AD},
+	{"SALS2BC", SFX_SALS2BC},
+	{"SALS2BD", SFX_SALS2BD},
+	{"SALS2BE", SFX_SALS2BE},
+	{"SALS2BF", SFX_SALS2BF},
+	{"SALS2CD", SFX_SALS2CD},
+	{"SALS3AA", SFX_SALS3AA},
+	{"SALS3AB", SFX_SALS3AB},
+	{"SALS3AC", SFX_SALS3AC},
+	{"SALS3BB", SFX_SALS3BB},
+	{"SALS3BD", SFX_SALS3BD},
+	{"SALS3CA", SFX_SALS3CA},
+	{"SALS3CB", SFX_SALS3CB},
+	{"SALS3CC", SFX_SALS3CC},
+	{"SALS3CD", SFX_SALS3CD},
+	{"SALS3CE", SFX_SALS3CE},
+	{"SALS3CF", SFX_SALS3CF},
+	{"SALS3CG", SFX_SALS3CG},
+	{"SALS3DA", SFX_SALS3DA},
+	{"SALS3DE", SFX_SALS3DE},
+	{"SALS3DH", SFX_SALS3DH},
+	{"SALS3DI", SFX_SALS3DI},
+	{"SALS4AA", SFX_SALS4AA},
+	{"SALS4AB", SFX_SALS4AB},
+	{"SALS4AC", SFX_SALS4AC},
+	{"SALS4AD", SFX_SALS4AD},
+	{"SALS4AE", SFX_SALS4AE},
+	{"SALS4AF", SFX_SALS4AF},
+	{"SALS4BA", SFX_SALS4BA},
+	{"SALS4BB", SFX_SALS4BB},
+	{"SALS4BC", SFX_SALS4BC},
+	{"SALS4BD", SFX_SALS4BD},
+	{"SALS4BE", SFX_SALS4BE},
+	{"SALS4BF", SFX_SALS4BF},
+	{"SALS4BG", SFX_SALS4BG},
+	{"SALS4BH", SFX_SALS4BH},
+	{"SALS5AA", SFX_SALS5AA},
+	{"SALS5AB", SFX_SALS5AB},
+	{"SALS5AC", SFX_SALS5AC},
+	{"SALS5AD", SFX_SALS5AD},
+	{"SALS5AE", SFX_SALS5AE},
+	{"SALS5AF", SFX_SALS5AF},
+	{"SALS5BA", SFX_SALS5BA},
+	{"SALS5BB", SFX_SALS5BB},
+	{"SALS5BC", SFX_SALS5BC},
+	{"SALS5BD", SFX_SALS5BD},
+	{"SALS5BE", SFX_SALS5BE},
+	{"SALS5BF", SFX_SALS5BF},
+	{"SALS5BG", SFX_SALS5BG},
+	{"SALS5CA", SFX_SALS5CA},
+	{"SALS5CB", SFX_SALS5CB},
+	{"SALS5CC", SFX_SALS5CC},
+	{"SALS5CD", SFX_SALS5CD},
+	{"SALS5CE", SFX_SALS5CE},
+	{"SALS5CF", SFX_SALS5CF},
+	{"SALS5CG", SFX_SALS5CG},
+	{"SALS6AA", SFX_SALS6AA},
+	{"SALS6AB", SFX_SALS6AB},
+	{"SALS6AD", SFX_SALS6AD},
+	{"SALS6AE", SFX_SALS6AE},
+	{"SALS6AF", SFX_SALS6AF},
+	{"SALS6AG", SFX_SALS6AG},
+	{"SALS6AH", SFX_SALS6AH},
+	{"SALX_AA", SFX_SALX_AA},
+	{"SALX_AB", SFX_SALX_AB},
+	{"SALX_AC", SFX_SALX_AC},
+	{"SALX_AD", SFX_SALX_AD},
+	{"SALX_AE", SFX_SALX_AE},
+	{"SALX_AF", SFX_SALX_AF},
+	{"SALX_AG", SFX_SALX_AG},
+	{"SALX_AH", SFX_SALX_AH},
+	{"SALX_AI", SFX_SALX_AI},
+	{"SALX_AK", SFX_SALX_AK},
+	{"SALX_AL", SFX_SALX_AL},
+	{"SALX_AM", SFX_SALX_AM},
+	{"SALX_AN", SFX_SALX_AN},
+	{"SALX_AO", SFX_SALX_AO},
+	{"SALX_AP", SFX_SALX_AP},
+	{"SALX_AQ", SFX_SALX_AQ},
+	{"SALX_AR", SFX_SALX_AR},
+	{"SALX_AS", SFX_SALX_AS},
+	{"TAN1_AA", SFX_TAN1_AA},
+	{"TAN1_AB", SFX_TAN1_AB},
+	{"TAN1_AD", SFX_TAN1_AD},
+	{"TAN1_AE", SFX_TAN1_AE},
+	{"TAN1_AF", SFX_TAN1_AF},
+	{"TAN1_AG", SFX_TAN1_AG},
+	{"TAN1_AH", SFX_TAN1_AH},
+	{"TAN1_AI", SFX_TAN1_AI},
+	{"TAN1_AJ", SFX_TAN1_AJ},
+	{"TAN2_AA", SFX_TAN2_AA},
+	{"TAN2_AB", SFX_TAN2_AB},
+	{"TAN2_AC", SFX_TAN2_AC},
+	{"TAN2_AE", SFX_TAN2_AE},
+	{"TAN2_AF", SFX_TAN2_AF},
+	{"TAN2_AG", SFX_TAN2_AG},
+	{"TAN2_AH", SFX_TAN2_AH},
+	{"TAN2_AJ", SFX_TAN2_AJ},
+	{"TAN3_AA", SFX_TAN3_AA},
+	{"TAN3_AB", SFX_TAN3_AB},
+	{"TAN3_AC", SFX_TAN3_AC},
+	{"TAN3_AD", SFX_TAN3_AD},
+	{"TAN3_AE", SFX_TAN3_AE},
+	{"TAN3_AF", SFX_TAN3_AF},
+	{"TAN3_AG", SFX_TAN3_AG},
+	{"TAN3_AH", SFX_TAN3_AH},
+	{"TOSH1AA", SFX_TOSH1AA},
+	{"TOSH1AB", SFX_TOSH1AB},
+	{"TOSH1AC", SFX_TOSH1AC},
+	{"TOSH1AD", SFX_TOSH1AD},
+	{"TOSH2AA", SFX_TOSH2AA},
+	{"TOSH2AB", SFX_TOSH2AB},
+	{"TOSH2AC", SFX_TOSH2AC},
+	{"TOSH2AE", SFX_TOSH2AE},
+	{"TOSH2AF", SFX_TOSH2AF},
+	{"TOSH2AG", SFX_TOSH2AG},
+	{"TOSH2AH", SFX_TOSH2AH},
+	{"TOSH2AI", SFX_TOSH2AI},
+	{"TOSH2AJ", SFX_TOSH2AJ},
+	{"TOSH2AK", SFX_TOSH2AK},
+	{"TOSH2AL", SFX_TOSH2AL},
+	{"TOSH2AM", SFX_TOSH2AM},
+	{"TOSH3AA", SFX_TOSH3AA},
+	{"TOSH3AB", SFX_TOSH3AB},
+	{"TOSH3AC", SFX_TOSH3AC},
+	{"TOSH3AD", SFX_TOSH3AD},
+	{"TOSH3AE", SFX_TOSH3AE},
+	{"TOSH3AF", SFX_TOSH3AF},
+	{"TOSH3AG", SFX_TOSH3AG},
+	{"TOSH3AH", SFX_TOSH3AH},
+	{"TOSH3AI", SFX_TOSH3AI},
+	{"TOSH3AJ", SFX_TOSH3AJ},
+	{"TOSH3AK", SFX_TOSH3AK},
+	{"TOSH3BA", SFX_TOSH3BA},
+	{"TOSH3BB", SFX_TOSH3BB},
+	{"TOSH3CA", SFX_TOSH3CA},
+	{"TOSH3CB", SFX_TOSH3CB},
+	{"TOSH3CC", SFX_TOSH3CC},
+	{"TOSH3CD", SFX_TOSH3CD},
+	{"TOSH3CE", SFX_TOSH3CE},
+	{"TOSH3CF", SFX_TOSH3CF},
+	{"TOSH3CG", SFX_TOSH3CG},
+	{"TOSH3CH", SFX_TOSH3CH},
+	{"TOSH3CI", SFX_TOSH3CI},
+	{"TOSH3CJ", SFX_TOSH3CJ},
+	{"TOSH3CK", SFX_TOSH3CK},
+	{"TOSH3DA", SFX_TOSH3DA},
+	{"TOSH3EA", SFX_TOSH3EA},
+	{"TOSH3FA", SFX_TOSH3FA},
+	{"TOSH3FB", SFX_TOSH3FB},
+	{"TOSH3FC", SFX_TOSH3FC},
+	{"TOSH3FD", SFX_TOSH3FD},
+	{"TOSH3FE", SFX_TOSH3FE},
+	{"TOSH3FF", SFX_TOSH3FF},
+	{"TOSH3GA", SFX_TOSH3GA},
+	{"TOSH3GB", SFX_TOSH3GB},
+	{"TOSH3HA", SFX_TOSH3HA},
+	{"TOSH4AA", SFX_TOSH4AA},
+	{"TOSH4AB", SFX_TOSH4AB},
+	{"TOSH4AC", SFX_TOSH4AC},
+	{"TOSH4AD", SFX_TOSH4AD},
+	{"TOSH4AE", SFX_TOSH4AE},
+	{"TOSH4AF", SFX_TOSH4AF},
+	{"TOSH4AG", SFX_TOSH4AG},
+	{"TOSH4AH", SFX_TOSH4AH},
+	{"TOSH4AI", SFX_TOSH4AI},
+	{"TOSH4AJ", SFX_TOSH4AJ},
+	{"TOSH4BA", SFX_TOSH4BA},
+	{"TOSH4BB", SFX_TOSH4BB},
+	{"TOSH4BC", SFX_TOSH4BC},
+	{"TOSH4CA", SFX_TOSH4CA},
+	{"TOSH4CB", SFX_TOSH4CB},
+	{"TOSH4CC", SFX_TOSH4CC},
+	{"TOSH4CD", SFX_TOSH4CD},
+	{"TOSH4CE", SFX_TOSH4CE},
+	{"TOSH4DA", SFX_TOSH4DA},
+	{"TOSH4DB", SFX_TOSH4DB},
+	{"TOSH4DC", SFX_TOSH4DC},
+	{"VAL1_AA", SFX_VAL1_AA},
+	{"VAL1_AB", SFX_VAL1_AB},
+	{"VAL1_AC", SFX_VAL1_AC},
+	{"VAL1_AD", SFX_VAL1_AD},
+	{"VAL1_AE", SFX_VAL1_AE},
+	{"VAL1_AF", SFX_VAL1_AF},
+	{"VAL1_AG", SFX_VAL1_AG},
+	{"VAL1_AH", SFX_VAL1_AH},
+	{"VAL1_AI", SFX_VAL1_AI},
+	{"VAL2_AA", SFX_VAL2_AA},
+	{"VAL2_AB", SFX_VAL2_AB},
+	{"VAL2_AC", SFX_VAL2_AC},
+	{"VAL2_AD", SFX_VAL2_AD},
+	{"VAL2_AE", SFX_VAL2_AE},
+	{"VAL2_AF", SFX_VAL2_AF},
+	{"VAL2_AG", SFX_VAL2_AG},
+	{"VAL2_AH", SFX_VAL2_AH},
+	{"VAL2_AI", SFX_VAL2_AI},
+	{"VAL3_AA", SFX_VAL3_AA},
+	{"VAL3_AB", SFX_VAL3_AB},
+	{"VAL3_AC", SFX_VAL3_AC},
+	{"VAL3_AD", SFX_VAL3_AD},
+	{"VAL3_AE", SFX_VAL3_AE},
+	{"VAL3_AF", SFX_VAL3_AF},
+	{"VIC1_BA", SFX_VIC1_BA},
+	{"VIC1_BB", SFX_VIC1_BB},
+	{"VIC1_BC", SFX_VIC1_BC},
+	{"VIC1_BD", SFX_VIC1_BD},
+	{"VIC1_BE", SFX_VIC1_BE},
+	{"VIC1_BF", SFX_VIC1_BF},
+	{"VIC1_CA", SFX_VIC1_CA},
+	{"VIC1_CB", SFX_VIC1_CB},
+	{"VIC1_CC", SFX_VIC1_CC},
+	{"VIC1_CD", SFX_VIC1_CD},
+	{"VIC1_CE", SFX_VIC1_CE},
+	{"VIC1_DA", SFX_VIC1_DA},
+	{"VIC1_DB", SFX_VIC1_DB},
+	{"VIC1_DC", SFX_VIC1_DC},
+	{"VIC1_DD", SFX_VIC1_DD},
+	{"VIC1_DE", SFX_VIC1_DE},
+	{"VIC1_DF", SFX_VIC1_DF},
+	{"VIC1_DG", SFX_VIC1_DG},
+	{"VIC1_DH", SFX_VIC1_DH},
+	{"VIC2_AA", SFX_VIC2_AA},
+	{"VIC2_AB", SFX_VIC2_AB},
+	{"VIC2_AC", SFX_VIC2_AC},
+	{"VIC2_AD", SFX_VIC2_AD},
+	{"VIC2_AF", SFX_VIC2_AF},
+	{"VIC2_AG", SFX_VIC2_AG},
+	{"VIC2_AH", SFX_VIC2_AH},
+	{"VIC2_BA", SFX_VIC2_BA},
+	{"VIC2_BE", SFX_VIC2_BE},
+	{"VIC2_BI", SFX_VIC2_BI},
+	{"VIC3_AA", SFX_VIC3_AA},
+	{"VIC3_AB", SFX_VIC3_AB},
+	{"VIC3_AD", SFX_VIC3_AD},
+	{"VIC3_AE", SFX_VIC3_AE},
+	{"VIC3_AF", SFX_VIC3_AF},
+	{"VIC3_AG", SFX_VIC3_AG},
+	{"VIC3_AH", SFX_VIC3_AH},
+	{"VIC3_AJ", SFX_VIC3_AJ},
+	{"VIC3_AK", SFX_VIC3_AK},
+	{"VIC3_AL", SFX_VIC3_AL},
+	{"VIC3_AM", SFX_VIC3_AM},
+	{"VIC3_AN", SFX_VIC3_AN},
+	{"VIC3_AO", SFX_VIC3_AO},
+	{"VIC3_BA", SFX_VIC3_BA},
+	{"VIC3_BB", SFX_VIC3_BB},
+	{"VIC3_BC", SFX_VIC3_BC},
+	{"VIC4_AA", SFX_VIC4_AA},
+	{"VIC4_AB", SFX_VIC4_AB},
+	{"VIC4_AC", SFX_VIC4_AC},
+	{"VIC4_AD", SFX_VIC4_AD},
+	{"VIC4_AE", SFX_VIC4_AE},
+	{"VIC4_AF", SFX_VIC4_AF},
+	{"VIC4_AG", SFX_VIC4_AG},
+	{"VIC4_AH", SFX_VIC4_AH},
+	{"VIC4_AI", SFX_VIC4_AI},
+	{"VIC4_AJ", SFX_VIC4_AJ},
+	{"VIC4_AK", SFX_VIC4_AK},
+	{"VIC4_AL", SFX_VIC4_AL},
+	{"VIC4_AM", SFX_VIC4_AM},
+	{"VIC4_AN", SFX_VIC4_AN},
+	{"VIC4_BA", SFX_VIC4_BA},
+	{"VIC4_BB", SFX_VIC4_BB},
+	{"VIC4_BC", SFX_VIC4_BC},
+	{"VIC4_BD", SFX_VIC4_BD},
+	{"VIC4_BE", SFX_VIC4_BE},
+	{"VIC4_BF", SFX_VIC4_BF},
+	{"VIC4_BG", SFX_VIC4_BG},
+	{"VIC4_BH", SFX_VIC4_BH},
+	{"VIC5_AA", SFX_VIC5_AA},
+	{"VIC5_AB", SFX_VIC5_AB},
+	{"VIC5_AC", SFX_VIC5_AC},
+	{"VIC5_AD", SFX_VIC5_AD},
+	{"VIC5_AE", SFX_VIC5_AE},
+	{"VIC5_AF", SFX_VIC5_AF},
+	{"VIC5_AG", SFX_VIC5_AG},
+	{"VIC5_AH", SFX_VIC5_AH},
+	{"VIC5_AI", SFX_VIC5_AI},
+	{"VIC5_AJ", SFX_VIC5_AJ},
+	{"VIC5_AK", SFX_VIC5_AK},
+	{"VIC5_AL", SFX_VIC5_AL},
+	{"VIC5_FA", SFX_VIC5_FA},
+	{"VIC5_FD", SFX_VIC5_FD},
+	{"VIC5_FF", SFX_VIC5_FF},
+	{"VIC5_FG", SFX_VIC5_FG},
+	{"VIC5_FH", SFX_VIC5_FH},
+	{"VIC5_FI", SFX_VIC5_FI},
+	{"VIC5_FJ", SFX_VIC5_FJ},
+	{"VIC5_FK", SFX_VIC5_FK},
+	{"VIC6_AA", SFX_VIC6_AA},
+	{"VIC6_AB", SFX_VIC6_AB},
+	{"VIC6_AC", SFX_VIC6_AC},
+	{"VIC6_AD", SFX_VIC6_AD},
+	{"VIC6_AE", SFX_VIC6_AE},
+	{"VIC6_AF", SFX_VIC6_AF},
+	{"VIC6_AG", SFX_VIC6_AG},
+	{"VIC6_AH", SFX_VIC6_AH},
+	{"VIC6_AI", SFX_VIC6_AI},
+	{"VIC6_AJ", SFX_VIC6_AJ},
+	{"VIC6_AK", SFX_VIC6_AK},
+	{"VIC6_AL", SFX_VIC6_AL},
+	{"VIC6_AM", SFX_VIC6_AM},
+	{"VIC6_AN", SFX_VIC6_AN},
+	{"VIC6_AO", SFX_VIC6_AO},
+	{"VIC7_AA", SFX_VIC7_AA},
+	{"VIC7_AB", SFX_VIC7_AB},
+	{"VIC7_AC", SFX_VIC7_AC},
+	{"VIC7_AD", SFX_VIC7_AD},
+	{"VIC7_AE", SFX_VIC7_AE},
+	{"VIC7_AG", SFX_VIC7_AG},
+	{"VIC7_AH", SFX_VIC7_AH},
+	{"VIC7_AJ", SFX_VIC7_AJ},
+	{"VIC7_AL", SFX_VIC7_AL},
+	{"VIC7_AM", SFX_VIC7_AM},
+	{"VIC7_AN", SFX_VIC7_AN},
+	{"VIC7_AO", SFX_VIC7_AO},
+	{"VIC7_BA", SFX_VIC7_BA},
+	{"VIC7_BB", SFX_VIC7_BB},
+	{"VIC7_BC", SFX_VIC7_BC},
+	{"VIC7_BD", SFX_VIC7_BD},
+	{"VIC7_BE", SFX_VIC7_BE},
+	{"VIC7_BF", SFX_VIC7_BF},
+	{"VIC7_BG", SFX_VIC7_BG},
+	{"VIC7_BH", SFX_VIC7_BH},
+	{"VIC7_BI", SFX_VIC7_BI},
+	{"WAC1_AA", SFX_WAC1_AA},
+	{"WAC1_AB", SFX_WAC1_AB},
+	{"WAC1_AC", SFX_WAC1_AC},
+	{"WAC1_AD", SFX_WAC1_AD},
+	{"WAC1_AE", SFX_WAC1_AE},
+	{"WAC1_AF", SFX_WAC1_AF},
+	{"WAC1_AG", SFX_WAC1_AG},
+	{"WAC1_AH", SFX_WAC1_AH},
+	{"WAC2_AA", SFX_WAC2_AA},
+	{"WAC2_AB", SFX_WAC2_AB},
+	{"WAC2_AC", SFX_WAC2_AC},
+	{"WAC2_AD", SFX_WAC2_AD},
+	{"WAC2_AE", SFX_WAC2_AE},
+	{"WAC2_AF", SFX_WAC2_AF},
+	{"WAC2_AG", SFX_WAC2_AG},
+	{"WED1_AA", SFX_WED1_AA},
+	{"WED1_AB", SFX_WED1_AB},
+	{"WED1_AC", SFX_WED1_AC},
+	{"WED1_AD", SFX_WED1_AD},
+	{"WED1_AE", SFX_WED1_AE},
+	{"WED1_AF", SFX_WED1_AF},
+	{"WED1_AG", SFX_WED1_AG},
+	{"WED2_AA", SFX_WED2_AA},
+	{"WED2_AB", SFX_WED2_AB},
+	{"WED2_AC", SFX_WED2_AC},
+	{"WED2_AD", SFX_WED2_AD},
+	{"WED2_AE", SFX_WED2_AE},
+	{"WED2_AF", SFX_WED2_AF},
+	{"WED2_AG", SFX_WED2_AG},
+	{"WED2_AH", SFX_WED2_AH},
+	{"WED3_AA", SFX_WED3_AA},
+	{"WED3_AB", SFX_WED3_AB},
+	{"WED3_AC", SFX_WED3_AC},
+	{"WED3_AD", SFX_WED3_AD},
+	{"WED3_AE", SFX_WED3_AE},
+	{"WED3_AF", SFX_WED3_AF},
+	{"WED3_AG", SFX_WED3_AG},
+	{"WED3_AH", SFX_WED3_AH},
+	{"WED3_AI", SFX_WED3_AI},
+	{"WED3_AJ", SFX_WED3_AJ},
+	{"WED3_AK", SFX_WED3_AK},
+	{"WED3_AL", SFX_WED3_AL},
+	{"DONH3IA", SFX_DONH3IA},
+	{"DONH3JA", SFX_DONH3JA},
+	{"DONH5CA", SFX_DONH5CA},
+	{"DONH5CB", SFX_DONH5CB},
+	{"DONS7CA", SFX_DONS7CA},
+	{"DONS7CB", SFX_DONS7CB},
+	{"DONS7CC", SFX_DONS7CC},
+	{"DONS7CD", SFX_DONS7CD},
+	{"DONS7CE", SFX_DONS7CE},
+	{"JDT1_MA", SFX_JDT1_MA},
+	{"JDT1_MB", SFX_JDT1_MB},
+	{"JDT1_MC", SFX_JDT1_MC},
+	{"JDT1_MD", SFX_JDT1_MD},
+	{"JDT1_ME", SFX_JDT1_ME},
+	{"JDT1_MF", SFX_JDT1_MF},
+	{"JDT1_MG", SFX_JDT1_MG},
+	{"JDT1_MH", SFX_JDT1_MH},
+	{"JDT4_BA", SFX_JDT4_BA},
+	{"JDT4_BB", SFX_JDT4_BB},
+	{"JDT4_BC", SFX_JDT4_BC},
+	{"JDT5_FA", SFX_JDT5_FA},
+	{"JDT5_FB", SFX_JDT5_FB},
+	{"JDT5_FC", SFX_JDT5_FC},
+	{"JDT5_GA", SFX_JDT5_GA},
+	{"JDT5_GB", SFX_JDT5_GB},
+	{"JDT6_CA", SFX_JDT6_CA},
+	{"JDT6_CB", SFX_JDT6_CB},
+	{"JDT6_DA", SFX_JDT6_DA},
+	{"JDT7_CD", SFX_JDT7_CD},
+	{"JDT8_AI", SFX_JDT8_AI},
+	{"JDT8_BA", SFX_JDT8_BA},
+	{"JDT8_FD", SFX_JDT8_FD},
+	{"JDT8_FE", SFX_JDT8_FE},
+	{"JDT8_FF", SFX_JDT8_FF},
+	{"JDT8_FG", SFX_JDT8_FG},
+	{"JDT8_FH", SFX_JDT8_FH},
+	{"JDT8_GA", SFX_JDT8_GA},
+	{"JDT8_HA", SFX_JDT8_HA},
+	{"JDT8_HB", SFX_JDT8_HB},
+	{"MAC1_JC", SFX_MAC1_JC},
+	{"MAC4_DA", SFX_MAC4_DA},
+	{"MAC4_DB", SFX_MAC4_DB},
+	{"MAC4_DC", SFX_MAC4_DC},
+	{"MAC4_DD", SFX_MAC4_DD},
+	{"MAC4_DE", SFX_MAC4_DE},
+	{"MAC4_DF", SFX_MAC4_DF},
+	{"MAC4_DG", SFX_MAC4_DG},
+	{"MAC4_DH", SFX_MAC4_DH},
+	{"MAR1_HD", SFX_MAR1_HD},
+	{"MAR2_GF", SFX_MAR2_GF},
+	{"MAR5_DA", SFX_MAR5_DA},
+	{"MAR5_DB", SFX_MAR5_DB},
+	{"MAR5_DC", SFX_MAR5_DC},
+	{"MAR5_EA", SFX_MAR5_EA},
+	{"MAR5_EB", SFX_MAR5_EB},
+	{"MAR5_EC", SFX_MAR5_EC},
+	{"MAR5_ED", SFX_MAR5_ED},
+	{"NEDS1BA", SFX_NEDS1BA},
+	{"NEDS1BB", SFX_NEDS1BB},
+	{"NEDS1BC", SFX_NEDS1BC},
+	{"NEDS1BD", SFX_NEDS1BD},
+	{"NEDS1BE", SFX_NEDS1BE},
+	{"NEDS1BF", SFX_NEDS1BF},
+	{"NOOD_AA", SFX_NOOD_AA},
+	{"NOOD_AB", SFX_NOOD_AB},
+	{"NOOD_AC", SFX_NOOD_AC},
+	{"NOOD_AD", SFX_NOOD_AD},
+	{"NOOD_AE", SFX_NOOD_AE},
+	{"NOOD_AF", SFX_NOOD_AF},
+	{"NOOD_AG", SFX_NOOD_AG},
+	{"NOOD_AH", SFX_NOOD_AH},
+	{"NOOD_AI", SFX_NOOD_AI},
+	{"NOOD_AJ", SFX_NOOD_AJ},
+	{"NOOD_AK", SFX_NOOD_AK},
+	{"NOOD_AL", SFX_NOOD_AL},
+	{"NOOD_AM", SFX_NOOD_AM},
+	{"NOOD_AN", SFX_NOOD_AN},
+	{"NOOD_AO", SFX_NOOD_AO},
+	{"NOOD_AP", SFX_NOOD_AP},
+	{"NOOD_AQ", SFX_NOOD_AQ},
+	{"NOOD_AR", SFX_NOOD_AR},
+	{"NOOD_AS", SFX_NOOD_AS},
+	{"NOOD_AT", SFX_NOOD_AT},
+	{"PIZZ_AA", SFX_PIZZ_AA},
+	{"PIZZ_AB", SFX_PIZZ_AB},
+	{"PIZZ_AC", SFX_PIZZ_AC},
+	{"PIZZ_AD", SFX_PIZZ_AD},
+	{"PIZZ_AE", SFX_PIZZ_AE},
+	{"PIZZ_AF", SFX_PIZZ_AF},
+	{"PIZZ_AG", SFX_PIZZ_AG},
+	{"PIZZ_AH", SFX_PIZZ_AH},
+	{"PIZZ_AI", SFX_PIZZ_AI},
+	{"PIZZ_AJ", SFX_PIZZ_AJ},
+	{"PIZZ_AK", SFX_PIZZ_AK},
+	{"PIZZ_AL", SFX_PIZZ_AL},
+	{"PIZZ_AM", SFX_PIZZ_AM},
+	{"PIZZ_AN", SFX_PIZZ_AN},
+	{"PIZZ_AO", SFX_PIZZ_AO},
+	{"PIZZ_AP", SFX_PIZZ_AP},
+	{"PIZZ_AQ", SFX_PIZZ_AQ},
+	{"PIZZ_AR", SFX_PIZZ_AR},
+	{"PIZZ_AS", SFX_PIZZ_AS},
+	{"PIZZ_AT", SFX_PIZZ_AT},
+	{"RAYS2BA", SFX_RAYS2BA},
+	{"RAYS2BB", SFX_RAYS2BB},
+	{"RAYS2CA", SFX_RAYS2CA},
+	{"RAYS2CB", SFX_RAYS2CB},
+	{"RAYS2DA", SFX_RAYS2DA},
+	{"RAYS2DB", SFX_RAYS2DB},
+	{"RAYS2EA", SFX_RAYS2EA},
+	{"RAYS2EB", SFX_RAYS2EB},
+	{"RAYS4AA", SFX_RAYS4AA},
+	{"RAYS4AB", SFX_RAYS4AB},
+	{"RAYS4AC", SFX_RAYS4AC},
+	{"RAYS4AD", SFX_RAYS4AD},
+	{"RAYS4AE", SFX_RAYS4AE},
+	{"RAYS4AF", SFX_RAYS4AF},
+	{"RAYS4BA", SFX_RAYS4BA},
+	{"RAYS4BB", SFX_RAYS4BB},
+	{"RAYS4BC", SFX_RAYS4BC},
+	{"RAYS4BD", SFX_RAYS4BD},
+	{"RAYS4BE", SFX_RAYS4BE},
+	{"RAYS4BF", SFX_RAYS4BF},
+	{"RAYS4BG", SFX_RAYS4BG},
+	{"RAYS5BA", SFX_RAYS5BA},
+	{"RAYS5BB", SFX_RAYS5BB},
+	{"RMN_AA", SFX_RMN_AA},
+	{"RMN_AB", SFX_RMN_AB},
+	{"RMN_AC", SFX_RMN_AC},
+	{"RMN_AD", SFX_RMN_AD},
+	{"RMN_AE", SFX_RMN_AE},
+	{"RMN_AF", SFX_RMN_AF},
+	{"RMN_AG", SFX_RMN_AG},
+	{"RMN_AH", SFX_RMN_AH},
+	{"RMN_AI", SFX_RMN_AI},
+	{"RMN_AJ", SFX_RMN_AJ},
+	{"RMN_AK", SFX_RMN_AK},
+	{"SAL1_BA", SFX_SAL1_BA},
+	{"SAL1_BB", SFX_SAL1_BB},
+	{"SAL1_BC", SFX_SAL1_BC},
+	{"SAL1_BD", SFX_SAL1_BD},
+	{"SAL2_BA", SFX_SAL2_BA},
+	{"SAL2_BB", SFX_SAL2_BB},
+	{"SAL2_BC", SFX_SAL2_BC},
+	{"SAL2_BD", SFX_SAL2_BD},
+	{"SAL2_CA", SFX_SAL2_CA},
+	{"SAL2_CB", SFX_SAL2_CB},
+	{"SAL2_CC", SFX_SAL2_CC},
+	{"SAL2_CD", SFX_SAL2_CD},
+	{"SAL2_CE", SFX_SAL2_CE},
+	{"SAL2_CF", SFX_SAL2_CF},
+	{"SAL2_CG", SFX_SAL2_CG},
+	{"SAL2_CH", SFX_SAL2_CH},
+	{"SAL2_CI", SFX_SAL2_CI},
+	{"SAL2_CJ", SFX_SAL2_CJ},
+	{"SAL2_CL", SFX_SAL2_CL},
+	{"SAL2_CM", SFX_SAL2_CM},
+	{"SAL2_CN", SFX_SAL2_CN},
+	{"SAL2_CO", SFX_SAL2_CO},
+	{"SAL2_CP", SFX_SAL2_CP},
+	{"SAL2_CQ", SFX_SAL2_CQ},
+	{"SAL2_CR", SFX_SAL2_CR},
+	{"SAL2_CS", SFX_SAL2_CS},
+	{"SAL2_CT", SFX_SAL2_CT},
+	{"SAL2_CU", SFX_SAL2_CU},
+	{"SAL2_CV", SFX_SAL2_CV},
+	{"SAL2_DD", SFX_SAL2_DD},
+	{"SAL2_DE", SFX_SAL2_DE},
+	{"SAL3_BA", SFX_SAL3_BA},
+	{"SAL3_CA", SFX_SAL3_CA},
+	{"SAL3_DA", SFX_SAL3_DA},
+	{"SAL4_AA", SFX_SAL4_AA},
+	{"SAL5_AA", SFX_SAL5_AA},
+	{"SAL5_AD", SFX_SAL5_AD},
+	{"SAL5_AF", SFX_SAL5_AF},
+	{"SAL5_AG", SFX_SAL5_AG},
+	{"SAL6_CA", SFX_SAL6_CA},
+	{"SAL6_CB", SFX_SAL6_CB},
+	{"SAL6_CC", SFX_SAL6_CC},
+	{"SAL6_CD", SFX_SAL6_CD},
+	{"SAL7_CD", SFX_SAL7_CD},
+	{"SAL8_HA", SFX_SAL8_HA},
+	{"SAL8_HB", SFX_SAL8_HB},
+	{"SAL8_HC", SFX_SAL8_HC},
+	{"SAL8_HD", SFX_SAL8_HD},
+	{"SAL8_HE", SFX_SAL8_HE},
+	{"SAL8_HF", SFX_SAL8_HF},
+	{"SAL8_HG", SFX_SAL8_HG},
+	{"SAL8_HH", SFX_SAL8_HH},
+	{"SALH1AA", SFX_SALH1AA},
+	{"SALH1AB", SFX_SALH1AB},
+	{"SALH1BA", SFX_SALH1BA},
+	{"SALH1BB", SFX_SALH1BB},
+	{"SALH1CA", SFX_SALH1CA},
+	{"SALH1CB", SFX_SALH1CB},
+	{"SALH1DA", SFX_SALH1DA},
+	{"SALH1EA", SFX_SALH1EA},
+	{"SALH1EB", SFX_SALH1EB},
+	{"SALH1FB", SFX_SALH1FB},
+	{"SALH1FC", SFX_SALH1FC},
+	{"SALH1FG", SFX_SALH1FG},
+	{"SALH1GA", SFX_SALH1GA},
+	{"SALH1GB", SFX_SALH1GB},
+	{"SALH1HA", SFX_SALH1HA},
+	{"SALH2BE", SFX_SALH2BE},
+	{"SALH2BF", SFX_SALH2BF},
+	{"SALH2BG", SFX_SALH2BG},
+	{"SALH4CB", SFX_SALH4CB},
+	{"SALS1BA", SFX_SALS1BA},
+	{"SALS1BB", SFX_SALS1BB},
+	{"SALS1BC", SFX_SALS1BC},
+	{"SALS1BD", SFX_SALS1BD},
+	{"SALS2BA", SFX_SALS2BA},
+	{"SALS2BB", SFX_SALS2BB},
+	{"SALS2CA", SFX_SALS2CA},
+	{"SALS2CB", SFX_SALS2CB},
+	{"SALS2CC", SFX_SALS2CC},
+	{"SALS2CE", SFX_SALS2CE},
+	{"SALS3BA", SFX_SALS3BA},
+	{"SALS3BC", SFX_SALS3BC},
+	{"SALS3DB", SFX_SALS3DB},
+	{"SALS3DC", SFX_SALS3DC},
+	{"SALS3DD", SFX_SALS3DD},
+	{"SALS3DF", SFX_SALS3DF},
+	{"SALS3DG", SFX_SALS3DG},
+	{"STRE_AA", SFX_STRE_AA},
+	{"STRE_AB", SFX_STRE_AB},
+	{"STRE_AC", SFX_STRE_AC},
+	{"STRE_AD", SFX_STRE_AD},
+	{"STRE_AE", SFX_STRE_AE},
+	{"STRE_AF", SFX_STRE_AF},
+	{"STRE_AG", SFX_STRE_AG},
+	{"STRE_BA", SFX_STRE_BA},
+	{"STRE_BB", SFX_STRE_BB},
+	{"STRE_BC", SFX_STRE_BC},
+	{"STRE_BD", SFX_STRE_BD},
+	{"STRE_BE", SFX_STRE_BE},
+	{"STRE_BF", SFX_STRE_BF},
+	{"STRE_BG", SFX_STRE_BG},
+	{"STRE_CA", SFX_STRE_CA},
+	{"STRE_CB", SFX_STRE_CB},
+	{"STRE_CC", SFX_STRE_CC},
+	{"TOSH1BA", SFX_TOSH1BA},
+	{"TOSH1BB", SFX_TOSH1BB},
+	{"TOSH1BC", SFX_TOSH1BC},
+	{"TOSH1BD", SFX_TOSH1BD},
+	{"TOSH3IA", SFX_TOSH3IA},
+	{"TOSH3IB", SFX_TOSH3IB},
+	{"VIC2_BB", SFX_VIC2_BB},
+	{"VIC2_BC", SFX_VIC2_BC},
+	{"VIC2_BD", SFX_VIC2_BD},
+	{"VIC2_BF", SFX_VIC2_BF},
+	{"VIC2_BH", SFX_VIC2_BH},
+	{"VIC2_BJ", SFX_VIC2_BJ},
+	{"VIC2_CA", SFX_VIC2_CA},
+	{"VIC2_DA", SFX_VIC2_DA},
+	{"VIC2_DB", SFX_VIC2_DB},
+	{"VIC2_DE", SFX_VIC2_DC},
+	{"VIC4_CA", SFX_VIC4_CA},
+	{"VIC4_CB", SFX_VIC4_CB},
+	{"VIC5_DA", SFX_VIC5_DA},
+	{"VIC5_DB", SFX_VIC5_DB},
+	{"VIC5_DC", SFX_VIC5_DC},
+	{"VIC5_EA", SFX_VIC5_EA},
+	{"VIC5_EB", SFX_VIC5_EB},
+	{"VIC5_EC", SFX_VIC5_EC},
+	{"VIC5_FB", SFX_VIC5_FB},
+	{"VIC5_FC", SFX_VIC5_FC},
+	{"VIC5_FE", SFX_VIC5_FE},
+	{"VIC6_BA", SFX_VIC6_BA},
+	{"VIC6_BB", SFX_VIC6_BB},
+	{"VIC7_CA", SFX_VIC7_CA},
+	{"VIC7_CB", SFX_VIC7_CB},
+	{"VIC7_CC", SFX_VIC7_CC},
+	{"LCN_AA", SFX_LCN_AA},
+	{"LCN_AB", SFX_LCN_AB},
+	{"MSA12AB", SFX_SFX_ANG1_AA},
+	{"BNK1_12", SFX_SFX_BNK1_12},
+	{"TAX1_1", SFX_SFX_TAX1_1},
+	{"TAX1_2", SFX_SFX_TAX1_2},
+	{"TAX1_3", SFX_SFX_TAX1_3},
+	{"TAX1_4", SFX_SFX_TAX1_4},
+	{"TAX1_5", SFX_SFX_TAX1_5},
+	{"TAX2_1", SFX_SFX_TAX2_1},
+	{"TAX2_2", SFX_SFX_TAX2_2},
+	{"TAX2_3", SFX_SFX_TAX2_3},
+	{"TAX2_4", SFX_SFX_TAX2_4},
+	{"TAX2_5", SFX_SFX_TAX2_5},
+	{"TAX2_6", SFX_SFX_TAX2_6},
+	{"TAX2_7", SFX_SFX_TAX2_7},
+	{"TAX3_1", SFX_SFX_TAX3_1},
+	{"TAX3_2", SFX_SFX_TAX3_2},
+	{"TAX3_3", SFX_SFX_TAX3_3},
+	{"TAX3_4", SFX_SFX_TAX3_4},
+	{"TAX3_5", SFX_SFX_TAX3_5},
+	{nil, 0}
+};
 
 int32
 FindMissionAudioSfx(const char *name)
@@ -9795,12 +11275,14 @@ FindMissionAudioSfx(const char *name)
 	return NO_SAMPLE;
 }
 
-bool
+bool8
 cAudioManager::MissionScriptAudioUsesPoliceChannel(int32 soundMission) const
 {
-	return false;
+	return FALSE;
 }
 
+// LCS: mission audio turns from streamed to sampled
+
 void
 cAudioManager::PreloadMissionAudio(uint8 slot, Const char *name)
 {
@@ -9810,12 +11292,13 @@ cAudioManager::PreloadMissionAudio(uint8 slot, Const char *name)
 			m_sMissionAudio.m_nSampleIndex[slot] = missionAudioSfx;
 			m_sMissionAudio.m_nLoadingStatus[slot] = LOADING_STATUS_NOT_LOADED;
 			m_sMissionAudio.m_nPlayStatus[slot] = PLAY_STATUS_STOPPED;
-			m_sMissionAudio.m_bIsPlaying[slot] = false;
-			m_sMissionAudio.m_nMissionAudioCounter[slot] = m_nTimeSpent * SampleManager.GetStreamedFileLength(missionAudioSfx) / 1000;
+			m_sMissionAudio.m_bIsPlaying[slot] = FALSE;
+			//m_sMissionAudio.m_nMissionAudioCounter[slot] = m_nTimeSpent * SampleManager.GetStreamedFileLength(missionAudioSfx) / 1000;
+			m_sMissionAudio.m_nMissionAudioCounter[slot] = m_nTimeSpent * SampleManager.GetSampleLength(missionAudioSfx) / SampleManager.GetSampleBaseFrequency(missionAudioSfx);
 			m_sMissionAudio.m_nMissionAudioCounter[slot] *= 4;
-			m_sMissionAudio.m_bIsPlayed[slot] = false;
-			m_sMissionAudio.m_bPredefinedProperties[slot] = true;
-			g_bMissionAudioLoadFailed[slot] = false;
+			m_sMissionAudio.m_bIsPlayed[slot] = FALSE;
+			m_sMissionAudio.m_bPredefinedProperties[slot] = TRUE;
+			g_bMissionAudioLoadFailed[slot] = FALSE;
 		}
 	}
 }
@@ -9833,7 +11316,7 @@ void
 cAudioManager::SetMissionAudioLocation(uint8 slot, float x, float y, float z)
 {
 	if (m_bIsInitialised && slot < MISSION_AUDIO_SLOTS) {
-		m_sMissionAudio.m_bPredefinedProperties[slot] = false;
+		m_sMissionAudio.m_bPredefinedProperties[slot] = FALSE;
 		m_sMissionAudio.m_vecPos[slot] = CVector(x, y, z);
 	}
 }
@@ -9843,25 +11326,25 @@ cAudioManager::PlayLoadedMissionAudio(uint8 slot)
 {
 	if (m_bIsInitialised && slot < MISSION_AUDIO_SLOTS && m_sMissionAudio.m_nSampleIndex[slot] != NO_SAMPLE && m_sMissionAudio.m_nLoadingStatus[slot] == LOADING_STATUS_LOADED &&
 	    m_sMissionAudio.m_nPlayStatus[slot] == PLAY_STATUS_STOPPED)
-		m_sMissionAudio.m_bIsPlayed[slot] = true;
+		m_sMissionAudio.m_bIsPlayed[slot] = TRUE;
 }
 
-bool
+bool8
 cAudioManager::ShouldDuckMissionAudio(uint8 slot) const
 {
 	//if (IsMissionAudioSamplePlaying(slot))
 	//	return m_sMissionAudio.m_nSampleIndex[slot] != STREAMED_SOUND_MISSION_ROK2_01;
-	return false;
+	return FALSE;
 }
 
-bool
+bool8
 cAudioManager::IsMissionAudioSamplePlaying(uint8 slot) const
 {
 	if (m_bIsInitialised) {
 		if (slot < MISSION_AUDIO_SLOTS)
 			return m_sMissionAudio.m_nPlayStatus[slot] == PLAY_STATUS_PLAYING;
 		else
-			return true;
+			return TRUE;
 	} else {
 		static int32 cPretendFrame[MISSION_AUDIO_SLOTS] = { 1, 1 };
 
@@ -9869,14 +11352,14 @@ cAudioManager::IsMissionAudioSamplePlaying(uint8 slot) const
 	}
 }
 
-bool
+bool8
 cAudioManager::IsMissionAudioSampleFinished(uint8 slot)
 {
 	if (m_bIsInitialised) {
 		if (slot < MISSION_AUDIO_SLOTS)
 			return m_sMissionAudio.m_nPlayStatus[slot] == PLAY_STATUS_FINISHED;
 		else
-			return true;
+			return TRUE;
 	}
 
 	static int32 cPretendFrame[MISSION_AUDIO_SLOTS] = { 1, 1 };
@@ -9891,12 +11374,13 @@ cAudioManager::ClearMissionAudio(uint8 slot)
 		m_sMissionAudio.m_nSampleIndex[slot] = NO_SAMPLE;
 		m_sMissionAudio.m_nLoadingStatus[slot] = LOADING_STATUS_NOT_LOADED;
 		m_sMissionAudio.m_nPlayStatus[slot] = PLAY_STATUS_STOPPED;
-		m_sMissionAudio.m_bIsPlaying[slot] = false;
-		m_sMissionAudio.m_bIsPlayed[slot] = false;
-		m_sMissionAudio.m_bPredefinedProperties[slot] = true;
+		m_sMissionAudio.m_bIsPlaying[slot] = FALSE;
+		m_sMissionAudio.m_bIsPlayed[slot] = FALSE;
+		m_sMissionAudio.m_bPredefinedProperties[slot] = TRUE;
 		m_sMissionAudio.m_nMissionAudioCounter[slot] = 0;
-		m_sMissionAudio.m_bIsMobile[slot] = false;
-		SampleManager.StopStreamedFile(slot + 1);
+		m_sMissionAudio.m_bIsMobile[slot] = FALSE;
+		//SampleManager.StopStreamedFile(slot + 1);
+		SampleManager.StopChannel(slot + CHANNEL_MISSION_AUDIO_1);
 	}
 }
 
@@ -9917,7 +11401,10 @@ cAudioManager::ProcessMissionAudioSlot(uint8 slot)
 
 	switch (m_sMissionAudio.m_nLoadingStatus[slot]) {
 	case LOADING_STATUS_NOT_LOADED:
-		SampleManager.PreloadStreamedFile(m_sMissionAudio.m_nSampleIndex[slot], slot + 1);
+		//SampleManager.PreloadStreamedFile(m_sMissionAudio.m_nSampleIndex[slot], slot + 1);
+		SampleManager.LoadPedComment(m_sMissionAudio.m_nSampleIndex[slot]);
+		SampleManager.InitialiseChannel(slot + CHANNEL_MISSION_AUDIO_1, m_sMissionAudio.m_nSampleIndex[slot], SFX_BANK_PED_COMMENTS);
+		SampleManager.SetChannelFrequency(slot + CHANNEL_MISSION_AUDIO_1, SampleManager.GetSampleBaseFrequency(m_sMissionAudio.m_nSampleIndex[slot]));
 		m_sMissionAudio.m_nLoadingStatus[slot] = LOADING_STATUS_LOADED;
 		nFramesUntilFailedLoad[slot] = 0;
 		break;
@@ -9927,7 +11414,8 @@ cAudioManager::ProcessMissionAudioSlot(uint8 slot)
 		if (g_bMissionAudioLoadFailed[slot]) {
 			if (m_bTimerJustReset) {
 				ClearMissionAudio(slot);
-				SampleManager.StopStreamedFile(slot + 1);
+				SampleManager.StopChannel(slot + CHANNEL_MISSION_AUDIO_1);
+				//SampleManager.StopStreamedFile(slot + 1);
 				nFramesForPretendPlaying[slot] = 0;
 				nCheckPlayingDelay[slot] = 0;
 				nFramesUntilFailedLoad[slot] = 0;
@@ -9946,42 +11434,49 @@ cAudioManager::ProcessMissionAudioSlot(uint8 slot)
 			if (MissionScriptAudioUsesPoliceChannel(m_sMissionAudio.m_nSampleIndex[slot])) {
 				SetMissionScriptPoliceAudio(m_sMissionAudio.m_nSampleIndex[slot]);
 			} else {
-				if (m_nUserPause)
-					SampleManager.PauseStream(1, slot + 1);
+				if(m_nUserPause)
+					// SampleManager.PauseStream(TRUE, slot + 1);
+					SampleManager.StopChannel(slot + CHANNEL_MISSION_AUDIO_1);
 				if (m_sMissionAudio.m_bPredefinedProperties[slot]) {
 					//if (m_sMissionAudio.m_nSampleIndex[slot] == STREAMED_SOUND_MISSION_CAMERAL)
-					//	SampleManager.SetStreamedVolumeAndPan(80, 0, 1, slot + 1);
+					//	SampleManager.SetStreamedVolumeAndPan(80, 0, TRUE, slot + 1);
 					//else if (m_sMissionAudio.m_nSampleIndex[slot] == STREAMED_SOUND_MISSION_CAMERAR)
-					//	SampleManager.SetStreamedVolumeAndPan(80, 127, 1, slot + 1);
+					//	SampleManager.SetStreamedVolumeAndPan(80, 127, TRUE, slot + 1);
 					//else
-						SampleManager.SetStreamedVolumeAndPan(80, 63, 1, slot + 1);
+					SampleManager.SetChannelPan(slot + CHANNEL_MISSION_AUDIO_1, 63);
+					SampleManager.SetChannelVolume(slot + CHANNEL_MISSION_AUDIO_1, 127);
+						//SampleManager.SetStreamedVolumeAndPan(80, 63, 1, slot + 1);
 				} else {
 					distSquared = GetDistanceSquared(m_sMissionAudio.m_vecPos[slot]);
 					if (distSquared >= SQR(80.0f)) {
 						emittingVol = 0;
 						pan = 63;
 					} else {
-						emittingVol = 80;
+						emittingVol = 127;
 						if (distSquared > 0.0f) {
 							dist = Sqrt(distSquared);
-							emittingVol = ComputeVolume(80, 80.0f, dist);
+							emittingVol = ComputeVolume(127, 80.0f, dist);
 						}
 						TranslateEntity(&m_sMissionAudio.m_vecPos[slot], &vec);
 						pan = ComputePan(80.f, &vec);
 					}
-					SampleManager.SetStreamedVolumeAndPan(emittingVol, pan, 1, slot + 1);
+					SampleManager.SetChannelPan(slot + CHANNEL_MISSION_AUDIO_1, pan);
+					SampleManager.SetChannelVolume(slot + CHANNEL_MISSION_AUDIO_1, emittingVol);
+					//SampleManager.SetStreamedVolumeAndPan(emittingVol, pan, 1, slot + 1);
 				}
-				SampleManager.StartPreloadedStreamedFile(slot + 1);
+				//SampleManager.StartPreloadedStreamedFile(slot + 1);
+				SampleManager.StartChannel(slot + CHANNEL_MISSION_AUDIO_1);
 			}
 			m_sMissionAudio.m_nPlayStatus[slot] = PLAY_STATUS_PLAYING;
 			nCheckPlayingDelay[slot] = 30;
 			//if (m_sMissionAudio.m_nSampleIndex[slot] >= STREAMED_SOUND_MISSION_MOB_01A && m_sMissionAudio.m_nSampleIndex[slot] <= STREAMED_SOUND_MISSION_MOB_99A)
-			//	m_sMissionAudio.m_bIsMobile[slot] = true;
+			//	m_sMissionAudio.m_bIsMobile[slot] = TRUE;
 			break;
 		case PLAY_STATUS_PLAYING:
 			if (m_bTimerJustReset) {
 				ClearMissionAudio(slot);
-				SampleManager.StopStreamedFile(slot + 1);
+				//SampleManager.StopStreamedFile(slot + 1);
+				SampleManager.StopChannel(slot + CHANNEL_MISSION_AUDIO_1);
 				break;
 			}
 			if (MissionScriptAudioUsesPoliceChannel(m_sMissionAudio.m_nSampleIndex[slot])) {
@@ -9991,17 +11486,21 @@ cAudioManager::ProcessMissionAudioSlot(uint8 slot)
 					} else if (GetMissionScriptPoliceAudioPlayingStatus() == PLAY_STATUS_FINISHED || m_sMissionAudio.m_nMissionAudioCounter[slot]-- == 0) {
 						m_sMissionAudio.m_nPlayStatus[slot] = PLAY_STATUS_FINISHED;
 						m_sMissionAudio.m_nSampleIndex[slot] = NO_SAMPLE;
-						SampleManager.StopStreamedFile(slot + 1);
+						//SampleManager.StopStreamedFile(slot + 1);
+						SampleManager.StopChannel(slot + CHANNEL_MISSION_AUDIO_1);
 						m_sMissionAudio.m_nMissionAudioCounter[slot] = 0;
 					}
 				}
 			} else if (m_sMissionAudio.m_bIsPlaying[slot]) {
-				if (SampleManager.IsStreamPlaying(slot + 1) || m_nUserPause || m_nPreviousUserPause) {
-					if (m_nUserPause)
-						SampleManager.PauseStream(1, slot + 1);
+				//if (SampleManager.IsStreamPlaying(slot + 1) || m_nUserPause || m_nPreviousUserPause) {
+				if(SampleManager.GetChannelUsedFlag(slot + CHANNEL_MISSION_AUDIO_1) || m_nUserPause || m_nPreviousUserPause) {
+					if(m_nUserPause)
+						//SampleManager.PauseStream(TRUE, slot + 1);
+						SampleManager.StopChannel(slot + CHANNEL_MISSION_AUDIO_1);
 					else
 					{
-						SampleManager.PauseStream(0, slot + 1);
+						//SampleManager.PauseStream(FALSE, slot + 1);
+						//SampleManager.StartChannel(slot + CHANNEL_MISSION_AUDIO_1);
 						if (!m_sMissionAudio.m_bPredefinedProperties[slot]) {
 							distSquared = GetDistanceSquared(m_sMissionAudio.m_vecPos[slot]);
 							if (distSquared >= SQR(80.0f)) {
@@ -10016,7 +11515,9 @@ cAudioManager::ProcessMissionAudioSlot(uint8 slot)
 								TranslateEntity(&m_sMissionAudio.m_vecPos[slot], &vec);
 								pan = ComputePan(80.f, &vec);
 							}
-							SampleManager.SetStreamedVolumeAndPan(emittingVol, pan, 1, slot + 1);
+							SampleManager.SetChannelPan(slot + CHANNEL_MISSION_AUDIO_1, pan);
+							SampleManager.SetChannelVolume(slot + CHANNEL_MISSION_AUDIO_1, emittingVol);
+							//SampleManager.SetStreamedVolumeAndPan(emittingVol, pan, 1, slot + 1);
 						}
 					}
 				//} else if (m_sMissionAudio.m_nSampleIndex[slot] == STREAMED_SOUND_MISSION_ROK2_01) {
@@ -10024,20 +11525,22 @@ cAudioManager::ProcessMissionAudioSlot(uint8 slot)
 				} else {
 					m_sMissionAudio.m_nPlayStatus[slot] = PLAY_STATUS_FINISHED;
 					//if (m_sMissionAudio.m_nSampleIndex[slot] >= STREAMED_SOUND_MISSION_MOB_01A && m_sMissionAudio.m_nSampleIndex[slot] <= STREAMED_SOUND_MISSION_MOB_99A)
-					//	m_sMissionAudio.m_bIsMobile[slot] = false;
+					//	m_sMissionAudio.m_bIsMobile[slot] = FALSE;
 					m_sMissionAudio.m_nSampleIndex[slot] = NO_SAMPLE;
-					SampleManager.StopStreamedFile(slot + 1);
+					//SampleManager.StopStreamedFile(slot + 1);
+					SampleManager.StopChannel(slot + CHANNEL_MISSION_AUDIO_1);
 					m_sMissionAudio.m_nMissionAudioCounter[slot] = 0;
 				}
 			} else {
 				if (m_nUserPause)
 					break;
 				if (nCheckPlayingDelay[slot]--) {
-					if (!SampleManager.IsStreamPlaying(slot + 1))
+					//if (!SampleManager.IsStreamPlaying(slot + 1))
+					if (!SampleManager.GetChannelUsedFlag(slot + CHANNEL_MISSION_AUDIO_1))
 						break;
 					nCheckPlayingDelay[slot] = 0;
 				}
-				m_sMissionAudio.m_bIsPlaying[slot] = true;
+				m_sMissionAudio.m_bIsPlaying[slot] = TRUE;
 			}
 			break;
 		default:
@@ -10047,7 +11550,7 @@ cAudioManager::ProcessMissionAudioSlot(uint8 slot)
 	case LOADING_STATUS_FAILED:
 		if (++nFramesUntilFailedLoad[slot] >= 120) {
 			nFramesForPretendPlaying[slot] = 0;
-			g_bMissionAudioLoadFailed[slot] = true;
+			g_bMissionAudioLoadFailed[slot] = TRUE;
 			nFramesUntilFailedLoad[slot] = 0;
 			m_sMissionAudio.m_nLoadingStatus[slot] = LOADING_STATUS_LOADED;
 		}
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 2304b4c4..b9d46d2c 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -14,21 +14,17 @@
 
 cAudioManager AudioManager;
 
-const int channels = ARRAY_SIZE(AudioManager.m_asActiveSamples);
-const int policeChannel = channels + 1;
-const int allChannels = channels + 2;
-
 #define SPEED_OF_SOUND 343.f
 #define TIME_SPENT 40
 
 cAudioManager::cAudioManager()
 {
-	m_bIsInitialised = false;
-	m_bReverb = true;
+	m_bIsInitialised = FALSE;
+	m_bReverb = TRUE;
 	field_6 = 0;
 	m_fSpeedOfSound = SPEED_OF_SOUND / TIME_SPENT;
 	m_nTimeSpent = TIME_SPENT;
-	m_nActiveSamples = NUM_SOUNDS_SAMPLES_SLOTS;
+	m_nActiveSamples = NUM_CHANNELS_GENERIC;
 	m_nActiveSampleQueue = 1;
 	ClearRequestedQueue();
 	m_nActiveSampleQueue = 0;
@@ -36,16 +32,16 @@ cAudioManager::cAudioManager()
 	ClearActiveSamples();
 	GenerateIntegerRandomNumberTable();
 	field_4 = 0;
-	m_bDynamicAcousticModelingStatus = true;
+	m_bDynamicAcousticModelingStatus = TRUE;
 
 	for (int i = 0; i < NUM_AUDIOENTITIES; i++) {
-		m_asAudioEntities[i].m_bIsUsed = false;
+		m_asAudioEntities[i].m_bIsUsed = FALSE;
 		m_anAudioEntityIndices[i] = NUM_AUDIOENTITIES;
 	}
 	m_nAudioEntitiesTotal = 0;
 	m_FrameCounter = 0;
-	m_bFifthFrameFlag = false;
-	m_bTimerJustReset = false;
+	m_bFifthFrameFlag = FALSE;
+	m_bTimerJustReset = FALSE;
 	m_nTimer = 0;
 }
 
@@ -83,7 +79,7 @@ cAudioManager::Terminate()
 		MusicManager.Terminate();
 
 		for (uint32 i = 0; i < NUM_AUDIOENTITIES; i++) {
-			m_asAudioEntities[i].m_bIsUsed = false;
+			m_asAudioEntities[i].m_bIsUsed = FALSE;
 			m_anAudioEntityIndices[i] = ARRAY_SIZE(m_anAudioEntityIndices);
 		}
 
@@ -98,7 +94,7 @@ cAudioManager::Terminate()
 
 		SampleManager.Terminate();
 
-		m_bIsInitialised = false;
+		m_bIsInitialised = FALSE;
 		PostTerminateGameSpecificShutdown();
 	}
 }
@@ -110,7 +106,7 @@ cAudioManager::Service()
 	if (m_bTimerJustReset) {
 		ResetAudioLogicTimers(m_nTimer);
 		MusicManager.ResetTimers(m_nTimer);
-		m_bTimerJustReset = false;
+		m_bTimerJustReset = FALSE;
 	}
 	if (m_bIsInitialised) {
 		m_nPreviousUserPause = m_nUserPause;
@@ -132,8 +128,8 @@ cAudioManager::CreateEntity(eAudioType type, void *entity)
 		return AEHANDLE_ERROR_BADAUDIOTYPE;
 	for (uint32 i = 0; i < ARRAY_SIZE(m_asAudioEntities); i++) {
 		if (!m_asAudioEntities[i].m_bIsUsed) {
-			m_asAudioEntities[i].m_bIsUsed = true;
-			m_asAudioEntities[i].m_bStatus = false;
+			m_asAudioEntities[i].m_bIsUsed = TRUE;
+			m_asAudioEntities[i].m_bStatus = FALSE;
 			m_asAudioEntities[i].m_nType = type;
 			m_asAudioEntities[i].m_pEntity = entity;
 			m_asAudioEntities[i].m_awAudioEvent[0] = SOUND_NO_SOUND;
@@ -152,7 +148,7 @@ void
 cAudioManager::DestroyEntity(int32 id)
 {
 	if (m_bIsInitialised && id >= 0 && id < NUM_AUDIOENTITIES && m_asAudioEntities[id].m_bIsUsed) {
-		m_asAudioEntities[id].m_bIsUsed = false;
+		m_asAudioEntities[id].m_bIsUsed = FALSE;
 		for (int32 i = 0; i < m_nAudioEntitiesTotal; ++i) {
 			if (id == m_anAudioEntityIndices[i]) {
 				if (i < NUM_AUDIOENTITIES - 1)
@@ -165,7 +161,7 @@ cAudioManager::DestroyEntity(int32 id)
 }
 
 void
-cAudioManager::SetEntityStatus(int32 id, uint8 status)
+cAudioManager::SetEntityStatus(int32 id, bool8 status)
 {
 	if (m_bIsInitialised && id >= 0 && id < NUM_AUDIOENTITIES && m_asAudioEntities[id].m_bIsUsed)
 		m_asAudioEntities[id].m_bStatus = status;
@@ -193,7 +189,7 @@ cAudioManager::PlayOneShot(int32 index, uint16 sound, float vol)
 						}
 					} else {
 						int32 i = 0;
-						while (true) {
+						while (TRUE) {
 							if (i >= entity.m_AudioEvents) {
 								if (entity.m_AudioEvents < ARRAY_SIZE(entity.m_awAudioEvent)) {
 									entity.m_awAudioEvent[i] = sound;
@@ -246,7 +242,7 @@ cAudioManager::SetEffectsFadeVol(uint8 volume) const
 }
 
 void
-cAudioManager::SetMonoMode(uint8 mono)
+cAudioManager::SetMonoMode(bool8 mono)
 {
 	SampleManager.SetMonoMode(mono);
 }
@@ -261,7 +257,7 @@ void
 cAudioManager::ResetTimers(uint32 time)
 {
 	if (m_bIsInitialised) {
-		m_bTimerJustReset = true;
+		m_bTimerJustReset = TRUE;
 		m_nTimer = time;
 		ClearRequestedQueue();
 		if (m_nActiveSampleQueue) {
@@ -276,11 +272,13 @@ cAudioManager::ResetTimers(uint32 time)
 		ClearActiveSamples();
 		ClearMissionAudio(0);
 		ClearMissionAudio(1);
-		SampleManager.StopChannel(policeChannel);
+		SampleManager.StopChannel(CHANNEL_POLICE_RADIO);
+		SampleManager.StopChannel(CHANNEL_MISSION_AUDIO_1);
+		SampleManager.StopChannel(CHANNEL_MISSION_AUDIO_2);
 		SampleManager.SetEffectsFadeVolume(0);
 		SampleManager.SetMusicFadeVolume(0);
 		MusicManager.ResetMusicAfterReload();
-		m_bIsPlayerShutUp = false;
+		m_bIsPlayerShutUp = FALSE;
 #ifdef AUDIO_OAL
 		SampleManager.Service();
 #endif
@@ -391,13 +389,13 @@ cAudioManager::SetSpeakerConfig(int32 conf) const
 	SampleManager.SetSpeakerConfig(conf);
 }
 
-bool
+bool8
 cAudioManager::IsMP3RadioChannelAvailable() const
 {
 	if (m_bIsInitialised)
 		return SampleManager.IsMP3RadioChannelAvailable();
 
-	return false;
+	return FALSE;
 }
 
 void
@@ -417,25 +415,25 @@ cAudioManager::ReacquireDigitalHandle() const
 }
 
 void
-cAudioManager::SetDynamicAcousticModelingStatus(uint8 status)
+cAudioManager::SetDynamicAcousticModelingStatus(bool8 status)
 {
-	m_bDynamicAcousticModelingStatus = status!=0;
+	m_bDynamicAcousticModelingStatus = status;
 }
 
-bool
+bool8
 cAudioManager::CheckForAnAudioFileOnCD() const
 {
 	return SampleManager.CheckForAnAudioFileOnCD();
 }
 
-uint8
+char
 cAudioManager::GetCDAudioDriveLetter() const
 {
 	if(m_bIsInitialised) return SampleManager.GetCDAudioDriveLetter();
-	return 0;
+	return '\0';
 }
 
-bool
+bool8
 cAudioManager::IsAudioInitialised() const
 {
 	return m_bIsInitialised;
@@ -444,9 +442,12 @@ cAudioManager::IsAudioInitialised() const
 void
 cAudioManager::ServiceSoundEffects()
 {
+#ifdef FIX_BUGS
+	if(CTimer::GetLogicalFramesPassed() != 0)
+#endif
 	m_bFifthFrameFlag = (m_FrameCounter++ % 5) == 0;
 	if (m_nUserPause && !m_nPreviousUserPause) {
-		for (int32 i = 0; i < allChannels; i++)
+		for (int32 i = 0; i < NUM_CHANNELS; i++)
 			SampleManager.StopChannel(i);
 
 		ClearRequestedQueue();
@@ -545,7 +546,7 @@ cAudioManager::RandomDisplacement(uint32 seed) const
 {
 	int32 value;
 
-	static bool bPos = true;
+	static bool8 bPos = TRUE;
 	static uint32 Adjustment = 0;
 
 	if (!seed)
@@ -576,7 +577,7 @@ cAudioManager::AddSampleToRequestedQueue()
 {
 	int32 calculatedVolume;
 	uint8 sampleIndex;
-	bool bReflections;
+	bool8 bReflections;
 
 	if (m_sQueueSample.m_nSampleIndex < TOTAL_AUDIO_SAMPLES) {
 		calculatedVolume = m_sQueueSample.m_nReleasingVolumeModificator * (MAX_VOLUME - m_sQueueSample.m_nVolume);
@@ -589,24 +590,24 @@ cAudioManager::AddSampleToRequestedQueue()
 			++m_SampleRequestQueuesStatus[m_nActiveSampleQueue];
 		}
 		m_sQueueSample.m_nCalculatedVolume = calculatedVolume;
-		m_sQueueSample.m_bLoopEnded = false;
+		m_sQueueSample.m_bLoopEnded = FALSE;
 		if (m_sQueueSample.m_bIs2D || CCullZones::InRoomForAudio()) {
-			m_sQueueSample.m_bRequireReflection = false;
+			m_sQueueSample.m_bRequireReflection = FALSE;
 			m_sQueueSample.m_nLoopsRemaining = 0;
 		}
 		if (m_bDynamicAcousticModelingStatus && m_sQueueSample.m_nLoopCount) {
 			bReflections = m_sQueueSample.m_bRequireReflection;
 		} else {
-			bReflections = false;
+			bReflections = FALSE;
 			m_sQueueSample.m_nLoopsRemaining = 0;
 		}
-		m_sQueueSample.m_bRequireReflection = false;
+		m_sQueueSample.m_bRequireReflection = FALSE;
 
 		if ( m_bReverb && m_sQueueSample.m_bIs2D )
 			m_sQueueSample.field_4C = 30;
 
 		if (!m_bDynamicAcousticModelingStatus)
-			m_sQueueSample.m_bReverbFlag = false;
+			m_sQueueSample.m_bReverbFlag = FALSE;
 
 		m_asSamples[m_nActiveSampleQueue][sampleIndex] = m_sQueueSample;
 
@@ -773,7 +774,12 @@ cAudioManager::UpdateReflections()
 void
 cAudioManager::AddReleasingSounds()
 {
-	bool toProcess[44]; // why not 27?
+	// in case someone would want to increase it
+#ifdef FIX_BUGS
+	bool8 toProcess[NUM_CHANNELS_GENERIC];
+#else
+	bool8 toProcess[44];
+#endif
 
 	int8 queue = m_nActiveSampleQueue == 0 ? 1 : 0;
 
@@ -782,19 +788,19 @@ cAudioManager::AddReleasingSounds()
 		if (sample.m_bLoopEnded)
 			continue;
 
-		toProcess[i] = false;
+		toProcess[i] = FALSE;
 		for (int32 j = 0; j < m_SampleRequestQueuesStatus[m_nActiveSampleQueue]; j++) {
 			if (sample.m_nEntityIndex == m_asSamples[m_nActiveSampleQueue][m_abSampleQueueIndexTable[m_nActiveSampleQueue][j]].m_nEntityIndex &&
 			    sample.m_nCounter == m_asSamples[m_nActiveSampleQueue][m_abSampleQueueIndexTable[m_nActiveSampleQueue][j]].m_nCounter) {
-				toProcess[i] = true;
+				toProcess[i] = TRUE;
 				break;
 			}
 		}
 		if (!toProcess[i]) {
 			if (sample.m_nCounter <= 255 || !sample.m_nLoopsRemaining) {
-				if (!sample.m_nReleasingVolumeDivider)
+				if (sample.m_nReleasingVolumeDivider == 0)
 					continue;
-				if (!sample.m_nLoopCount) {
+				if (sample.m_nLoopCount == 0) {
 					if (sample.m_nVolumeChange == -1) {
 						sample.m_nVolumeChange = sample.m_nVolume / sample.m_nReleasingVolumeDivider;
 						if (sample.m_nVolumeChange <= 0)
@@ -806,12 +812,15 @@ cAudioManager::AddReleasingSounds()
 					}
 					sample.m_nVolume -= sample.m_nVolumeChange;
 				}
+#ifdef FIX_BUGS
+				if(CTimer::GetLogicalFramesPassed() != 0)
+#endif
 				--sample.m_nReleasingVolumeDivider;
 				if (m_bFifthFrameFlag) {
 					if (sample.m_nReleasingVolumeModificator < 20)
 						++sample.m_nReleasingVolumeModificator;
 				}
-				sample.m_bReleasingSoundFlag = false;
+				sample.m_bReleasingSoundFlag = FALSE;
 			}
 			memcpy(&m_sQueueSample, &sample, sizeof(tSound));
 			AddSampleToRequestedQueue();
@@ -829,12 +838,12 @@ cAudioManager::ProcessActiveQueues()
 	uint8 vol;
 	uint8 offset;
 	float x;
-	bool flag;
-	bool missionState;
+	bool8 flag;
+	bool8 missionState;
 
 	for (int32 i = 0; i < m_nActiveSamples; i++) {
-		m_asSamples[m_nActiveSampleQueue][i].m_bIsProcessed = false;
-		m_asActiveSamples[i].m_bIsProcessed = false;
+		m_asSamples[m_nActiveSampleQueue][i].m_bIsProcessed = FALSE;
+		m_asActiveSamples[i].m_bIsProcessed = FALSE;
 	}
 	for (int32 i = 0; i < m_SampleRequestQueuesStatus[m_nActiveSampleQueue]; i++) {
 		tSound& sample = m_asSamples[m_nActiveSampleQueue][m_abSampleQueueIndexTable[m_nActiveSampleQueue][i]];
@@ -847,19 +856,19 @@ cAudioManager::ProcessActiveQueues()
 						
 						if (m_FrameCounter & 1) {
 							if (!(j & 1)) {
-								flag = false;
+								flag = FALSE;
 							} else {
-								flag = true;
+								flag = TRUE;
 							}
 						} else if (j & 1) {
-							flag = false;
+							flag = FALSE;
 						} else {
-							flag = true;
+							flag = TRUE;
 						}
 
 						if (flag && !SampleManager.GetChannelUsedFlag(j)) {
-							sample.m_bLoopEnded = true;
-							m_asActiveSamples[j].m_bLoopEnded = true;
+							sample.m_bLoopEnded = TRUE;
+							m_asActiveSamples[j].m_bLoopEnded = TRUE;
 							m_asActiveSamples[j].m_nSampleIndex = NO_SAMPLE;
 							m_asActiveSamples[j].m_nEntityIndex = AEHANDLE_NONE;
 							continue;
@@ -867,8 +876,8 @@ cAudioManager::ProcessActiveQueues()
 						if (!sample.m_nReleasingVolumeDivider)
 							sample.m_nReleasingVolumeDivider = 1;
 					}
-					sample.m_bIsProcessed = true;
-					m_asActiveSamples[j].m_bIsProcessed = true;
+					sample.m_bIsProcessed = TRUE;
+					m_asActiveSamples[j].m_bIsProcessed = TRUE;
 					sample.m_nVolumeChange = -1;
 					if (!sample.m_bReleasingSoundFlag) {
 						if (sample.m_bIs2D) {
@@ -900,10 +909,10 @@ cAudioManager::ProcessActiveQueues()
 									emittingVol = vol;
 								}
 
-								missionState = false;
+								missionState = FALSE;
 								for (int32 k = 0; k < ARRAY_SIZE(m_sMissionAudio.m_bIsMobile); k++) {
 									if (m_sMissionAudio.m_bIsMobile[k]) {
-										missionState = true;
+										missionState = TRUE;
 										break;
 									}
 								}
@@ -924,8 +933,8 @@ cAudioManager::ProcessActiveQueues()
 						SampleManager.SetChannelReverbFlag(j, sample.m_bReverbFlag);
 						break; //continue for i
 					}
-					sample.m_bIsProcessed = false;
-					m_asActiveSamples[j].m_bIsProcessed = false;
+					sample.m_bIsProcessed = FALSE;
+					m_asActiveSamples[j].m_bIsProcessed = FALSE;
 					//continue for j
 				}
 			}
@@ -966,10 +975,10 @@ cAudioManager::ProcessActiveQueues()
 						}
 						if (SampleManager.InitialiseChannel(k, m_asActiveSamples[k].m_nSampleIndex, m_asActiveSamples[k].m_nBankIndex)) {
 							SampleManager.SetChannelFrequency(k, m_asActiveSamples[k].m_nFrequency);
-							bool isMobile = false;
+							bool8 isMobile = FALSE;
 							for (int32 l = 0; l < ARRAY_SIZE(m_sMissionAudio.m_bIsMobile); l++) {
 								if (m_sMissionAudio.m_bIsMobile[l]) {
-									isMobile = true;
+									isMobile = TRUE;
 									break;
 								}
 							}
@@ -1000,8 +1009,8 @@ cAudioManager::ProcessActiveQueues()
 							SampleManager.SetChannel3DDistances(k, m_asActiveSamples[k].m_fSoundIntensity, 0.25f * m_asActiveSamples[k].m_fSoundIntensity);
 							SampleManager.StartChannel(k);
 						}
-						m_asActiveSamples[k].m_bIsProcessed = true;
-						sample.m_bIsProcessed = true;
+						m_asActiveSamples[k].m_bIsProcessed = TRUE;
+						sample.m_bIsProcessed = TRUE;
 						sample.m_nVolumeChange = -1;
 						break;
 					}
@@ -1029,28 +1038,30 @@ cAudioManager::ClearActiveSamples()
 		m_asActiveSamples[i].m_nCounter = 0;
 		m_asActiveSamples[i].m_nSampleIndex = NO_SAMPLE;
 		m_asActiveSamples[i].m_nBankIndex = INVALID_SFX_BANK;
-		m_asActiveSamples[i].m_bIs2D = false;
+		m_asActiveSamples[i].m_bIs2D = FALSE;
 		m_asActiveSamples[i].m_nReleasingVolumeModificator = 5;
 		m_asActiveSamples[i].m_nFrequency = 0;
 		m_asActiveSamples[i].m_nVolume = 0;
 		m_asActiveSamples[i].m_nEmittingVolume = 0;
 		m_asActiveSamples[i].m_fDistance = 0.0f;
-		m_asActiveSamples[i].m_bIsProcessed = false;
-		m_asActiveSamples[i].m_bLoopEnded = false;
+		m_asActiveSamples[i].m_bIsProcessed = FALSE;
+		m_asActiveSamples[i].m_bLoopEnded = FALSE;
 		m_asActiveSamples[i].m_nLoopCount = 1;
+#ifndef GTA_PS2
 		m_asActiveSamples[i].m_nLoopStart = 0;
 		m_asActiveSamples[i].m_nLoopEnd = -1;
+#endif
 		m_asActiveSamples[i].m_fSpeedMultiplier = 0.0f;
 		m_asActiveSamples[i].m_fSoundIntensity = 200.0f;
 		m_asActiveSamples[i].m_nOffset = 63;
-		m_asActiveSamples[i].m_bReleasingSoundFlag = false;
+		m_asActiveSamples[i].m_bReleasingSoundFlag = FALSE;
 		m_asActiveSamples[i].m_nCalculatedVolume = 0;
 		m_asActiveSamples[i].m_nReleasingVolumeDivider = 0;
 		m_asActiveSamples[i].m_nVolumeChange = -1;
 		m_asActiveSamples[i].m_vecPos = CVector(0.0f, 0.0f, 0.0f);
-		m_asActiveSamples[i].m_bReverbFlag = false;
+		m_asActiveSamples[i].m_bReverbFlag = FALSE;
 		m_asActiveSamples[i].m_nLoopsRemaining = 0;
-		m_asActiveSamples[i].m_bRequireReflection = false;
+		m_asActiveSamples[i].m_bRequireReflection = FALSE;
 	}
 }
 
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 2eb2220b..d3f3fb81 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -2,7 +2,7 @@
 
 #include "audio_enums.h"
 #include "AudioCollision.h"
-#include "PoliceRadio.h"
+#include "PolRadio.h"
 #include "VehicleModelInfo.h"
 #include "Vehicle.h"
 
@@ -13,27 +13,29 @@ public:
 	int32 m_nCounter;
 	int32 m_nSampleIndex;
 	uint8 m_nBankIndex;
-	bool m_bIs2D;
+	bool8 m_bIs2D;
 	int32 m_nReleasingVolumeModificator;
 	uint32 m_nFrequency;
 	uint8 m_nVolume;
 	float m_fDistance;
 	int32 m_nLoopCount;
+#ifndef GTA_PS2
 	int32 m_nLoopStart;
 	int32 m_nLoopEnd;
+#endif
 	uint8 m_nEmittingVolume;
 	float m_fSpeedMultiplier;
 	float m_fSoundIntensity;
-	bool m_bReleasingSoundFlag;
+	bool8 m_bReleasingSoundFlag;
 	CVector m_vecPos;
-	bool m_bReverbFlag;
+	bool8 m_bReverbFlag;
 	uint8 m_nLoopsRemaining;
-	bool m_bRequireReflection; // Used for oneshots
+	bool8 m_bRequireReflection; // Used for oneshots
 	uint8 m_nOffset;
 	uint8 field_4C;
 	int32 m_nReleasingVolumeDivider;
-	bool m_bIsProcessed;
-	bool m_bLoopEnded;
+	bool8 m_bIsProcessed;
+	bool8 m_bLoopEnded;
 	int32 m_nCalculatedVolume;
 	int8 m_nVolumeChange;
 };
@@ -48,7 +50,7 @@ class tAudioEntity
 public:
 	eAudioType m_nType;
 	void *m_pEntity;
-	bool m_bIsUsed;
+	bool8 m_bIsUsed;
 	uint8 m_bStatus;
 	int16 m_awAudioEvent[NUM_AUDIOENTITY_EVENTS];
 	float m_afVolume[NUM_AUDIOENTITY_EVENTS];
@@ -78,7 +80,7 @@ public:
 	uint8 m_nCommentsInBank[NUM_PED_COMMENTS_BANKS];
 	uint8 m_nActiveBank;
 #ifdef GTA_PC
-	bool m_bDelay;
+	bool8 m_bDelay;
 	uint32 m_nDelayTimer;
 #endif
 
@@ -110,14 +112,14 @@ class cMissionAudio
 {
 public:
 	CVector m_vecPos[MISSION_AUDIO_SLOTS];
-	bool m_bPredefinedProperties[MISSION_AUDIO_SLOTS];
+	bool8 m_bPredefinedProperties[MISSION_AUDIO_SLOTS];
 	int32 m_nSampleIndex[MISSION_AUDIO_SLOTS];
 	uint8 m_nLoadingStatus[MISSION_AUDIO_SLOTS];
 	uint8 m_nPlayStatus[MISSION_AUDIO_SLOTS];
-	bool m_bIsPlaying[MISSION_AUDIO_SLOTS];
+	bool8 m_bIsPlaying[MISSION_AUDIO_SLOTS];
 	int32 m_nMissionAudioCounter[MISSION_AUDIO_SLOTS];
-	bool m_bIsPlayed[MISSION_AUDIO_SLOTS];
-	bool m_bIsMobile[MISSION_AUDIO_SLOTS];
+	bool8 m_bIsPlayed[MISSION_AUDIO_SLOTS];
+	bool8 m_bIsMobile[MISSION_AUDIO_SLOTS];
 };
 VALIDATE_SIZE(cMissionAudio, 0x38);
 
@@ -141,7 +143,7 @@ class CPed;
 class cPedParams
 {
 public:
-	bool m_bDistanceCalculated;
+	bool8 m_bDistanceCalculated;
 	float m_fDistance;
 	CPed *m_pPed;
 
@@ -157,7 +159,7 @@ class cVehicleParams
 {
 public:
 	int32 m_VehicleType;
-	bool m_bDistanceCalculated;
+	bool8 m_bDistanceCalculated;
 	float m_fDistance;
 	CVehicle *m_pVehicle;
 	cTransmission *m_pTransmission;
@@ -193,22 +195,22 @@ enum {
 class cAudioManager
 {
 public:
-	bool m_bIsInitialised;
+	bool8 m_bIsInitialised;
 	uint8 m_bReverb; // unused
-	bool m_bFifthFrameFlag;
+	bool8 m_bFifthFrameFlag;
 	uint8 m_nActiveSamples;
 	uint8 field_4; // unused
-	bool m_bDynamicAcousticModelingStatus;
+	bool8 m_bDynamicAcousticModelingStatus;
 	int8 field_6;
 	float m_fSpeedOfSound;
-	bool m_bTimerJustReset;
+	bool8 m_bTimerJustReset;
 	int32 m_nTimer;
 	tSound m_sQueueSample;
 	uint8 m_nActiveSampleQueue;
-	tSound m_asSamples[NUM_SOUNDS_SAMPLES_BANKS][NUM_SOUNDS_SAMPLES_SLOTS];
-	uint8 m_abSampleQueueIndexTable[NUM_SOUNDS_SAMPLES_BANKS][NUM_SOUNDS_SAMPLES_SLOTS];
+	tSound m_asSamples[NUM_SOUNDS_SAMPLES_BANKS][NUM_CHANNELS_GENERIC];
+	uint8 m_abSampleQueueIndexTable[NUM_SOUNDS_SAMPLES_BANKS][NUM_CHANNELS_GENERIC];
 	uint8 m_SampleRequestQueuesStatus[NUM_SOUNDS_SAMPLES_BANKS];
-	tSound m_asActiveSamples[NUM_SOUNDS_SAMPLES_SLOTS];
+	tSound m_asActiveSamples[NUM_CHANNELS_GENERIC];
 	tAudioEntity m_asAudioEntities[NUM_AUDIOENTITIES];
 	int32 m_anAudioEntityIndices[NUM_AUDIOENTITIES];
 	int32 m_nAudioEntitiesTotal;
@@ -217,11 +219,11 @@ public:
 	cAudioScriptObjectManager m_sAudioScriptObjectManager;
 
 	// miami
-	uint8 m_bIsPlayerShutUp;
+	bool8 m_bIsPlayerShutUp;
 	uint8 m_nPlayerMood;
 	uint32 m_nPlayerMoodTimer;
 	uint8 field_rest[4];
-	bool m_bGenericSfx;
+	bool8 m_bGenericSfx;
 
 	cPedComments m_sPedComments;
 	int32 m_nFireAudioEntity;
@@ -253,19 +255,19 @@ public:
 	float GetReflectionsDistance(int32 idx) const { return m_afReflectionsDistances[idx]; } // done
 	int32 GetRandomNumber(int32 idx) const { return m_anRandomTable[idx]; }
 	int32 GetRandomNumberInRange(int32 idx, int32 low, int32 high) const { return (m_anRandomTable[idx] % (high - low + 1)) + low; }
-	bool IsMissionAudioSamplePlaying(uint8 slot) const; // { return m_sMissionAudio.m_nPlayStatus == 1; }
-	bool ShouldDuckMissionAudio(uint8 slot) const;
+	bool8 IsMissionAudioSamplePlaying(uint8 slot) const; // { return m_sMissionAudio.m_nPlayStatus == 1; }
+	bool8 ShouldDuckMissionAudio(uint8 slot) const;
 
 	// "Should" be in alphabetic order, except "getXTalkSfx"
 	void AddDetailsToRequestedOrderList(uint8 sample);                                                                    // done (inlined in vc)
-	void AddPlayerCarSample(uint8 emittingVolume, int32 freq, uint32 sample, uint8 bank, uint8 counter, bool notLooping); // done
+	void AddPlayerCarSample(uint8 emittingVolume, int32 freq, uint32 sample, uint8 bank, uint8 counter, bool8 notLooping); // done
 	void AddReflectionsToRequestedQueue();                                                                                // done
 	void AddReleasingSounds();                                                                                            // done
 	void AddSampleToRequestedQueue();                                                                                     // done
 	void AgeCrimes();                                                                                                     // done (inlined in vc)
 
-	void CalculateDistance(bool &condition, float dist);                                                                   // done
-	bool CheckForAnAudioFileOnCD() const;                                                                                  // done
+	void CalculateDistance(bool8 &condition, float dist);                                                                   // done
+	bool8 CheckForAnAudioFileOnCD() const;                                                                                  // done
 	void ClearActiveSamples();                                                                                             // done
 	void ClearMissionAudio(uint8 slot);                                                                                    // done (inlined in vc)
 	void ClearRequestedQueue();                                                                                            // done (inlined in vc)
@@ -288,90 +290,93 @@ public:
 	uint32 GetMedicTalkSfx(CPed *ped, int16 sound);
 	uint32 GetFiremanTalkSfx(CPed *ped, int16 sound);
 	uint32 GetDefaultTalkSfx(CPed *ped, int16 sound);
-	uint32 GetHFYSTTalkSfx(CPed *ped, int16 sound);
-	uint32 GetHFOSTTalkSfx(CPed *ped, int16 sound);
-	uint32 GetHMYSTTalkSfx(CPed *ped, int16 sound);
-	uint32 GetHMOSTTalkSfx(CPed *ped, int16 sound);
-	uint32 GetHFYRITalkSfx(CPed *ped, int16 sound);
-	uint32 GetHFORITalkSfx(CPed *ped, int16 sound); 
-	uint32 GetHMYRITalkSfx(CPed *ped, int16 sound); 
-	uint32 GetHMORITalkSfx(CPed *ped, int16 sound);
-	uint32 GetHFYBETalkSfx(CPed *ped, int16 sound);
-	uint32 GetHFOBETalkSfx(CPed *ped, int16 sound);
-	uint32 GetHMYBETalkSfx(CPed *ped, int16 sound);
-	uint32 GetHMOBETalkSfx(CPed *ped, int16 sound);
-	uint32 GetHFYBUTalkSfx(CPed *ped, int16 sound);
-	uint32 GetHFYMDTalkSfx(CPed *ped, int16 sound);
-	uint32 GetHFYCGTalkSfx(CPed *ped, int16 sound);
-	uint32 GetHFYPRTalkSfx(CPed *ped, int16 sound);
-	uint32 GetHFOTRTalkSfx(CPed *ped, int16 sound);
-	uint32 GetHMOTRTalkSfx(CPed *ped, int16 sound);
-	uint32 GetHMYAPTalkSfx(CPed *ped, int16 sound);
-	uint32 GetHMOCATalkSfx(CPed *ped, int16 sound);
-	uint32 GetBMODKTalkSfx(CPed *ped, int16 sound);
-	uint32 GetBMYCRTalkSfx(CPed *ped, int16 sound);
-	uint32 GetBFYSTTalkSfx(CPed *ped, int16 sound);
-	uint32 GetBFOSTTalkSfx(CPed *ped, int16 sound);
-	uint32 GetBMYSTTalkSfx(CPed *ped, int16 sound);
-	uint32 GetBMOSTTalkSfx(CPed *ped, int16 sound);
-	uint32 GetBFYRITalkSfx(CPed *ped, int16 sound);
-	uint32 GetBFORITalkSfx(CPed *ped, int16 sound);
-	uint32 GetBMYRITalkSfx(CPed *ped, int16 sound);
-	uint32 GetBFYBETalkSfx(CPed *ped, int16 sound);
-	uint32 GetBMYBETalkSfx(CPed *ped, int16 sound);
-	uint32 GetBFOBETalkSfx(CPed *ped, int16 sound);
-	uint32 GetBMOBETalkSfx(CPed *ped, int16 sound);
-	uint32 GetBMYBUTalkSfx(CPed *ped, int16 sound);
-	uint32 GetBFYPRTalkSfx(CPed *ped, int16 sound);
-	uint32 GetBFOTRTalkSfx(CPed *ped, int16 sound);
-	uint32 GetBMOTRTalkSfx(CPed *ped, int16 sound);
-	uint32 GetBMYPITalkSfx(CPed *ped, int16 sound);
-	uint32 GetBMYBBTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMYCRTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWFYSTTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWFOSTTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMYSTTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMOSTTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWFYRITalkSfx(CPed *ped, int16 sound);
-	uint32 GetWFORITalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMYRITalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMORITalkSfx(CPed *ped, int16 sound);
-	uint32 GetWFYBETalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMYBETalkSfx(CPed *ped, int16 sound);
-	uint32 GetWFOBETalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMOBETalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMYCWTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMYGOTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWFOGOTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMOGOTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWFYLGTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMYLGTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWFYBUTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMYBUTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMOBUTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWFYPRTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWFOTRTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMOTRTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMYPITalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMOCATalkSfx(CPed *ped, int16 sound);
-	uint32 GetWFYJGTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMYJGTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWFYSKTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWMYSKTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWFYSHTalkSfx(CPed *ped, int16 sound);
-	uint32 GetWFOSHTalkSfx(CPed *ped, int16 sound);
-	uint32 GetJFOTOTalkSfx(CPed *ped, int16 sound);
-	uint32 GetJMOTOTalkSfx(CPed *ped, int16 sound);
-	uint32 GetCBTalkSfx(CPed *ped, int16 sound);
-	uint32 GetHNTalkSfx(CPed *ped, int16 sound);
-	uint32 GetSGTalkSfx(CPed *ped, int16 sound);
-	uint32 GetCLTalkSfx(CPed *ped, int16 sound);
-	uint32 GetGDTalkSfx(CPed *ped, int16 sound);
-	uint32 GetBKTalkSfx(CPed *ped, int16 sound);
-	uint32 GetPGTalkSfx(CPed *ped, int16 sound);
-	uint32 GetVICETalkSfx(CPed *ped, int16 sound, int16 model);
-	uint32 GetWFYG1TalkSfx(CPed *ped, int16 sound);
-	uint32 GetWFYG2TalkSfx(CPed *ped, int16 sound);
+
+	// LCS: Do not delete, some of these are still used
+
+	//uint32 GetHFYSTTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHFOSTTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHMYSTTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHMOSTTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHFYRITalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHFORITalkSfx(CPed *ped, int16 sound); 
+	//uint32 GetHMYRITalkSfx(CPed *ped, int16 sound); 
+	//uint32 GetHMORITalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHFYBETalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHFOBETalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHMYBETalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHMOBETalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHFYBUTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHFYMDTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHFYCGTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHFYPRTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHFOTRTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHMOTRTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHMYAPTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHMOCATalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBMODKTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBMYCRTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBFYSTTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBFOSTTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBMYSTTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBMOSTTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBFYRITalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBFORITalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBMYRITalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBFYBETalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBMYBETalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBFOBETalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBMOBETalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBMYBUTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBFYPRTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBFOTRTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBMOTRTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBMYPITalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBMYBBTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMYCRTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWFYSTTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWFOSTTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMYSTTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMOSTTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWFYRITalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWFORITalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMYRITalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMORITalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWFYBETalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMYBETalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWFOBETalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMOBETalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMYCWTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMYGOTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWFOGOTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMOGOTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWFYLGTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMYLGTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWFYBUTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMYBUTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMOBUTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWFYPRTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWFOTRTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMOTRTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMYPITalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMOCATalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWFYJGTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMYJGTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWFYSKTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWMYSKTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWFYSHTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWFOSHTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetJFOTOTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetJMOTOTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetCBTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetHNTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetSGTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetCLTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetGDTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetBKTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetPGTalkSfx(CPed *ped, int16 sound);
+	//uint32 GetVICETalkSfx(CPed *ped, int16 sound, int16 model);
+	//uint32 GetWFYG1TalkSfx(CPed *ped, int16 sound);
+	//uint32 GetWFYG2TalkSfx(CPed *ped, int16 sound);
 
 	uint32 GetGenericMaleTalkSfx(CPed *ped, int16 sound);   // todo names (inlined in vc)
 	uint32 GetGenericFemaleTalkSfx(CPed *ped, int16 sound); // todo names (inlined in vc)
@@ -379,7 +384,7 @@ public:
 
 	void GenerateIntegerRandomNumberTable();                                                   // done
 	char *Get3DProviderName(uint8 id) const;                                                   // done
-	uint8 GetCDAudioDriveLetter() const;                                                       // done
+	char GetCDAudioDriveLetter() const;                                                       // done
 	int8 GetCurrent3DProviderIndex() const;                                                    // done
 	int8 AutoDetect3DProviders() const;                                                        // done
 	float GetCollisionLoopingRatio(uint32 a, uint32 b, float c) const;                         // not used
@@ -396,17 +401,17 @@ public:
 	                                    float velocityChange);                                                                        // done
 	float GetVehicleNonDriveWheelSkidValue(CVehicle *veh, tWheelState wheelState, cTransmission *transmission, float velocityChange); // done
 
-	bool HasAirBrakes(int32 model) const; // done
+	bool8 HasAirBrakes(int32 model) const; // done
 
 	void Initialise();                             // done
 	void InitialisePoliceRadio();                  // done
 	void InitialisePoliceRadioZones();             // done
 	void InterrogateAudioEntities();               // done (inlined)
-	bool IsAudioInitialised() const;               // done
-	bool IsMissionAudioSampleFinished(uint8 slot); // done
-	bool IsMP3RadioChannelAvailable() const;       // done
+	bool8 IsAudioInitialised() const;               // done
+	bool8 IsMissionAudioSampleFinished(uint8 slot); // done
+	bool8 IsMP3RadioChannelAvailable() const;       // done
 
-	bool MissionScriptAudioUsesPoliceChannel(int32 soundMission) const; //done
+	bool8 MissionScriptAudioUsesPoliceChannel(int32 soundMission) const; //done
 
 	void PlayLoadedMissionAudio(uint8 slot);                // done
 	void PlayOneShot(int32 index, uint16 sound, float vol); // done
@@ -420,20 +425,20 @@ public:
 	void PreTerminateGameSpecificShutdown();                // done
 	/// processX - main logic of adding new sounds
 	void ProcessActiveQueues();                              // done
-	bool ProcessAirBrakes(cVehicleParams& params);           // done
-	bool ProcessBoatEngine(cVehicleParams& params);          
-	bool ProcessBoatMovingOverWater(cVehicleParams& params); //done 
+	bool8 ProcessAirBrakes(cVehicleParams& params);           // done
+	bool8 ProcessBoatEngine(cVehicleParams& params);          
+	bool8 ProcessBoatMovingOverWater(cVehicleParams& params); //done 
 #ifdef GTA_BRIDGE
 	void ProcessBridge();         // done(bcs not exists in VC)
 	void ProcessBridgeMotor();    // done(bcs not exists in VC)
 	void ProcessBridgeOneShots(); // done(bcs not exists in VC)
 	void ProcessBridgeWarning();  // done(bcs not exists in VC)
 #endif
-	bool ProcessCarBombTick(cVehicleParams& params);                         // done
+	bool8 ProcessCarBombTick(cVehicleParams& params);                         // done
 	void ProcessCarHeli(cVehicleParams& params);                             // done
 	void ProcessCesna(cVehicleParams& params);                               // done
 	//void ProcessCrane();                                                   // done(bcs not exists in VC)
-	bool ProcessEngineDamage(cVehicleParams& params);                        // done
+	bool8 ProcessEngineDamage(cVehicleParams& params);                        // done
 	void ProcessEntity(int32 sound);                                         // done
 	void ProcessExplosions(int32 explosion);                                 // done
 	void ProcessFireHydrant();                                               // done
@@ -462,25 +467,25 @@ public:
 	void ProcessProjectiles();                                               // done
 	void ProcessRainOnVehicle(cVehicleParams& params);                       // done
 	void ProcessReverb() const;                                              // done
-	bool ProcessReverseGear(cVehicleParams& params);                         // done
+	bool8 ProcessReverseGear(cVehicleParams& params);                         // done
 	void ProcessScriptObject(int32 id);                                      // done
 	void ProcessSpecial();                                                   // done
 #ifdef GTA_TRAIN
-	bool ProcessTrainNoise(cVehicleParams &params); //done(bcs not exists in VC)
+	bool8 ProcessTrainNoise(cVehicleParams &params); //done(bcs not exists in VC)
 #endif
 	void ProcessVehicle(CVehicle *vehicle);                    // done
-	bool ProcessVehicleDoors(cVehicleParams &params);          // done
+	bool8 ProcessVehicleDoors(cVehicleParams &params);          // done
 	void ProcessVehicleEngine(cVehicleParams &params);         // done
 	void ProcessVehicleFlatTyre(cVehicleParams &params);       // done
-	bool ProcessVehicleHorn(cVehicleParams &params);           // done
+	bool8 ProcessVehicleHorn(cVehicleParams &params);           // done
 	void ProcessVehicleOneShots(cVehicleParams &params);       // done
-	bool ProcessVehicleReverseWarning(cVehicleParams &params); // done
-	bool ProcessVehicleRoadNoise(cVehicleParams &params);      // done
-	bool ProcessVehicleSirenOrAlarm(cVehicleParams &params);   // done
-	bool ProcessVehicleSkidding(cVehicleParams &params);       // done
+	bool8 ProcessVehicleReverseWarning(cVehicleParams &params); // done
+	bool8 ProcessVehicleRoadNoise(cVehicleParams &params);      // done
+	bool8 ProcessVehicleSirenOrAlarm(cVehicleParams &params);   // done
+	bool8 ProcessVehicleSkidding(cVehicleParams &params);       // done
 	void ProcessWaterCannon(int32);                            // done
 	void ProcessWeather(int32 id);                             // done
-	bool ProcessWetRoadNoise(cVehicleParams& params);          // done
+	bool8 ProcessWetRoadNoise(cVehicleParams& params);          // done
 	void ProcessEscalators();                                  // done
 	void ProcessExtraSounds();                                 // done
 
@@ -499,26 +504,26 @@ public:
 	void ServicePoliceRadioChannel(uint8 wantedLevel);                                          // done
 	void ServiceSoundEffects();                                                                 // done
 	int8 SetCurrent3DProvider(uint8 which);                                                     // done
-	void SetDynamicAcousticModelingStatus(uint8 status);                                        // done
+	void SetDynamicAcousticModelingStatus(bool8 status);                                        // done
 	void SetEffectsFadeVol(uint8 volume) const;                                                 // done
 	void SetEffectsMasterVolume(uint8 volume) const;                                            // done
 	void SetMP3BoostVolume(uint8 volume) const;                                                 // done
-	void SetEntityStatus(int32 id, uint8 status);                                               // done
+	void SetEntityStatus(int32 id, bool8 status);                                               // done
 	uint32 SetLoopingCollisionRequestedSfxFreqAndGetVol(const cAudioCollision &audioCollision); // done
 	void SetMissionAudioLocation(uint8 slot, float x, float y, float z);                        // done
 	void SetMissionScriptPoliceAudio(int32 sfx) const;                                          // inlined and optimized
-	void SetMonoMode(uint8 mono);                                                               // done
+	void SetMonoMode(bool8 mono);                                                               // done
 	void SetMusicFadeVol(uint8 volume) const;                                                   // done
 	void SetMusicMasterVolume(uint8 volume) const;                                              // done
 	void SetSpeakerConfig(int32 conf) const;                                                    // done
 	void SetUpLoopingCollisionSound(const cAudioCollision &col, uint8 counter);                 // done
 	void SetUpOneShotCollisionSound(const cAudioCollision &col);                                // done
-	bool SetupCrimeReport();                                                                    // done
-	bool SetupJumboEngineSound(uint8 vol, uint32 freq);                                         // done
-	bool SetupJumboFlySound(uint8 emittingVol);                                                 // done
-	bool SetupJumboRumbleSound(uint8 emittingVol);                                              // done
-	bool SetupJumboTaxiSound(uint8 vol);                                                        // done
-	bool SetupJumboWhineSound(uint8 emittingVol, uint32 freq);                                  // done
+	bool8 SetupCrimeReport();                                                                    // done
+	bool8 SetupJumboEngineSound(uint8 vol, uint32 freq);                                         // done
+	bool8 SetupJumboFlySound(uint8 emittingVol);                                                 // done
+	bool8 SetupJumboRumbleSound(uint8 emittingVol);                                              // done
+	bool8 SetupJumboTaxiSound(uint8 vol);                                                        // done
+	bool8 SetupJumboWhineSound(uint8 emittingVol, uint32 freq);                                  // done
 	void SetupPedComments(cPedParams &params, uint16 sound);                                    // done
 	void SetupSuspectLastSeenReport();
 
@@ -527,12 +532,12 @@ public:
 
 	void UpdateGasPedalAudio(CVehicle *veh, int vehType);  // done
 	void UpdateReflections();                              // done
-	bool UsesReverseWarning(int32 model) const;            // done
-	bool UsesSiren(cVehicleParams &params) const;          // done
-	bool UsesSirenSwitching(cVehicleParams &params) const; // done
+	bool8 UsesReverseWarning(int32 model) const;            // done
+	bool8 UsesSiren(cVehicleParams &params) const;          // done
+	bool8 UsesSirenSwitching(cVehicleParams &params) const; // done
 
 	CVehicle *FindVehicleOfPlayer();                   // done
-	void SetPedTalkingStatus(CPed *ped, uint8 status); // done
+	void SetPedTalkingStatus(CPed *ped, bool8 status); // done
 	void SetPlayersMood(uint8 mood, uint32 time);      // done
 
 	float Sqrt(float v) const { return v <= 0.0f ? 0.0f : ::Sqrt(v); }
@@ -544,8 +549,26 @@ public:
 #endif
 };
 
-//#ifdef AUDIO_MSS
+/*
+   Manual loop points are not on PS2 so let's have these macros to avoid massive ifndefs.
+   Setting these manually was pointless anyway since they never change from sdt values.
+   What were they thinking?
+*/
+#ifndef GTA_PS2
+#define RESET_LOOP_OFFSETS \
+	m_sQueueSample.m_nLoopStart = 0; \
+	m_sQueueSample.m_nLoopEnd = -1;
+#define SET_LOOP_OFFSETS(sample) \
+	m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(sample); \
+	m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(sample);
+#else
+#define RESET_LOOP_OFFSETS
+#define SET_LOOP_OFFSETS(sample)
+#endif
+
+//#if defined(AUDIO_MSS) && !defined(PS2_AUDIO_CHANNELS)
 //static_assert(sizeof(cAudioManager) == 0x5558, "cAudioManager: error");
 //#endif
 
+
 extern cAudioManager AudioManager;
diff --git a/src/audio/AudioSamples.h b/src/audio/AudioSamples.h
index 403ef684..15840dd3 100644
--- a/src/audio/AudioSamples.h
+++ b/src/audio/AudioSamples.h
@@ -4,398 +4,330 @@
 
 enum eSfxSample
 {
-	SFX_CAR_HORN_JEEP = 0,
+	SFX_AIR_BRAKES,
+	SFX_AK47_LEFT,
+	SFX_AK47_RELOAD,
+	SFX_AK47_RIGHT,
+	SFX_ALARM,
+	SFX_AMBULANCE_SI,
+	SFX_AMMU_AA,
+	SFX_AMMU_AB,
+	SFX_AMMU_AC,
+	SFX_ARM_BOMB,
+	SFX_A_10,
+	SFX_BAT_HIT_LEFT,
+	SFX_BAT_HIT_RIGHT,
+	SFX_BEEP,
+	SFX_BOAT_CRUISER_LOOP,
+	SFX_BOAT_SPLASH_1,
+	SFX_BOAT_SPLASH_2,
+	SFX_BOAT_V12_LOOP,
+	SFX_BOAT_WATER_LOOP,
+	SFX_BODY_LAND,
+	SFX_BODY_LAND_AND_FALL,
+	SFX_BOMB_BEEP,
+	SFX_BRIDGE_OPEN_WARNING,
+	SFX_BULLET_CAR_1,
+	SFX_BULLET_CAR_2,
+	SFX_BULLET_CAR_3,
+	SFX_BULLET_PASS_1,
+	SFX_BULLET_PASS_2,
+	SFX_BULLET_PED,
+	SFX_BULLET_SHELL_HIT_GROUND_1,
+	SFX_BULLET_SHELL_HIT_GROUND_2,
+	SFX_BULLET_WALL_1,
+	SFX_BULLET_WALL_2,
+	SFX_BULLET_WALL_3,
+	SFX_CAMERA,
+	SFX_CARDBOARD_BOX_SMASH,
+	SFX_CAR_HELI_FAR,
+	SFX_CAR_HELI_MAI,
+	SFX_CAR_HELI_MAI2,
+	SFX_CAR_HELI_REA,
+	SFX_CAR_HELI_ROL,
+	SFX_CAR_HELI_ROT,
+	SFX_CAR_HELI_STA,
+	SFX_CAR_HORN_56CHEV,
 	SFX_CAR_HORN_BMW328,
 	SFX_CAR_HORN_BUS,
 	SFX_CAR_HORN_BUS2,
-	SFX_CAR_HORN_56CHEV,
+	SFX_CAR_HORN_JEEP,
 	SFX_CAR_HORN_PICKUP,
 	SFX_CAR_HORN_PORSCHE,
 	SFX_CAR_HORN_TRUCK,
-
-	SFX_CAR_HELI_MAI,  // 8
-	SFX_CAR_HELI_MAI2, // 9
-	SFX_CAR_HELI_REA,  // 10
-	SFX_CAR_HELI_STA,  // 11
-	SFX_CAR_HELI_ROT,  // 12
-	SFX_CAR_HELI_FAR,  // 13
-	SFX_CAR_HELI_ROL,  // 14
-
-	SFX_OLD_CAR_DOOR_OPEN,
-	SFX_OLD_CAR_DOOR_CLOSE,
-	SFX_NEW_CAR_DOOR_OPEN,
-	SFX_NEW_CAR_DOOR_CLOSE,
-	SFX_TRUCK_DOOR_OPEN,
-	SFX_TRUCK_DOOR_CLOSE,
-	SFX_REVERSE_GEAR,
-	SFX_REVERSE_GEAR_2,
-	SFX_CAR_STARTER, // 23
-	SFX_ROAD_NOISE,  // 24
-	SFX_SKID,        // 25
-	SFX_GRAVEL_SKID, // 26
-	SFX_POLICE_SIREN_SLOW,
-	SFX_SIREN_FAST, // 28
-	SFX_AMBULANCE_SIREN_SLOW,
-	SFX_REVERSE_WARNING,
-	SFX_ICE_CREAM_TUNE,
-	SFX_AIR_BRAKES,    // 32
-	SFX_TYRE_BUMP,     // 33
-	SFX_TYRE_BURST_B,  // 34
-	SFX_TYRE_BURST,    // 35
-	SFX_TYRE_BURST_L,  // 36
-	SFX_PALM_TREE_LO,  // 37
-	SFX_BULLET_PASS_1, // 38
-	SFX_BULLET_PASS_2, // 39
-	SFX_SKATE_1,       // 40
-	SFX_SKATE_2,       // 41
-	SFX_FOOTSTEP_CONCRETE_1,
-	SFX_FOOTSTEP_CONCRETE_2,
-	SFX_FOOTSTEP_CONCRETE_3,
-	SFX_FOOTSTEP_CONCRETE_4,
-	SFX_FOOTSTEP_CONCRETE_5,
-	SFX_EXPLOSION_1,              // 47
-	SFX_EXPLOSION_2,              // 48
-	SFX_EXPLOSION_3,              // 49
-	SFX_COLT45_LEFT,              // 50
-	SFX_COLT45_RIGHT,             // 51
-	SFX_AK47_LEFT,                // 52
-	SFX_AK47_RIGHT,               // 53
-	SFX_UZI_LEFT,                 // 54
-	SFX_UZI_RIGHT,                // 55
-	SFX_UZI_END_LEFT,             // 56
-	SFX_SNIPER_LEFT,              // 57
-	SFX_SNIPER_RIGHT,             // 58
-	SFX_ROCKET_LEFT,              // 59
-	SFX_ROCKET_RIGHT,             // 60
-	SFX_ROCKET_FLY,               // 61
-	SFX_FLAMETHROWER_LEFT,        // 62
-	SFX_FLAMETHROWER_RIGHT,       // 63
-	SFX_FLAMETHROWER_START_LEFT,  // 64
-	SFX_FLAMETHROWER_START_RIGHT, // 65
-	SFX_SHOTGUN_LEFT,             // 66
-	SFX_SHOTGUN_RIGH,             // 67
-	SFX_M60_LEFT,                 // 68
-	SFX_M60_RIGHT,                // 69
-	SFX_M60_TAIL_LEFT,            // 70
-	SFX_TEC_LEFT,                 // 71
-	SFX_TEC_RIGHT,                // 72
-	SFX_TEC_TAIL,                 // 73
-	SFX_RUGER_LEFT,               // 74
-	SFX_RUGER_RIGHT,              // 75
-	SFX_RUGER_TAIL,               // 76
-	SFX_PISTOL_RELOAD,            // 77
-	SFX_AK47_RELOAD,              // 78
-	SFX_ROCKET_RELOAD,            // 79
-	SFX_RIFLE_RELOAD,             // 80
-	SFX_GOLF_CLUB_SWING,          // 81
-	SFX_MINIGUN_FIRE_LEFT,        // 82
-	SFX_MINIGUN_FIRE_RIGHT,       // 83
-	SFX_MINIGUN_STOP,             // 84
-	SFX_SPAS12_LEFT,              // 85
-	SFX_SPAS12_RIGHT,             // 86
-	SFX_SPAS12_TAIL_LEFT,         // 87
-	SFX_PYTHON_LEFT,              // 88
-	SFX_PYTHON_RIGHT,             // 89
-	SFX_MP5_LEFT,                 // 90
-	SFX_MP5_RIGHT,                // 91
-	SFX_COL_TARMAC_1,             // 92
-	SFX_COL_TARMAC_2,             // 93
-	SFX_COL_TARMAC_3,             // 94
-	SFX_COL_TARMAC_4,             // 95
-	SFX_COL_TARMAC_5,             // 96
-	SFX_COL_GRASS_1,
-	SFX_COL_GRAVEL_1,
-	SFX_COL_MUD_1,
-	SFX_COL_GARAGE_DOOR_1,
+	SFX_CAR_IDLE_CADI,
+	SFX_CAR_IDLE_COBRA,
+	SFX_CAR_IDLE_GOLFCART,
+	SFX_CAR_IDLE_HONDA,
+	SFX_CAR_IDLE_HOTROD,
+	SFX_CAR_IDLE_MERC,
+	SFX_CAR_IDLE_PACARD,
+	SFX_CAR_IDLE_PATHFINDER,
+	SFX_CAR_IDLE_PONT,
+	SFX_CAR_IDLE_PONT2,
+	SFX_CAR_IDLE_PORSHE,
+	SFX_CAR_IDLE_SPIDER,
+	SFX_CAR_IDLE_SPORTCAR,
+	SFX_CAR_IDLE_TRUCK,
+	SFX_CAR_IDLE_UNUSED1,
+	SFX_CAR_IDLE_UNUSED2,
+	SFX_CAR_IDLE_UNUSED3,
+	SFX_CAR_IDLE_UNUSED4,
+	SFX_CAR_IDLE_VTWI,
+	SFXNEWCARDOOR,
+	SFX_CAR_ON_FIRE,
+	SFX_CAR_RAIN_1,
+	SFX_CAR_RAIN_2,
+	SFX_CAR_RAIN_3,
+	SFX_CAR_RAIN_4,
+	SFX_CAR_REV_CADI,
+	SFX_CAR_REV_COBRA,
+	SFX_CAR_REV_GOLFCART,
+	SFX_CAR_REV_HONDA,
+	SFX_CAR_REV_HOTROD,
+	SFX_CAR_REV_MERC,
+	SFX_CAR_REV_PACARD,
+	SFX_CAR_REV_PATHFINDER,
+	SFX_CAR_REV_PONT,
+	SFX_CAR_REV_PONT2,
+	SFX_CAR_REV_PORSHE,
+	SFX_CAR_REV_SPIDER,
+	SFX_CAR_REV_SPORTCAR,
+	SFX_CAR_REV_TRUCK,
+	SFX_CAR_REV_UNUSED1,
+	SFX_CAR_REV_UNUSED2,
+	SFX_CAR_REV_UNUSED3,
+	SFX_CAR_REV_UNUSED4,
+	SFX_CAR_REV_VTWI,
+	SFX_CAR_STARTER,
+	SFX_CENTRAL,
+	SFX_CESNA_IDLE,
+	SFX_CESNA_REV,
+	SFX_COLT45_LEFT,
+	SFX_COLT45_RIGHT,
+	SFX_COL_CARDBOARD_1,
+	SFX_COL_CARDBOARD_2,
+	SFX_COL_CAR_1,
+	SFX_COL_CAR_2,
+	SFX_COL_CAR_3,
+	SFX_COL_CAR_4,
+	SFX_COL_CAR_5,
 	SFX_COL_CAR_PANEL_1,
 	SFX_COL_CAR_PANEL_2,
 	SFX_COL_CAR_PANEL_3,
 	SFX_COL_CAR_PANEL_4,
 	SFX_COL_CAR_PANEL_5,
 	SFX_COL_CAR_PANEL_6,
-	SFX_COL_THICK_METAL_PLATE_1,
-	SFX_COL_SCAFFOLD_POLE_1,
-	SFX_COL_LAMP_POST_1,
+	SFX_COL_CONTAINER_1,
+	SFX_COL_GARAGE_DOOR_1,
+	SFX_COL_GATE,
+	SFX_COL_GRASS_1,
+	SFX_COL_GRAVEL_1,
 	SFX_COL_HYDRANT_1,
+	SFX_COL_LAMP_POST_1,
 	SFX_COL_METAL_CHAIN_FENCE_1,
 	SFX_COL_METAL_CHAIN_FENCE_2,
 	SFX_COL_METAL_CHAIN_FENCE_3,
 	SFX_COL_METAL_CHAIN_FENCE_4,
-	SFX_COL_PED_1, // 115
-	SFX_COL_PED_2, // 116
+	SFX_COL_MUD_1,
+	SFX_COL_NEWS_VENDOR_1,
+	SFX_COL_NEWS_VENDOR_2,
+	SFX_COL_NEWS_VENDOR_3,
+	SFX_COL_PED_1,
+	SFX_COL_PED_2,
 	SFX_COL_SAND_1,
-	SFX_COL_WOOD_CRATES_1,
-	SFX_COL_WOOD_CRATES_2,
-	SFX_COL_WOOD_CRATES_3,
-	SFX_COL_WOOD_CRATES_4,
+	SFX_COL_SCAFFOLD_POLE_1,
+	SFX_COL_TARMAC_1,
+	SFX_COL_TARMAC_2,
+	SFX_COL_TARMAC_3,
+	SFX_COL_TARMAC_4,
+	SFX_COL_TARMAC_5,
+	SFX_COL_THICK_METAL_PLATE_1,
+	SFX_COL_VEG_1,
+	SFX_COL_VEG_2,
+	SFX_COL_VEG_3,
+	SFX_COL_VEG_4,
+	SFX_COL_VEG_5,
 	SFX_COL_WOOD_BENCH_1,
 	SFX_COL_WOOD_BENCH_2,
 	SFX_COL_WOOD_BENCH_3,
 	SFX_COL_WOOD_BENCH_4,
+	SFX_COL_WOOD_CRATES_1,
+	SFX_COL_WOOD_CRATES_2,
+	SFX_COL_WOOD_CRATES_3,
+	SFX_COL_WOOD_CRATES_4,
 	SFX_COL_WOOD_SOLID_1,
-	SFX_COL_VEG_1, // 127
-	SFX_COL_VEG_2, // 128
-	SFX_COL_VEG_3, // 129
-	SFX_COL_VEG_4, // 130
-	SFX_COL_VEG_5, // 131
-	SFX_COL_CONTAINER_1,
-	SFX_COL_NEWS_VENDOR_1,
-	SFX_COL_NEWS_VENDOR_2,
-	SFX_COL_NEWS_VENDOR_3,
-	SFX_COL_CAR_1, // 136
-	SFX_COL_CAR_2, // 137
-	SFX_COL_CAR_3, // 138
-	SFX_COL_CAR_4, // 139
-	SFX_COL_CAR_5, // 140
-	SFX_COL_CARDBOARD_1,
-	SFX_COL_CARDBOARD_2,
-	SFX_COL_GATE,     // 143
-	SFX_SCRAPE_CAR_1, // 144
+	SFX_COUNTDOWN,
 	SFX_CRATE_SMASH,
-	SFX_GLASS_CRACK, // 146
-	SFX_GLASS_SMASH, // 147
+	SFX_C_OR_D_UNK_1,
+	SFX_C_OR_D_UNK_2,
+	SFX_C_OR_D_UNK_3,
+	SFX_C_OR_D_UNK_4,
+	SFX_C_OR_D_UNK_5,
+	SFX_C_OR_D_UNK_6,
+	SFX_DOCK_BA,
+	SFX_DOCK_BB,
+	SFX_EAST,
+	SFX_ERROR_FIRE_RIFLE,
+	SFX_ERROR_FIRE_ROCKET_LAUNCHER,
+	SFX_EXPLOSION_1,
+	SFX_EXPLOSION_2,
+	SFX_EXPLOSION_3,
+	SFX_FIGHT_1,
+	SFX_FIGHT_2,
+	SFX_FIGHT_4,
+	SFX_FIGHT_5,
+	SFX_FISHING_BOAT_IDLE,
+	SFX_FLAMETHROWER_LEFT,
+	SFX_FLAMETHROWER_RIGHT,
+	SFX_FLAMETHROWER_START_LEFT,
+	SFX_FLAMETHROWER_START_RIGHT,
+	SFX_FOOTSTEP_CONCRETE_1,
+	SFX_FOOTSTEP_CONCRETE_2,
+	SFX_FOOTSTEP_CONCRETE_3,
+	SFX_FOOTSTEP_CONCRETE_4,
+	SFX_FOOTSTEP_CONCRETE_5,
+	SFX_GARAGE_DOOR_LOOP,
+	SFX_GATE_START_CLU,
+	SFX_GATE_STOP_CLU,
+	SFX_GLASS_CRACK,
 	SFX_GLASS_SHARD_1,
 	SFX_GLASS_SHARD_2,
 	SFX_GLASS_SHARD_3,
 	SFX_GLASS_SHARD_4,
-	SFX_PED_ON_FIRE,  // 152
-	SFX_CAR_ON_FIRE,  // 153
-	SFX_RAIN,         // 154
-	SFX_HURRICANE_MA, // 155
-	SFX_BULLET_SHELL_HIT_GROUND_1,
-	SFX_BULLET_SHELL_HIT_GROUND_2,
-	SFX_BULLET_PED,           // 158
-	SFX_BULLET_CAR_1,         // 159
-	SFX_BULLET_CAR_2,         // 160
-	SFX_BULLET_CAR_3,         // 161
-	SFX_BULLET_WALL_1,        // 162
-	SFX_BULLET_WALL_2,        // 163
-	SFX_BULLET_WALL_3,        // 164
-	SFX_BAT_HIT_LEFT,         // 165
-	SFX_BAT_HIT_RIGH,         // 166
-	SFX_FIGHT_1,              // 167
-	SFX_FIGHT_2,              // 168
-	SFX_FIGHT_4,              // 169
-	SFX_FIGHT_5,              // 170
-	SFX_KNIFE_SWING,          // 171
-	SFX_KNIFE_SLASH,          // 172
-	SFX_KNIFE_STAB,           // 173
-	SFX_HAMMER_HIT_1,         // 174
-	SFX_HAMMER_HIT_2,         // 175
-	SFX_GARAGE_DOOR_LOOP,     // 176
-	SFX_COUNTDOWN,            // 177
-	SFX_ARM_BOMB,             // 178
-	SFX_POLICE_RADIO_CRACKLE, // 179
-
-	SFX_WEVE_GOT,
-	SFX_THERES,
-	SFX_RESPOND_TO,
-	SFX_A_10,
+	SFX_GLASS_SMASH,
+	SFX_GOLF_CLUB_SWING,
+	SFX_GO_CENTRE,
+	SFX_GO_LEFT,
+	SFX_GO_RIGHT,
+	SFX_GRAVEL_SKID,
+	SFX_HAMMER_HIT_1,
+	SFX_HAMMER_HIT_2,
+	SFX_HELI_1,
+	SFX_HIT_BALL,
+	SFX_HOSE,
+	SFX_H_UNK, // SFX_CAR_REV_UNUS
+	SFX_ICE_CREAM_TUNE,
 	SFX_IN,
-	SFX_NORTH,
-	SFX_EAST,
-	SFX_SOUTH,
-	SFX_WEST,
-	SFX_CENTRAL,
-	SFX_POLICE_RADIO_MESSAGE_NOISE_1,
-	SFX_POLICE_RADIO_SUSPECT,
-	SFX_POLICE_RADIO_LAST_SEEN,
-	SFX_POLICE_RADIO_ON_FOOT,
-	SFX_POLICE_RADIO_IN_A,
-	SFX_POLICE_RADIO_DARK,
-	SFX_POLICE_RADIO_LIGHT,
-	SFX_POLICE_RADIO_BRIGHT,
-
-	SFX_CRIME_1,
-	SFX_CRIME_2,
-	SFX_CRIME_3,
-	SFX_CRIME_4,
-	SFX_CRIME_5,
-	SFX_CRIME_6,
-	SFX_CRIME_7,
-	SFX_CRIME_8,
-	SFX_CRIME_9,
-	SFX_CRIME_10,
-	SFX_CRIME_11,
-	SFX_CRIME_12,
-	SFX_POLICE_RADIO_VICE_CITY,
-	SFX_POLICE_RADIO_VICE_CITY_BEACH,
-	SFX_POLICE_RADIO_VICE_CITY_MAINLAND,
-	SFX_POLICE_RADIO_OCEAN_BEACH, //???
-	SFX_POLICE_RADIO_WASHINGTON_BEACH,
-	SFX_POLICE_RADIO_VICE_POINT,
-	SFX_POLICE_RADIO_LEAF_LINKS,
-	SFX_POLICE_RADIO_STRAFISH_ISLAND, //???????????
-	SFX_POLICE_RADIO_VICE_PORT,
-	SFX_POLICE_RADIO_LITTLE_HAVANA,
-	SFX_POLICE_RADIO_LITTLE_HAITI,
-	SFX_POLICE_RADIO_PRAWN_ISLAND, //??????????? IS THAT HOW SHE PRONOUNCES ISLAND?
-	SFX_POLICE_RADIO_DOWNTOWN,
-	SFX_POLICE_RADIO_ESCOBAR_INTERNATIONAL,
-	SFX_POLICE_RADIO_BLACK,
-	SFX_POLICE_RADIO_WHITE,
-	SFX_POLICE_RADIO_BLUE,
-	SFX_POLICE_RADIO_RED,
-	SFX_POLICE_RADIO_PURPLE,
-	SFX_POLICE_RADIO_YELLOW,
-	SFX_POLICE_RADIO_GREY,
-	SFX_POLICE_RADIO_ORANGE,
-	SFX_POLICE_RADIO_GREEN,
-	SFX_POLICE_RADIO_SILVER,
-	SFX_POLICE_RADIO_AMBULANCE,
-	SFX_POLICE_RADIO_2_DOOR,
-	SFX_POLICE_RADIO_TRUCK,
-	SFX_POLICE_RADIO_FIRE_TRUCK,
-	SFX_POLICE_RADIO_PICKUP,
-	SFX_POLICE_RADIO_POLICE_CAR,
-	SFX_POLICE_RADIO_BOAT,
-	SFX_POLICE_RADIO_BUGGY,
-	SFX_POLICE_RADIO_BUS,
-	SFX_POLICE_RADIO_COACH,
-	SFX_POLICE_RADIO_CRUISER,
-	SFX_POLICE_RADIO_DINGHY,
-	SFX_POLICE_RADIO_GARBAGE_TRUCK,
-	SFX_POLICE_RADIO_GOLF_CART,
-	SFX_POLICE_RADIO_HEARSE,
-	SFX_POLICE_RADIO_HELICOPTER,
-	SFX_POLICE_RADIO_ICE_CREAM_VAN,
-	SFX_POLICE_RADIO_LOWRIDER,
-	SFX_POLICE_RADIO_MOPED,
-	SFX_POLICE_RADIO_MOTOBIKE,
-	SFX_POLICE_RADIO_OFFROAD,
-	SFX_POLICE_RADIO_PLANE,
-	SFX_POLICE_RADIO_RIG,
-	SFX_POLICE_RADIO_SEDAN,
-	SFX_POLICE_RADIO_SPEEDBOAT,
-	SFX_POLICE_RADIO_SPORTS_CAR,
-	SFX_POLICE_RADIO_STATION_WAGON,
-	SFX_POLICE_RADIO_STRETCH,
-	SFX_POLICE_RADIO_SWAT_VAN,
-	SFX_POLICE_RADIO_TANK,
-	SFX_POLICE_RADIO_TAXI,
-	SFX_POLICE_RADIO_VAN,
-
-	SFX_HELI_1,      // 198
-	SFX_PHONE_RING,  // 199
-	SFX_CAR_REV_1,   // PONT
-	SFX_CAR_REV_2,   // PORSHE
-	SFX_CAR_REV_3,   // SPIDER
-	SFX_CAR_REV_4,   // MERC
-	SFX_CAR_REV_5,   // TRUC
-	SFX_CAR_REV_6,   // HOTROD
-	SFX_CAR_REV_7,   // COBRA
-	SFX_CAR_REV_8,   // PONT2
-	SFX_CAR_REV_9,   // CADI
-	SFX_CAR_REV_10,  // PATHFINDER
-	SFX_CAR_REV_11,  // PACARD
-	SFX_CAR_REV_12,  // GOLFCART
-	SFX_CAR_REV_13,  // SFX_CAR_IDLE_GOL
-	SFX_CAR_REV_14,  // SFX_CAR_IDLE_GOL
-	SFX_CAR_REV_15,  // SFX_CAR_IDLE_GOL
-	SFX_CAR_REV_16,  // SFX_CAR_IDLE_GOL
-	SFX_CAR_REV_17,  // VTWI
-	SFX_MOPED_REV,   // just moped
-	SFX_CAR_REV_19,  // HOND(A)
-	SFX_CAR_REV_20,  // SPOR(TCAR)
-	SFX_CAR_IDLE_1,  // PONT
-	SFX_CAR_IDLE_2,  // PORSHE
-	SFX_CAR_IDLE_3,  // SPIDER
-	SFX_CAR_IDLE_4,  // MERC
-	SFX_CAR_IDLE_5,  // TRUC
-	SFX_CAR_IDLE_6,  // HOTROD
-	SFX_CAR_IDLE_7,  // COBRA
-	SFX_CAR_IDLE_8,  // PONT2
-	SFX_CAR_IDLE_9,  // CADI
-	SFX_CAR_IDLE_10, // PATHFINDER
-	SFX_CAR_IDLE_11, // PACARD
-	SFX_CAR_IDLE_12, // GOLFCART
-	SFX_CAR_IDLE_13, // SFX_CAR_IDLE_GOL
-	SFX_CAR_IDLE_14, // SFX_CAR_IDLE_GOL
-	SFX_CAR_IDLE_15, // SFX_CAR_IDLE_GOL
-	SFX_CAR_IDLE_16, // SFX_CAR_IDLE_GOL
-	SFX_CAR_IDLE_17, // VTWI
-	SFX_MOPED_IDLE,  // 237
-	SFX_CAR_IDLE_19, // HOND(A)
-	SFX_CAR_IDLE_20, // SPOR(TCAR)
+	SFX_FE_INFO_LEFT,
+	SFX_FE_INFO_RIGHT,
 	SFX_JUMBO_DIST_FLY,
-	SFX_JUMBO_TAXI,   // 241
-	SFX_JUMBO_WHINE,  // 242
-	SFX_JUMBO_ENGINE, // 243
-	SFX_JUMBO_RUMBLE, // 244
+	SFX_JUMBO_ENGINE,
 	SFX_JUMBO_LAND_WHEELS,
-	SFX_BOAT_CRUISER_LOOP, // 246
-	SFX_BOAT_V12_LOOP,     // 247
-	SFX_BOAT_WATER_LOOP,
-	SFX_BOAT_SPLASH_1,
-	SFX_BOAT_SPLASH_2,
-	SFX_FISHING_BOAT_IDLE,
-	SFX_CAR_RAIN_1,   // 252
-	SFX_CAR_RAIN_2,   // 253
-	SFX_CAR_RAIN_3,   // 254
-	SFX_CAR_RAIN_4,   // 255
-	SFX_SPLASH_1,     // 256
-	SFX_PED_CRUNCH_1, // 257
-	SFX_PED_CRUNCH_2, // 258
-	SFX_WOODEN_BOX_SMASH,
-	SFX_CARDBOARD_BOX_SMASH,
-	SFX_ERROR_FIRE_ROCKET_LAUNCHER,
-	SFX_ERROR_FIRE_RIFLE,
-	SFX_TANK_TURRET, // 263
-	SFX_BODY_LAND_AND_FALL,
-	SFX_BODY_LAND,  // 265
-	SFX_BOMB_BEEP,  // 266
-	SFX_TIMER_BEEP, // 267
+	SFX_JUMBO_RUMBLE,
+	SFX_JUMBO_TAXI,
+	SFX_JUMBO_WHINE,
+	SFX_KNIFE_SLASH,
+	SFX_KNIFE_STAB,
+	SFX_KNIFE_SWING,
+	SFX_M60_LEFT,
+	SFX_M60_RIGHT,
+	SFX_MINIGUN_FIRE_LEFT,
+	SFX_MINIGUN_FIRE_RIGHT,
+	SFX_MINIGUN_STOP,
+	SFX_MONEY_LEFT,
+	SFX_MONEY_RIGHT,
+	SFX_MOPED_IDLE,
+	SFX_MOPED_REV,
+	SFX_MP5_LEFT,
+	SFX_MP5_RIGHT,
+	SFX_NEW_CAR_DOOR_CLOSE,
+	SFX_NEW_CAR_DOOR_OPEN,
+	SFX_NORTH, // cut
+	SFX_OLD_CAR_DOOR_CLOSE,
+	SFX_OLD_CAR_DOOR_OPEN,
+	SFX_PALM_TREE_LO,
+	SFX_PART_MISSION_COMPLETE_LEFT,
+	SFX_PART_MISSION_COMPLETE_RIGHT,
+	SFX_PART_MISSION_COMPLETE_CENTRE,
+	SFX_PAY_PHONE,
+	SFX_PED_CRUNCH_1,
+	SFX_PED_CRUNCH_2,
+	SFX_PED_ON_FIRE,
+	SFX_PISTOL_RELOAD,
+	SFX_PIZZA_THROW, // Throwpizza
+	SFX_POLICE_RADIO_BRIGHT,
+	SFX_POLICE_RADIO_CRACKLE, // 179
+	SFX_POLICE_RADIO_DARK,
+	SFX_POLICE_RADIO_IN_A,
+	SFX_POLICE_RADIO_LAST_SEEN,
+	SFX_POLICE_RADIO_LIGHT,
+	SFX_POLICE_RADIO_MESSAGE_NOISE_1,
+	SFX_POLICE_RADIO_ON_FOOT,
+	SFX_POLICE_RADIO_SUSPECT,
+	SFX_POLICE_SIREN_SLOW,
+	SFX_PYTHON_LEFT,
+	SFX_PYTHON_RIGHT,
+	SFX_RADIO_CLICK,
+	SFX_RADIO_DIAL_1,
+	SFX_RADIO_DIAL_2,
+	SFX_RADIO_DIAL_3,
+	SFX_RAIN,
+	SFX_RESPOND_TO, // cut
+	SFX_REVERSE_GEAR,
+	SFX_REVERSE_GEAR_2,
+	SFX_REVERSE_WARNING,
+	SFX_RIFLE_RELOAD,
+	SFX_ROAD_NOISE,
+	SFX_ROCKET_FLY,
+	SFX_ROCKET_LEFT,
+	SFX_ROCKET_RELOAD,
+	SFX_ROCKET_RIGHT,
+	SFX_RUGER_LEFT,
+	SFX_RUGER_RIGHT,
+	SFX_RUGER_TAIL,
+	SFX_R_OR_S_UNK1,
+	SFX_SCRAPE_CAR_1,
+	SFX_SHAG_SUSPENSION,
+	SFX_SHOTGUN_LEFT,
+	SFX_SHOTGUN_RIGHT,
+	SFX_SIREN_FAST,
+	SFX_SKATE_1, // cut
+	SFX_SKATE_2, // cut
+	SFX_SKID,
+	SFX_SNIPER_LEFT,
+	SFX_SNIPER_RIGHT,
+	SFX_SOUTH,  // cut
+	SFX_SPAS12_LEFT,
+	SFX_SPAS12_RIGHT,
+	SFX_SPAS12_TAIL_LEFT,
+	SFX_SPLASH_1,
 	SFX_SUSPENSION_FAST_MOVE,
 	SFX_SUSPENSION_SLOW_MOVE_LOOP,
-	SFX_SHAG_SUSPENSION,
-	SFX_HIT_BALL,     // 271
-	SFX_ARCADE,       // 272
-	SFX_CESNA_IDLE,   // 273
-	SFX_CESNA_REV,    // 274
-	SFX_RADIO_CLICK,  // 275
-	SFX_RADIO_DIAL_1, // 276
-	SFX_RADIO_DIAL_2, // 277
-	SFX_RADIO_DIAL_3, // 278
-
-	// pc only
-	SFX_RADIO_DIAL_4,
-	SFX_RADIO_DIAL_5,
-	SFX_RADIO_DIAL_6,
-	SFX_RADIO_DIAL_7,
-	SFX_RADIO_DIAL_8,
-	SFX_RADIO_DIAL_9,
-	SFX_RADIO_DIAL_10,
-	SFX_RADIO_DIAL_11,
-	SFX_RADIO_DIAL_12,
-
-	SFX_INFO_LEFT,                    // 279
-	SFX_INFO_RIGHT,                   // 280
-	SFX_INFO_CENTRE,                  // 281
-	SFX_MONEY_LEFT,                   // 282
-	SFX_MONEY_RIGHT,                  // 283
-	SFX_WEAPON_LEFT,                  // 284
-	SFX_WEAPON_RIGHT,                 // 285
-	SFX_WEAPON_CENTRE,                // 286
-	SFX_PART_MISSION_COMPLETE_LEFT,   // 287
-	SFX_PART_MISSION_COMPLETE_RIGHT,  // 288
-	SFX_PART_MISSION_COMPLETE_CENTRE, // 289
-	SFX_GO_LEFT,                      // 290
-	SFX_GO_RIGHT,                     // 291
-	SFX_GO_CENTRE,                    // 292
-	SFX_TIMER,                        // 293
-	SFX_EMPTY,                        // 294
-
-	SFX_FE_HIGHLIGHT_LEFT,  //
-	SFX_FE_HIGHLIGHT_RIGHT, //
-	SFX_FE_SELECT_LEFT,     //
-	SFX_FE_SELECT_RIGHT,    //
-	SFX_FE_BACK_LEFT,       //
-	SFX_FE_BACK_RIGHT,      //
-	SFX_FE_ERROR_LEFT,      //
-	SFX_FE_ERROR_RIGHT,     //
+	SFX_TANK_TURRET,
+	SFX_TEC_LEFT,
+	SFX_TEC_RIGHT,
+	SFX_TEC_TAIL,
+	SFX_THERES, // cut
+	SFX_TIMER,
+	SFX_TIMER_BEEP,
+	SFX_TRAIN, // trainloop
+	SFX_TRUCK_DOOR_CLOSE,
+	SFX_TRUCK_DOOR_OPEN,
+	SFX_TYRE_BUMP,
+	SFX_TYRE_BURST,
+	SFX_TYRE_BURST_B,
+	SFX_TYRE_BURST_L,
+	SFX_UZI_END_LEFT,
+	SFX_UZI_LEFT,
+	SFX_UZI_RIGHT,
+	SFX_WEAPON_CENTRE,
+	SFX_WEAPON_LEFT,
+	SFX_WEAPON_RIGHT,
+	SFX_WEST, // cut
+	SFX_WEVE_GOT, // cut
+	SFX_WOODEN_BOX_SMASH,
+
+	SFX_EMPTY,
+
+	SFX_FE_BACK,
+	SFX_FE_ERROR_LEFT,
+	SFX_FE_ERROR_RIGHT,
+	SFX_FE_HIGHLIGHT,
 	SFX_FE_NOISE_BURST_1,
 	SFX_FE_NOISE_BURST_2,
 	SFX_FE_NOISE_BURST_3,
+	SFX_FE_SELECT,
 
 	SFX_CAR_ACCEL_1,
 	SFX_CAR_AFTER_ACCEL_1,
@@ -446,24 +378,21 @@ enum eSfxSample
 	SFX_CAR_FINGER_OFF_ACCEL_12,
 
 	// some CHAINSAW STUFF
-	// SFX_CAR_CHAINSAW, //10973
-	// SFX_CAR_CHAINSAW, //10974
-	// SFX_CAR_CHAINSAW, //10975
-	SFX_CAR_ACCEL_13,
-	SFX_CAR_AFTER_ACCEL_13,
-	SFX_CAR_FINGER_OFF_ACCEL_13,
+	SFX_CAR_CHAINSAW_IDLE,
+	SFX_CAR_CHAINSAW_ATTACK,
+	SFX_CAR_CHAINSAW_EMPTY, // unused
 
-	SFX_RC_IDLE,  // 10976
-	SFX_RC_REV,   // 10977
-	SFX_RC_EMPTY, // 10978
+	SFX_RC_IDLE,
+	SFX_RC_REV,
+	SFX_RC_EMPTY,
 
-	SFX_CAR_RC_HELI,             // 10979
-	SFX_CAR_AFTER_ACCEL_15,      // empty
-	SFX_CAR_FINGER_OFF_ACCEL_15, // empty
+	SFX_CAR_RC_HELI,
+	SFX_CAR_AFTER_ACCEL_15,
+	// SFX_CAR_FINGER_OFF_ACCEL_15,
 
-	SFX_CAR_ACCEL_16,            // empty
-	SFX_CAR_AFTER_ACCEL_16,      // empty
-	SFX_CAR_FINGER_OFF_ACCEL_16, // empty
+	SFX_CAR_ACCEL_16,
+	// SFX_CAR_AFTER_ACCEL_16,
+	// SFX_CAR_FINGER_OFF_ACCEL_16,
 
 	// bike stuff apparently
 	SFX_CAR_ACCEL_17,
@@ -505,12 +434,12 @@ enum eSfxSample
 	SFX_HELI_UNUSED_3,
 	SFX_HELI_UNUSED_4,
 
-	SFX_SEAPLANE_PRO1, // 11018
-	SFX_SEAPLANE_PRO2, // 11019
-	SFX_SEAPLANE_PRO3, // 11020
-	SFX_SEAPLANE_PRO4, // 11021
 	// low fuel
-	SFX_SEAPLANE_LOW, // 11022
+	SFX_SEAPLANE_LOW,
+	SFX_SEAPLANE_PRO1,
+	SFX_SEAPLANE_PRO2,
+	SFX_SEAPLANE_PRO3,
+	SFX_SEAPLANE_PRO4,
 
 	// something padded for more plane?
 	SFX_PLANE_UNUSED_1,
@@ -519,32 +448,32 @@ enum eSfxSample
 	SFX_PLANE_UNUSED_4,
 
 	// script objects
-	SFX_BUILDINGS_BANK_ALARM, // 11027
-	SFX_BUILDING_SNORE,       // 11028
-	SFX_BUILDING_BAR_1,       // 11029
-	SFX_BUILDING_BAR_2,       // 11030
-	SFX_BUILDING_BAR_3,       // 11031
-	SFX_BUILDING_BAR_4,       // 11032
-	SFX_BUILDING_MAL1,        // 11033
-	SFX_BUILDING_MAL2,        // 11034
-	SFX_BUILDING_MAL3,        // 11035
-	SFX_BUILDING_STR1,        // 11036
-	SFX_BUILDING_STR2,        // 11037
-	SFX_BUILDING_STR3,        // 11038
-	SFX_BUILDING_CHURCH,      // 11039
-	SFX_BUILDING_FAN_1,       // 11040
-	SFX_BUILDING_FAN_2,       // 11041
-	SFX_BUILDING_FAN_3,       // 11042
-	SFX_BUILDING_FAN_4,       // 11043
-	SFX_BUILDING_INSECTS_1,   // 11044
-	SFX_BUILDING_INSECTS_2,   // 11045
-	SFX_BUILDING_INSECTS_3,   // 11046
-	SFX_BUILDING_INSECTS_4,   // 11047
-	SFX_BUILDING_INSECTS_5,   // 11048
-	SFX_CLUB_1,               // 11049
-	SFX_CLUB_2,               // 11050
-	SFX_CLUB_3,               // 11051
-	SFX_CLUB_4,               // 11052
+	SFX_BUILDINGS_BANK_ALARM,
+	SFX_BUILDING_SNORE,
+	SFX_BUILDING_BAR_1,
+	SFX_BUILDING_BAR_2,
+	SFX_BUILDING_BAR_3,
+	SFX_BUILDING_BAR_4,
+	SFX_BUILDING_MAL1,
+	SFX_BUILDING_MAL2,
+	SFX_BUILDING_MAL3,
+	SFX_BUILDING_STR1,
+	SFX_BUILDING_STR2,
+	SFX_BUILDING_STR3,
+	SFX_BUILDING_CHURCH,
+	SFX_BUILDING_FAN_1,
+	SFX_BUILDING_FAN_2,
+	SFX_BUILDING_FAN_3,
+	SFX_BUILDING_FAN_4,
+	SFX_BUILDING_INSECTS_1,
+	SFX_BUILDING_INSECTS_2,
+	SFX_BUILDING_INSECTS_3,
+	SFX_BUILDING_INSECTS_4,
+	SFX_BUILDING_INSECTS_5,
+	SFX_CLUB_1,
+	SFX_CLUB_2,
+	SFX_CLUB_3,
+	SFX_CLUB_4,
 
 	SFX_FOOTSTEP_GRASS_1,
 	SFX_FOOTSTEP_GRASS_2,
@@ -575,244 +504,5219 @@ enum eSfxSample
 	SFX_FOOTSTEP_SAND_3,
 	SFX_FOOTSTEP_SAND_4,
 
-	// TODO: miami ped comments... THERE'S OVER 9000
-	SFX_POLICE_BOAT_1 = 714,
-	SFX_POLICE_BOAT_2,
-	SFX_POLICE_BOAT_3,
-	SFX_POLICE_BOAT_4,
-	SFX_POLICE_BOAT_5,
-	SFX_POLICE_BOAT_6,
-	SFX_POLICE_BOAT_7,
-	SFX_POLICE_BOAT_8,
-	SFX_POLICE_BOAT_9,
-	SFX_POLICE_BOAT_10,
-	SFX_POLICE_BOAT_11,
-	SFX_POLICE_BOAT_12,
-	SFX_POLICE_BOAT_13,
-	SFX_POLICE_BOAT_14,
-	SFX_POLICE_BOAT_15,
-	SFX_POLICE_BOAT_16,
-	SFX_POLICE_BOAT_17,
-	SFX_POLICE_BOAT_18,
-	SFX_POLICE_BOAT_19,
-	SFX_POLICE_BOAT_20,
-	SFX_POLICE_BOAT_21,
-	SFX_POLICE_BOAT_22,
-	SFX_POLICE_BOAT_23,
-
-	SFX_POLICE_HELI_1,
-	SFX_POLICE_HELI_2,
-	SFX_POLICE_HELI_3,
-	SFX_POLICE_HELI_4,
-	SFX_POLICE_HELI_5,
-	SFX_POLICE_HELI_6,
-	SFX_POLICE_HELI_7,
-	SFX_POLICE_HELI_8,
-	SFX_POLICE_HELI_9,
-	SFX_POLICE_HELI_10,
-	SFX_POLICE_HELI_11,
-	SFX_POLICE_HELI_12,
-	SFX_POLICE_HELI_13,
-	SFX_POLICE_HELI_14,
-	SFX_POLICE_HELI_15,
-	SFX_POLICE_HELI_16,
-	SFX_POLICE_HELI_17,
-	SFX_POLICE_HELI_18,
-	SFX_POLICE_HELI_19,
-	SFX_POLICE_HELI_20,
-
-	SFX_GENERIC_FEMALE_GRUNT_1 = 2953,
-	SFX_GENERIC_FEMALE_GRUNT_2 = 2954,
-	SFX_GENERIC_FEMALE_GRUNT_3 = 2955,
-	SFX_GENERIC_FEMALE_GRUNT_4 = 2956,
-	SFX_GENERIC_FEMALE_GRUNT_5 = 2957,
-	SFX_GENERIC_FEMALE_GRUNT_6 = 2958,
-	SFX_GENERIC_FEMALE_GRUNT_7 = 2959,
-	SFX_GENERIC_FEMALE_GRUNT_8 = 2960,
-	SFX_GENERIC_FEMALE_GRUNT_9 = 2961,
-	SFX_GENERIC_FEMALE_GRUNT_10 = 2962,
-	SFX_GENERIC_FEMALE_GRUNT_11 = 2963,
-	SFX_GENERIC_FEMALE_GRUNT_12 = 2964,
-	SFX_GENERIC_FEMALE_GRUNT_13 = 2965,
-	SFX_GENERIC_FEMALE_GRUNT_14 = 2966,
-	SFX_GENERIC_FEMALE_GRUNT_15 = 2967,
-	SFX_GENERIC_FEMALE_GRUNT_16 = 2968,
-	SFX_GENERIC_FEMALE_GRUNT_17 = 2969,
-	SFX_GENERIC_FEMALE_GRUNT_18 = 2970,
-	SFX_GENERIC_FEMALE_GRUNT_19 = 2971,
-	SFX_GENERIC_FEMALE_GRUNT_20 = 2972,
-	SFX_GENERIC_FEMALE_GRUNT_21 = 2973,
-	SFX_GENERIC_FEMALE_GRUNT_22 = 2974,
-	SFX_GENERIC_FEMALE_GRUNT_23 = 2975,
-	SFX_GENERIC_FEMALE_GRUNT_24 = 2976,
-	SFX_GENERIC_FEMALE_GRUNT_25 = 2977,
-	SFX_GENERIC_FEMALE_GRUNT_26 = 2978,
-	SFX_GENERIC_FEMALE_GRUNT_27 = 2979,
-	SFX_GENERIC_FEMALE_GRUNT_28 = 2980,
-	SFX_GENERIC_FEMALE_GRUNT_29 = 2981,
-	SFX_GENERIC_FEMALE_GRUNT_30 = 2982,
-	SFX_GENERIC_FEMALE_GRUNT_31 = 2983,
-	SFX_GENERIC_FEMALE_GRUNT_32 = 2984,
-	SFX_GENERIC_FEMALE_GRUNT_33 = 2985,
-	SFX_GENERIC_MALE_FIRE_1 = 3013,
-	SFX_GENERIC_MALE_FIRE_2 = 3014,
-	SFX_GENERIC_MALE_FIRE_3 = 3015,
-	SFX_GENERIC_MALE_FIRE_4 = 3016,
-	SFX_GENERIC_MALE_FIRE_5 = 3017,
-	SFX_GENERIC_MALE_FIRE_6 = 3018,
-	SFX_GENERIC_MALE_FIRE_7 = 3019,
-	SFX_GENERIC_MALE_FIRE_8 = 3020,
-	SFX_GENERIC_MALE_FIRE_9 = 3021,
-	SFX_GENERIC_MALE_FIRE_10 = 3022,
-	SFX_GENERIC_MALE_FIRE_11 = 3023,
-	SFX_GENERIC_MALE_FIRE_12 = 3024,
-	SFX_GENERIC_MALE_FIRE_13 = 3025,
-	SFX_GENERIC_MALE_FIRE_14 = 3026,
-	SFX_GENERIC_MALE_FIRE_15 = 3027,
-	SFX_GENERIC_MALE_FIRE_16 = 3028,
-	SFX_GENERIC_MALE_FIRE_17 = 3029,
-	SFX_GENERIC_MALE_FIRE_18 = 3030,
-	SFX_GENERIC_MALE_FIRE_19 = 3031,
-	SFX_GENERIC_MALE_FIRE_20 = 3032,
-	SFX_GENERIC_MALE_FIRE_21 = 3033,
-	SFX_GENERIC_MALE_FIRE_22 = 3034,
-	SFX_GENERIC_MALE_FIRE_23 = 3035,
-	SFX_GENERIC_MALE_FIRE_24 = 3036,
-	SFX_GENERIC_MALE_FIRE_25 = 3037,
-	SFX_GENERIC_MALE_FIRE_26 = 3038,
-	SFX_GENERIC_MALE_FIRE_27 = 3039,
-	SFX_GENERIC_MALE_FIRE_28 = 3040,
-	SFX_GENERIC_MALE_FIRE_29 = 3041,
-	SFX_GENERIC_MALE_FIRE_30 = 3042,
-	SFX_GENERIC_MALE_FIRE_31 = 3043,
-	SFX_GENERIC_MALE_FIRE_32 = 3044,
-	SFX_GENERIC_MALE_DEATH_1 = 3045,
-	SFX_GENERIC_MALE_DEATH_2 = 3046,
-	SFX_GENERIC_MALE_DEATH_3 = 3047,
-	SFX_GENERIC_MALE_DEATH_4 = 3048,
-	SFX_GENERIC_MALE_DEATH_5 = 3049,
-	SFX_GENERIC_MALE_DEATH_6 = 3050,
-	SFX_GENERIC_MALE_DEATH_7 = 3051,
-	SFX_GENERIC_MALE_DEATH_8 = 3052,
-	SFX_GENERIC_MALE_DEATH_9 = 3053,
-	SFX_GENERIC_MALE_DEATH_10 = 3054,
-	SFX_GENERIC_MALE_DEATH_11 = 3055,
-	SFX_GENERIC_MALE_DEATH_12 = 3056,
-	SFX_GENERIC_MALE_DEATH_13 = 3057,
-	SFX_GENERIC_MALE_DEATH_14 = 3058,
-	SFX_GENERIC_MALE_DEATH_15 = 3059,
-	SFX_GENERIC_MALE_DEATH_16 = 3060,
-	SFX_GENERIC_MALE_DEATH_17 = 3061,
-	SFX_GENERIC_MALE_DEATH_18 = 3062,
-	SFX_GENERIC_MALE_DEATH_19 = 3063,
-	SFX_GENERIC_MALE_DEATH_20 = 3064,
-	SFX_GENERIC_MALE_DEATH_21 = 3065,
-	SFX_GENERIC_MALE_DEATH_22 = 3066,
-	SFX_GENERIC_MALE_DEATH_23 = 3067,
-	SFX_GENERIC_MALE_DEATH_24 = 3068,
-	SFX_GENERIC_MALE_DEATH_25 = 3069,
-	SFX_GENERIC_MALE_DEATH_26 = 3070,
-	SFX_GENERIC_MALE_DEATH_27 = 3071,
-	SFX_GENERIC_MALE_DEATH_28 = 3072,
-	SFX_GENERIC_MALE_DEATH_29 = 3073,
-	SFX_GENERIC_MALE_DEATH_30 = 3074,
-	SFX_GENERIC_MALE_DEATH_31 = 3075,
-	SFX_GENERIC_MALE_DEATH_32 = 3076,
-	SFX_GENERIC_MALE_DEATH_33 = 3077,
-	SFX_GENERIC_MALE_DEATH_34 = 3078,
-	SFX_GENERIC_MALE_DEATH_35 = 3079,
-	SFX_GENERIC_MALE_DEATH_36 = 3080,
-	SFX_GENERIC_MALE_DEATH_37 = 3081,
-	SFX_GENERIC_MALE_DEATH_38 = 3082,
-	SFX_GENERIC_MALE_DEATH_39 = 3083,
-	SFX_GENERIC_MALE_DEATH_40 = 3084,
-	SFX_GENERIC_MALE_DEATH_41 = 3085,
-	SFX_GENERIC_MALE_GRUNT_1 = 3086,
-	SFX_GENERIC_MALE_GRUNT_2 = 3087,
-	SFX_GENERIC_MALE_GRUNT_3 = 3088,
-	SFX_GENERIC_MALE_GRUNT_4 = 3089,
-	SFX_GENERIC_MALE_GRUNT_5 = 3090,
-	SFX_GENERIC_MALE_GRUNT_6 = 3091,
-	SFX_GENERIC_MALE_GRUNT_7 = 3092,
-	SFX_GENERIC_MALE_GRUNT_8 = 3093,
-	SFX_GENERIC_MALE_GRUNT_9 = 3094,
-	SFX_GENERIC_MALE_GRUNT_10 = 3095,
-	SFX_GENERIC_MALE_GRUNT_11 = 3096,
-	SFX_GENERIC_MALE_GRUNT_12 = 3097,
-	SFX_GENERIC_MALE_GRUNT_13 = 3098,
-	SFX_GENERIC_MALE_GRUNT_14 = 3099,
-	SFX_GENERIC_MALE_GRUNT_15 = 3100,
-	SFX_GENERIC_MALE_GRUNT_16 = 3101,
-	SFX_GENERIC_MALE_GRUNT_17 = 3102,
-	SFX_GENERIC_MALE_GRUNT_18 = 3103,
-	SFX_GENERIC_MALE_GRUNT_19 = 3104,
-	SFX_GENERIC_MALE_GRUNT_20 = 3105,
-	SFX_GENERIC_MALE_GRUNT_21 = 3106,
-	SFX_GENERIC_MALE_GRUNT_22 = 3107,
-	SFX_GENERIC_MALE_GRUNT_23 = 3108,
-	SFX_GENERIC_MALE_GRUNT_24 = 3109,
-	SFX_GENERIC_MALE_GRUNT_25 = 3110,
-	SFX_GENERIC_MALE_GRUNT_26 = 3111,
-	SFX_GENERIC_MALE_GRUNT_27 = 3112,
-	SFX_GENERIC_MALE_GRUNT_28 = 3113,
-	SFX_GENERIC_MALE_GRUNT_29 = 3114,
-	SFX_GENERIC_MALE_GRUNT_30 = 3115,
-	SFX_GENERIC_MALE_GRUNT_31 = 3116,
-	SFX_GENERIC_MALE_GRUNT_32 = 3117,
-	SFX_GENERIC_MALE_GRUNT_33 = 3118,
-	SFX_GENERIC_MALE_GRUNT_34 = 3119,
-	SFX_GENERIC_MALE_GRUNT_35 = 3120,
-	SFX_GENERIC_MALE_GRUNT_36 = 3121,
-	SFX_GENERIC_MALE_GRUNT_37 = 3122,
-	SFX_GENERIC_MALE_GRUNT_38 = 3123,
-	SFX_GENERIC_MALE_GRUNT_39 = 3124,
-	SFX_GENERIC_MALE_GRUNT_40 = 3125,
-	SFX_GENERIC_MALE_GRUNT_41 = 3126,
-	SFX_GENERIC_MALE_PANIC_1 = 3127,
-	SFX_GENERIC_MALE_PANIC_2 = 3128,
-	SFX_GENERIC_MALE_PANIC_3 = 3129,
-	SFX_GENERIC_MALE_PANIC_4 = 3130,
-	SFX_GENERIC_MALE_PANIC_5 = 3131,
-	SFX_GENERIC_MALE_PANIC_6 = 3132,
-	SFX_GENERIC_MALE_PANIC_7 = 3133,
-	SFX_GENERIC_MALE_PANIC_8 = 3134,
-	SFX_GENERIC_MALE_PANIC_9 = 3135,
-	SFX_GENERIC_MALE_PANIC_10 = 3136,
-	SFX_GENERIC_MALE_PANIC_11 = 3137,
-	SFX_GENERIC_MALE_PANIC_12 = 3138,
-	SFX_GENERIC_MALE_PANIC_13 = 3139,
-	SFX_GENERIC_MALE_PANIC_14 = 3140,
-	SFX_GENERIC_MALE_PANIC_15 = 3141,
-	SFX_GENERIC_MALE_PANIC_16 = 3142,
-	SFX_GENERIC_MALE_PANIC_17 = 3143,
-	SFX_GENERIC_MALE_PANIC_18 = 3144,
-	SFX_GENERIC_MALE_PANIC_19 = 3145,
-	SFX_GENERIC_MALE_PANIC_20 = 3146,
-	SFX_GENERIC_MALE_PANIC_21 = 3147,
-	SFX_GENERIC_MALE_PANIC_22 = 3148,
-	SFX_GENERIC_MALE_PANIC_23 = 3149,
-	SFX_GENERIC_MALE_PANIC_24 = 3150,
-	SFX_GENERIC_MALE_PANIC_25 = 3151,
-	SFX_GENERIC_MALE_PANIC_26 = 3152,
-	SFX_GENERIC_MALE_PANIC_27 = 3153,
-	SFX_GENERIC_MALE_PANIC_28 = 3154,
-	SFX_GENERIC_MALE_PANIC_29 = 3155,
-	SFX_GENERIC_MALE_PANIC_30 = 3156,
-	SFX_GENERIC_MALE_PANIC_31 = 3157,
-	SFX_GENERIC_MALE_PANIC_32 = 3158,
-	SFX_GENERIC_MALE_PANIC_33 = 3159,
-	SFX_GENERIC_MALE_PANIC_34 = 3160,
-	SFX_GENERIC_MALE_PANIC_35 = 3161,
-
-	TOTAL_AUDIO_SAMPLES = 9941,
+	// ped comments
+
+	SFX_AMBULAN_VOICE_1_VAN_1,
+	SFX_AMBULAN_VOICE_1_VAN_2,
+	SFX_AMBULAN_VOICE_1_VAN_3,
+	SFX_AMBULAN_VOICE_1_VAN_4,
+	SFX_AMBULAN_VOICE_1_VICTIM_1,
+	SFX_AMBULAN_VOICE_1_VICTIM_2,
+	SFX_AMBULAN_VOICE_1_VICTIM_3,
+	SFX_AMBULAN_VOICE_1_VICTIM_4,
+	SFX_AMBULAN_VOICE_2_VAN_1,
+	SFX_AMBULAN_VOICE_2_VAN_2,
+	SFX_AMBULAN_VOICE_2_VAN_3,
+	SFX_AMBULAN_VOICE_2_VAN_4,
+	SFX_AMBULAN_VOICE_2_VICTIM_1,
+	SFX_AMBULAN_VOICE_2_VICTIM_2,
+	SFX_AMBULAN_VOICE_2_VICTIM_3,
+	SFX_AMBULAN_VOICE_2_VICTIM_4,
+	SFX_AVE1_AA,
+	SFX_AVE1_AB,
+	SFX_AVE1_AC,
+	SFX_AVE1_AD,
+	SFX_AVE1_AE,
+	SFX_AVE1_AF,
+	SFX_AVE1_AG,
+	SFX_AVE2_AA,
+	SFX_AVE2_AC,
+	SFX_AVE2_AD,
+	SFX_AVE2_AE,
+	SFX_AVE2_AG,
+	SFX_AVE2_AH,
+	SFX_AVE3_AA,
+	SFX_AVE3_AB,
+	SFX_AVE3_AC,
+	SFX_AVE3_AD,
+	SFX_AVE3_AE,
+	SFX_AVE3_AF,
+	SFX_AVE3_AG,
+	SFX_AVE4_AA,
+	SFX_AVE4_AB,
+	SFX_AVE4_AD,
+	SFX_AVE4_AE,
+	SFX_AVE4_AF,
+	SFX_AVE4_AG,
+	SFX_AVE4_AH,
+	SFX_AVE5_AA,
+	SFX_AVE5_AB,
+	SFX_AVE5_AC,
+	SFX_AVE5_AD,
+	SFX_AVE5_AE,
+	SFX_AVE5_AF,
+	SFX_AVE5_AG,
+	SFX_AVE6_AA,
+	SFX_AVE6_AB,
+	SFX_AVE6_AC,
+	SFX_AVE6_AD,
+	SFX_AVE6_AE,
+	SFX_AVEN_AA,
+	SFX_AVEN_AB,
+	SFX_AVEN_AC,
+	SFX_AVEN_AD,
+	SFX_AVEN_AE,
+	SFX_AVEN_AF,
+	SFX_AVEN_AG,
+	SFX_AVEN_AH,
+	SFX_AVEN_AI,
+	SFX_AVEN_AJ,
+	SFX_AVEN_AK,
+	SFX_AVEN_AL,
+	SFX_AVEN_AM,
+	SFX_AVEN_AN,
+	SFX_AVEN_AO,
+	SFX_AVEN_AP,
+	SFX_AVEN_AQ,
+	SFX_AVEN_AR,
+	SFX_AVEN_AS,
+	SFX_AVEN_AT,
+	SFX_AVEN_AU,
+	SFX_AVEN_AV,
+	SFX_AVEN_AW,
+	SFX_BIKER1_BUMP_1,
+	SFX_BIKER1_BUMP_2,
+	SFX_BIKER1_BUMP_3,
+	SFX_BIKER1_CHAT_1,
+	SFX_BIKER1_CHAT_2,
+	SFX_BIKER1_CHAT_3,
+	SFX_BIKER1_CHAT_4,
+	SFX_BIKER1_CRASH_CAR_1,
+	SFX_BIKER1_CRASH_CAR_2,
+	SFX_BIKER1_DODGE_1,
+	SFX_BIKER1_DODGE_2,
+	SFX_BIKER1_DRIVER_BLOCKED_1,
+	SFX_BIKER1_DRIVER_BLOCKED_2,
+	SFX_BIKER1_FIGHT_1,
+	SFX_BIKER1_FIGHT_2,
+	SFX_BIKER1_FIGHT_3,
+	SFX_BIKER1_GUN_THREATENED_1,
+	SFX_BIKER1_GUN_THREATENED_2,
+	SFX_BIKER1_JACKED_CAR_1,
+	SFX_BIKER1_JACKED_CAR_2,
+	SFX_BIKER1_JACKED_CAR_3,
+	SFX_BIKER2_BUMP_1,
+	SFX_BIKER2_BUMP_2,
+	SFX_BIKER2_BUMP_3,
+	SFX_BIKER2_CHAT_1,
+	SFX_BIKER2_CHAT_2,
+	SFX_BIKER2_CHAT_3,
+	SFX_BIKER2_CRASH_CAR_1,
+	SFX_BIKER2_CRASH_CAR_2,
+	SFX_BIKER2_DODGE_1,
+	SFX_BIKER2_DODGE_2,
+	SFX_BIKER2_DODGE_3,
+	SFX_BIKER2_DRIVER_BLOCKED_1,
+	SFX_BIKER2_DRIVER_BLOCKED_2,
+	SFX_BIKER2_FIGHT_1,
+	SFX_BIKER2_FIGHT_2,
+	SFX_BIKER2_FIGHT_3,
+	SFX_BIKER2_GUN_THREATENED_1,
+	SFX_BIKER2_GUN_THREATENED_2,
+	SFX_BIKER2_JACKED_CAR_1,
+	SFX_BIKER2_JACKED_CAR_2,
+	SFX_BIKER2_JACKED_CAR_3,
+	SFX_BIKER2_SHOCKED_1,
+	SFX_BONS2BA,
+	SFX_BONS2BB,
+	SFX_BONS2BC,
+	SFX_BONS2BD,
+	SFX_BONS2BE,
+	SFX_BRIDGE_BELL,
+	SFX_B_MAN1_BUMP_1,
+	SFX_B_MAN1_BUMP_2,
+	SFX_B_MAN1_BUMP_3,
+	SFX_B_MAN1_CHAT_1,
+	SFX_B_MAN1_CHAT_2,
+	SFX_B_MAN1_CHAT_3,
+	SFX_B_MAN1_CRASH_CAR_1,
+	SFX_B_MAN1_CRASH_CAR_2,
+	SFX_B_MAN1_DODGE_1,
+	SFX_B_MAN1_DODGE_2,
+	SFX_B_MAN1_DRIVER_BLOCKED_1,
+	SFX_B_MAN1_DRIVER_BLOCKED_2,
+	SFX_B_MAN1_FIGHT_1,
+	SFX_B_MAN1_FIGHT_2,
+	SFX_B_MAN1_FIGHT_3,
+	SFX_B_MAN1_GUN_THREATENED_1,
+	SFX_B_MAN1_GUN_THREATENED_2,
+	SFX_B_MAN1_JACKED_CAR_1,
+	SFX_B_MAN1_JACKED_CAR_2,
+	SFX_B_MAN1_JACKED_CAR_3,
+	SFX_B_MAN1_SHOCKED_1,
+	SFX_B_MAN2_BUMP_1,
+	SFX_B_MAN2_BUMP_2,
+	SFX_B_MAN2_BUMP_3,
+	SFX_B_MAN2_CHAT_1,
+	SFX_B_MAN2_CHAT_2,
+	SFX_B_MAN2_CHAT_3,
+	SFX_B_MAN2_CHAT_4,
+	SFX_B_MAN2_CRASH_CAR_1,
+	SFX_B_MAN2_CRASH_CAR_2,
+	SFX_B_MAN2_DODGE_1,
+	SFX_B_MAN2_DODGE_2,
+	SFX_B_MAN2_DRIVER_BLOCKED_1,
+	SFX_B_MAN2_DRIVER_BLOCKED_2,
+	SFX_B_MAN2_FIGHT_1,
+	SFX_B_MAN2_FIGHT_2,
+	SFX_B_MAN2_FIGHT_3,
+	SFX_B_MAN2_GUN_THREATENED_1,
+	SFX_B_MAN2_GUN_THREATENED_2,
+	SFX_B_MAN2_JACKED_CAR_1,
+	SFX_B_MAN2_JACKED_CAR_2,
+	SFX_B_MAN2_JACKED_CAR_3,
+	SFX_B_MAN2_SHOCKED_1,
+	SFX_B_MAN3_BUMP_1,
+	SFX_B_MAN3_BUMP_2,
+	SFX_B_MAN3_BUMP_3,
+	SFX_B_MAN3_CHAT_1,
+	SFX_B_MAN3_CHAT_2,
+	SFX_B_MAN3_CHAT_3,
+	SFX_B_MAN3_CHAT_4,
+	SFX_B_MAN3_CHAT_5,
+	SFX_B_MAN3_CRASH_CAR_1,
+	SFX_B_MAN3_CRASH_CAR_2,
+	SFX_B_MAN3_DODGE_1,
+	SFX_B_MAN3_DODGE_2,
+	SFX_B_MAN3_DRIVER_BLOCKED_1,
+	SFX_B_MAN3_DRIVER_BLOCKED_2,
+	SFX_B_MAN3_FIGHT_1,
+	SFX_B_MAN3_FIGHT_2,
+	SFX_B_MAN3_FIGHT_3,
+	SFX_B_MAN3_FIGHT_4,
+	SFX_B_MAN3_GUN_THREATENED_1,
+	SFX_B_MAN3_GUN_THREATENED_2,
+	SFX_B_MAN3_JACKED_CAR_1,
+	SFX_B_MAN3_JACKED_CAR_2,
+	SFX_B_MAN3_JACKED_CAR_3,
+	SFX_B_MAN3_SHOCKED_1,
+	SFX_B_WOM1_BUMP_1,
+	SFX_B_WOM1_BUMP_2,
+	SFX_B_WOM1_BUMP_3,
+	SFX_B_WOM1_CHAT_1,
+	SFX_B_WOM1_CHAT_2,
+	SFX_B_WOM1_CHAT_3,
+	SFX_B_WOM1_CRASH_CAR_1,
+	SFX_B_WOM1_CRASH_CAR_2,
+	SFX_B_WOM1_DODGE_1,
+	SFX_B_WOM1_DODGE_2,
+	SFX_B_WOM1_DRIVER_BLOCKED_1,
+	SFX_B_WOM1_DRIVER_BLOCKED_2,
+	SFX_B_WOM1_FIGHT_1,
+	SFX_B_WOM1_FIGHT_2,
+	SFX_B_WOM1_FIGHT_3,
+	SFX_B_WOM1_GUN_THREATENED_1,
+	SFX_B_WOM1_GUN_THREATENED_2,
+	SFX_B_WOM1_JACKED_CAR_1,
+	SFX_B_WOM1_JACKED_CAR_2,
+	SFX_B_WOM1_JACKED_CAR_3,
+	SFX_B_WOM1_SHOCKED_1,
+	SFX_B_WOM2_BUMP_1,
+	SFX_B_WOM2_BUMP_2,
+	SFX_B_WOM2_BUMP_3,
+	SFX_B_WOM2_CHAT_1,
+	SFX_B_WOM2_CHAT_2,
+	SFX_B_WOM2_CHAT_3,
+	SFX_B_WOM2_CHAT_4,
+	SFX_B_WOM2_CRASH_CAR_1,
+	SFX_B_WOM2_CRASH_CAR_2,
+	SFX_B_WOM2_DODGE_1,
+	SFX_B_WOM2_DODGE_2,
+	SFX_B_WOM2_DODGE_3,
+	SFX_B_WOM2_DRIVER_BLOCKED_1,
+	SFX_B_WOM2_DRIVER_BLOCKED_2,
+	SFX_B_WOM2_FIGHT_1,
+	SFX_B_WOM2_FIGHT_2,
+	SFX_B_WOM2_FIGHT_3,
+	SFX_B_WOM2_GUN_THREATENED_1,
+	SFX_B_WOM2_GUN_THREATENED_2,
+	SFX_B_WOM2_JACKED_CAR_1,
+	SFX_B_WOM2_JACKED_CAR_2,
+	SFX_B_WOM2_JACKED_CAR_3,
+	SFX_B_WOM2_SHOCKED_1,
+	SFX_B_WOM3_BUMP_1,
+	SFX_B_WOM3_BUMP_2,
+	SFX_B_WOM3_BUMP_3,
+	SFX_B_WOM3_CHAT_1,
+	SFX_B_WOM3_CHAT_2,
+	SFX_B_WOM3_CHAT_3,
+	SFX_B_WOM3_CRASH_CAR_1,
+	SFX_B_WOM3_CRASH_CAR_2,
+	SFX_B_WOM3_DODGE_1,
+	SFX_B_WOM3_DODGE_2,
+	SFX_B_WOM3_DRIVER_BLOCKED_1,
+	SFX_B_WOM3_DRIVER_BLOCKED_2,
+	SFX_B_WOM3_FIGHT_1,
+	SFX_B_WOM3_FIGHT_2,
+	SFX_B_WOM3_FIGHT_3,
+	SFX_B_WOM3_GUN_THREATENED_1,
+	SFX_B_WOM3_GUN_THREATENED_2,
+	SFX_B_WOM3_JACKED_CAR_1,
+	SFX_B_WOM3_JACKED_CAR_2,
+	SFX_B_WOM3_JACKED_CAR_3,
+	SFX_B_WOM3_SHOCKED_1,
+	SFX_CAD1_AA,
+	SFX_CAD1_AB,
+	SFX_CAD1_AC,
+	SFX_CAD1_AD,
+	SFX_CAD1_AE,
+	SFX_CAD2_AA,
+	SFX_CAD2_AB,
+	SFX_CAD2_AC,
+	SFX_CAD2_AD,
+	SFX_CAD2_AE,
+	SFX_CAD2_AF,
+	SFX_CAD3_AA,
+	SFX_CAD3_AB,
+	SFX_CAD3_AC,
+	SFX_CAD3_AD,
+	SFX_CAD3_AE,
+	SFX_CAD3_AF,
+	SFX_CAD4_AA,
+	SFX_CAD4_AB,
+	SFX_CAD4_AC,
+	SFX_CAD4_AD,
+	SFX_CAD4_AE,
+	SFX_CAD4_AF,
+	SFX_CAD5_AA,
+	SFX_CAD5_AB,
+	SFX_CAD5_AC,
+	SFX_CAD5_AD,
+	SFX_CAD5_AE,
+	SFX_CAD5_AF,
+	SFX_CAD6_AA,
+	SFX_CAD6_AB,
+	SFX_CAD6_AC,
+	SFX_CAD6_AD,
+	SFX_CAD6_AE,
+	SFX_CAD6_AF,
+	SFX_CAD7_AB,
+	SFX_CAD7_AC,
+	SFX_CAD7_AD,
+	SFX_CAD7_AE,
+	SFX_CAD8_AB,
+	SFX_CAD8_AC,
+	SFX_CAD8_AD,
+	SFX_CAD8_AE,
+	SFX_CAD8_AF,
+	SFX_CAD9_AA,
+	SFX_CAD9_AB,
+	SFX_CAD9_AC,
+	SFX_CAD9_AD,
+	SFX_CAD9_AE,
+	SFX_CAD9_AF,
+	SFX_CSHUTR,
+	SFX_CAMP_MAN_BUMP_1,
+	SFX_CAMP_MAN_BUMP_2,
+	SFX_CAMP_MAN_BUMP_3,
+	SFX_CAMP_MAN_CHAT_1,
+	SFX_CAMP_MAN_CHAT_2,
+	SFX_CAMP_MAN_CHAT_3,
+	SFX_CAMP_MAN_CHAT_4,
+	SFX_CAMP_MAN_CRASH_CAR_1,
+	SFX_CAMP_MAN_CRASH_CAR_2,
+	SFX_CAMP_MAN_CRASH_CAR_3,
+	SFX_CAMP_MAN_DODGE_1,
+	SFX_CAMP_MAN_DODGE_2,
+	SFX_CAMP_MAN_DRIVER_BLOCKED_1,
+	SFX_CAMP_MAN_DRIVER_BLOCKED_2,
+	SFX_CAMP_MAN_DRIVER_BLOCKED_3,
+	SFX_CAMP_MAN_FIGHT_1,
+	SFX_CAMP_MAN_FIGHT_2,
+	SFX_CAMP_MAN_FIGHT_3,
+	SFX_CAMP_MAN_GUN_THREATENED_1,
+	SFX_CAMP_MAN_GUN_THREATENED_2,
+	SFX_CAMP_MAN_JACKED_CAR_1,
+	SFX_CAMP_MAN_JACKED_CAR_2,
+	SFX_CAMP_MAN_JACKED_CAR_3,
+	SFX_CAMP_MAN_SHOCKED_1,
+	SFX_CAMP_WOM_BUMP_1,
+	SFX_CAMP_WOM_BUMP_2,
+	SFX_CAMP_WOM_BUMP_3,
+	SFX_CAMP_WOM_CHAT_1,
+	SFX_CAMP_WOM_CHAT_2,
+	SFX_CAMP_WOM_CHAT_3,
+	SFX_CAMP_WOM_CHAT_4,
+	SFX_CAMP_WOM_CHAT_5,
+	SFX_CAMP_WOM_CRASH_CAR_1,
+	SFX_CAMP_WOM_CRASH_CAR_2,
+	SFX_CAMP_WOM_DODGE_1,
+	SFX_CAMP_WOM_DODGE_2,
+	SFX_CAMP_WOM_DRIVER_BLOCKED_1,
+	SFX_CAMP_WOM_DRIVER_BLOCKED_2,
+	SFX_CAMP_WOM_FIGHT_1,
+	SFX_CAMP_WOM_FIGHT_2,
+	SFX_CAMP_WOM_FIGHT_3,
+	SFX_CAMP_WOM_GUN_THREATENED_1,
+	SFX_CAMP_WOM_GUN_THREATENED_2,
+	SFX_CAMP_WOM_JACKED_CAR_1,
+	SFX_CAMP_WOM_JACKED_CAR_2,
+	SFX_CAMP_WOM_JACKED_CAR_3,
+	SFX_CAMP_WOM_SHOCKED_1,
+	SFX_CAS_MAN_BUMP_1,
+	SFX_CAS_MAN_BUMP_2,
+	SFX_CAS_MAN_BUMP_3,
+	SFX_CAS_MAN_CHAT_1,
+	SFX_CAS_MAN_CHAT_2,
+	SFX_CAS_MAN_CHAT_3,
+	SFX_CAS_MAN_CHAT_4,
+	SFX_CAS_MAN_CRASH_CAR_1,
+	SFX_CAS_MAN_CRASH_CAR_2,
+	SFX_CAS_MAN_DODGE_1,
+	SFX_CAS_MAN_DODGE_2,
+	SFX_CAS_MAN_DRIVER_BLOCKED_1,
+	SFX_CAS_MAN_DRIVER_BLOCKED_2,
+	SFX_CAS_MAN_FIGHT_1,
+	SFX_CAS_MAN_FIGHT_2,
+	SFX_CAS_MAN_FIGHT_3,
+	SFX_CAS_MAN_GUN_THREATENED_1,
+	SFX_CAS_MAN_GUN_THREATENED_2,
+	SFX_CAS_MAN_JACKED_CAR_1,
+	SFX_CAS_MAN_JACKED_CAR_2,
+	SFX_CAS_MAN_JACKED_CAR_3,
+	SFX_CAS_MAN_SHOCKED_1,
+	SFX_CAS_WOM_BUMP_1,
+	SFX_CAS_WOM_BUMP_2,
+	SFX_CAS_WOM_BUMP_3,
+	SFX_CAS_WOM_CHAT_1,
+	SFX_CAS_WOM_CHAT_2,
+	SFX_CAS_WOM_CHAT_3,
+	SFX_CAS_WOM_CHAT_4,
+	SFX_CAS_WOM_CRASH_CAR_1,
+	SFX_CAS_WOM_CRASH_CAR_2,
+	SFX_CAS_WOM_DODGE_1,
+	SFX_CAS_WOM_DODGE_2,
+	SFX_CAS_WOM_DRIVER_BLOCKED_1,
+	SFX_CAS_WOM_DRIVER_BLOCKED_2,
+	SFX_CAS_WOM_FIGHT_1,
+	SFX_CAS_WOM_FIGHT_2,
+	SFX_CAS_WOM_FIGHT_3,
+	SFX_CAS_WOM_GUN_THREATENED_1,
+	SFX_CAS_WOM_GUN_THREATENED_2,
+	SFX_CAS_WOM_JACKED_CAR_1,
+	SFX_CAS_WOM_JACKED_CAR_2,
+	SFX_CAS_WOM_JACKED_CAR_3,
+	SFX_CAS_WOM_SHOCKED_1,
+	SFX_CAS_WOM_SPECIAL_CASE_1,
+	SFX_CAS_WOM_SPECIAL_CASE_2,
+	SFX_CAS_WOM_SPECIAL_CASE_3,
+	SFX_CHOP_1,
+	SFX_CHOP_2,
+	SFX_CLICK,
+	SFX_COLT_45,
+	SFX_CONST1_BUMP_1,
+	SFX_CONST1_BUMP_2,
+	SFX_CONST1_CHAT_1,
+	SFX_CONST1_CHAT_3,
+	SFX_CONST1_CHAT_4,
+	SFX_CONST1_CRASH_CAR_1,
+	SFX_CONST1_CRASH_CAR_2,
+	SFX_CONST1_DODGE_1,
+	SFX_CONST1_DODGE_2,
+	SFX_CONST1_DRIVER_BLOCKED_1,
+	SFX_CONST1_DRIVER_BLOCKED_2,
+	SFX_CONST1_FIGHT_1,
+	SFX_CONST1_FIGHT_2,
+	SFX_CONST1_FIGHT_3,
+	SFX_CONST1_GUN_THREATENED_1,
+	SFX_CONST1_GUN_THREATENED_2,
+	SFX_CONST1_JACKED_CAR_1,
+	SFX_CONST1_JACKED_CAR_2,
+	SFX_CONST1_JACKED_CAR_3,
+	SFX_CONST1_SHOCKED_1,
+	SFX_CONST1_SPECIAL_CASE_1,
+	SFX_CONST1_SPECIAL_CASE_2,
+	SFX_CONST1_SPECIAL_CASE_3,
+	SFX_CONST2_BUMP_1,
+	SFX_CONST2_BUMP_2,
+	SFX_CONST2_BUMP_3,
+	SFX_CONST2_CHAT_1,
+	SFX_CONST2_CHAT_2,
+	SFX_CONST2_CHAT_3,
+	SFX_CONST2_CHAT_4,
+	SFX_CONST2_CRASH_CAR_1,
+	SFX_CONST2_CRASH_CAR_2,
+	SFX_CONST2_DODGE_1,
+	SFX_CONST2_DODGE_2,
+	SFX_CONST2_DRIVER_BLOCKED_1,
+	SFX_CONST2_DRIVER_BLOCKED_2,
+	SFX_CONST2_FIGHT_1,
+	SFX_CONST2_FIGHT_2,
+	SFX_CONST2_FIGHT_3,
+	SFX_CONST2_GUN_THREATENED_1,
+	SFX_CONST2_GUN_THREATENED_2,
+	SFX_CONST2_JACKED_CAR_1,
+	SFX_CONST2_JACKED_CAR_2,
+	SFX_CONST2_SHOCKED_1,
+	SFX_COP1_ARREST_1,
+	SFX_COP1_ARREST_2,
+	SFX_COP1_BUMP_1,
+	SFX_COP1_BUMP_2,
+	SFX_COP1_BUMP_3,
+	SFX_COP1_CHASE_FOOT_1,
+	SFX_COP1_CHASE_FOOT_2,
+	SFX_COP1_CHASE_FOOT_3,
+	SFX_COP1_CHASE_FOOT_4,
+	SFX_COP1_CHASE_FOOT_5,
+	SFX_COP1_CHASE_FOOT_6,
+	SFX_COP1_DODGE_1,
+	SFX_COP1_DODGE_2,
+	SFX_COP1_FIGHT_1,
+	SFX_COP1_FIGHT_2,
+	SFX_COP1_FIGHT_3,
+	SFX_COP1_SHOOT_1,
+	SFX_COP1_SHOOT_2,
+	SFX_COP1_SHOOT_3,
+	SFX_COP1_SHOOT_4,
+	SFX_COP1_SHOOT_5,
+	SFX_COP1_SHOOT_6,
+	SFX_COP2_ARREST_1,
+	SFX_COP2_ARREST_2,
+	SFX_COP2_BUMP_1,
+	SFX_COP2_BUMP_2,
+	SFX_COP2_BUMP_3,
+	SFX_COP2_CHASE_FOOT_1,
+	SFX_COP2_CHASE_FOOT_2,
+	SFX_COP2_CHASE_FOOT_3,
+	SFX_COP2_CHASE_FOOT_4,
+	SFX_COP2_CHASE_FOOT_5,
+	SFX_COP2_CHASE_FOOT_6,
+	SFX_COP2_DODGE_1,
+	SFX_COP2_DODGE_2,
+	SFX_COP2_FIGHT_1,
+	SFX_COP2_FIGHT_2,
+	SFX_COP2_FIGHT_3,
+	SFX_COP2_SHOOT_1,
+	SFX_COP2_SHOOT_2,
+	SFX_COP2_SHOOT_3,
+	SFX_COP2_SHOOT_4,
+	SFX_COP2_SHOOT_5,
+	SFX_COP2_SHOOT_6,
+	SFX_COP3_ARREST_1,
+	SFX_COP3_ARREST_2,
+	SFX_COP3_BUMP_1,
+	SFX_COP3_BUMP_2,
+	SFX_COP3_BUMP_3,
+	SFX_COP3_CHASE_FOOT_1,
+	SFX_COP3_CHASE_FOOT_2,
+	SFX_COP3_CHASE_FOOT_3,
+	SFX_COP3_CHASE_FOOT_4,
+	SFX_COP3_CHASE_FOOT_5,
+	SFX_COP3_CHASE_FOOT_6,
+	SFX_COP3_DODGE_1,
+	SFX_COP3_DODGE_2,
+	SFX_COP3_FIGHT_1,
+	SFX_COP3_FIGHT_2,
+	SFX_COP3_FIGHT_3,
+	SFX_COP3_SHOOT_1,
+	SFX_COP3_SHOOT_2,
+	SFX_COP3_SHOOT_3,
+	SFX_COP3_SHOOT_4,
+	SFX_COP3_SHOOT_5,
+	SFX_COP3_SHOOT_6,
+	SFX_COP4_ARREST_1,
+	SFX_COP4_ARREST_2,
+	SFX_COP4_BUMP_1,
+	SFX_COP4_BUMP_2,
+	SFX_COP4_BUMP_3,
+	SFX_COP4_CHASE_FOOT_1,
+	SFX_COP4_CHASE_FOOT_2,
+	SFX_COP4_CHASE_FOOT_3,
+	SFX_COP4_CHASE_FOOT_4,
+	SFX_COP4_CHASE_FOOT_5,
+	SFX_COP4_CHASE_FOOT_6,
+	SFX_COP4_DODGE_1,
+	SFX_COP4_DODGE_2,
+	SFX_COP4_FIGHT_1,
+	SFX_COP4_FIGHT_2,
+	SFX_COP4_FIGHT_3,
+	SFX_COP4_SHOOT_1,
+	SFX_COP4_SHOOT_2,
+	SFX_COP4_SHOOT_3,
+	SFX_COP4_SHOOT_4,
+	SFX_COP4_SHOOT_5,
+	SFX_COP4_SHOOT_6,
+	SFX_COP5_ARREST_1,
+	SFX_COP5_ARREST_2,
+	SFX_COP5_BUMP_1,
+	SFX_COP5_BUMP_2,
+	SFX_COP5_BUMP_3,
+	SFX_COP5_CHASE_FOOT_1,
+	SFX_COP5_CHASE_FOOT_2,
+	SFX_COP5_CHASE_FOOT_3,
+	SFX_COP5_CHASE_FOOT_4,
+	SFX_COP5_CHASE_FOOT_5,
+	SFX_COP5_CHASE_FOOT_6,
+	SFX_COP5_DODGE_1,
+	SFX_COP5_DODGE_2,
+	SFX_COP5_FIGHT_1,
+	SFX_COP5_FIGHT_2,
+	SFX_COP5_FIGHT_3,
+	SFX_COP5_SHOOT_1,
+	SFX_COP5_SHOOT_2,
+	SFX_COP5_SHOOT_3,
+	SFX_COP5_SHOOT_4,
+	SFX_COP5_SHOOT_5,
+	SFX_COP5_SHOOT_6,
+	SFX_COP6_ARREST_1,
+	SFX_COP6_ARREST_2,
+	SFX_COP6_BUMP_1,
+	SFX_COP6_BUMP_2,
+	SFX_COP6_BUMP_3,
+	SFX_COP6_CHASE_FOOT_1,
+	SFX_COP6_CHASE_FOOT_2,
+	SFX_COP6_CHASE_FOOT_3,
+	SFX_COP6_CHASE_FOOT_4,
+	SFX_COP6_CHASE_FOOT_5,
+	SFX_COP6_CHASE_FOOT_6,
+	SFX_COP6_DODGE_1,
+	SFX_COP6_DODGE_2,
+	SFX_COP6_FIGHT_1,
+	SFX_COP6_FIGHT_2,
+	SFX_COP6_FIGHT_3,
+	SFX_COP6_SHOOT_1,
+	SFX_COP6_SHOOT_2,
+	SFX_COP6_SHOOT_3,
+	SFX_COP6_SHOOT_4,
+	SFX_COP6_SHOOT_5,
+	SFX_COP6_SHOOT_6,
+	SFX_CRIMINAL01_BUMP_1,
+	SFX_CRIMINAL01_BUMP_2,
+	SFX_CRIMINAL01_BUMP_3,
+	SFX_CRIMINAL01_CHAT_1,
+	SFX_CRIMINAL01_CHAT_2,
+	SFX_CRIMINAL01_CHAT_3,
+	SFX_CRIMINAL01_CHAT_4,
+	SFX_CRIMINAL01_CRASH_CAR_1,
+	SFX_CRIMINAL01_CRASH_CAR_2,
+	SFX_CRIMINAL01_DODGE_1,
+	SFX_CRIMINAL01_DODGE_2,
+	SFX_CRIMINAL01_DRIVER_BLOCKED_1,
+	SFX_CRIMINAL01_DRIVER_BLOCKED_2,
+	SFX_CRIMINAL01_FIGHT_1,
+	SFX_CRIMINAL01_FIGHT_2,
+	SFX_CRIMINAL01_FIGHT_3,
+	SFX_CRIMINAL01_GUN_THREATENED_1,
+	SFX_CRIMINAL01_GUN_THREATENED_2,
+	SFX_CRIMINAL01_JACKED_CAR_1,
+	SFX_CRIMINAL01_JACKED_CAR_2,
+	SFX_CRIMINAL01_JACKED_CAR_3,
+	SFX_CRIMINAL01_SHOCKED_1,
+	SFX_CRIMINAL02_BUMP_1,
+	SFX_CRIMINAL02_BUMP_2,
+	SFX_CRIMINAL02_BUMP_3,
+	SFX_CRIMINAL02_CHAT_1,
+	SFX_CRIMINAL02_CHAT_2,
+	SFX_CRIMINAL02_CHAT_3,
+	SFX_CRIMINAL02_CHAT_4,
+	SFX_CRIMINAL02_CRASH_CAR_1,
+	SFX_CRIMINAL02_CRASH_CAR_2,
+	SFX_CRIMINAL02_DODGE_1,
+	SFX_CRIMINAL02_DODGE_2,
+	SFX_CRIMINAL02_DRIVER_BLOCKED_1,
+	SFX_CRIMINAL02_DRIVER_BLOCKED_2,
+	SFX_CRIMINAL02_FIGHT_1,
+	SFX_CRIMINAL02_FIGHT_2,
+	SFX_CRIMINAL02_FIGHT_3,
+	SFX_CRIMINAL02_GUN_THREATENED_1,
+	SFX_CRIMINAL02_GUN_THREATENED_2,
+	SFX_CRIMINAL02_JACKED_CAR_1,
+	SFX_CRIMINAL02_JACKED_CAR_2,
+	SFX_CRIMINAL02_JACKED_CAR_3,
+	SFX_CRIMINAL02_SHOCKED_1,
+	SFX_CRIMINAL02_SPECIAL_CASE_1,
+	SFX_CRIMINAL02_SPECIAL_CASE_2,
+	SFX_CT_MAN1_BUMP_1,
+	SFX_CT_MAN1_BUMP_2,
+	SFX_CT_MAN1_BUMP_3,
+	SFX_CT_MAN1_CHAT_1,
+	SFX_CT_MAN1_CHAT_2,
+	SFX_CT_MAN1_CHAT_3,
+	SFX_CT_MAN1_CHAT_4,
+	SFX_CT_MAN1_CRASH_CAR_1,
+	SFX_CT_MAN1_CRASH_CAR_2,
+	SFX_CT_MAN1_DODGE_1,
+	SFX_CT_MAN1_DODGE_2,
+	SFX_CT_MAN1_DRIVER_BLOCKED_1,
+	SFX_CT_MAN1_DRIVER_BLOCKED_2,
+	SFX_CT_MAN1_FIGHT_1,
+	SFX_CT_MAN1_FIGHT_2,
+	SFX_CT_MAN1_FIGHT_3,
+	SFX_CT_MAN1_GUN_THREATENED_1,
+	SFX_CT_MAN1_GUN_THREATENED_2,
+	SFX_CT_MAN1_JACKED_CAR_1,
+	SFX_CT_MAN1_JACKED_CAR_2,
+	SFX_CT_MAN1_JACKED_CAR_3,
+	SFX_CT_MAN1_SHOCKED_1,
+	SFX_CT_MAN1_SPECIAL_CASE_1,
+	SFX_CT_MAN1_SPECIAL_CASE_2,
+	SFX_CT_MAN1_SPECIAL_CASE_3,
+	SFX_CT_MAN2_BUMP_1,
+	SFX_CT_MAN2_BUMP_2,
+	SFX_CT_MAN2_BUMP_3,
+	SFX_CT_MAN2_CHAT_1,
+	SFX_CT_MAN2_CHAT_2,
+	SFX_CT_MAN2_CHAT_3,
+	SFX_CT_MAN2_CHAT_4,
+	SFX_CT_MAN2_CRASH_CAR_1,
+	SFX_CT_MAN2_CRASH_CAR_2,
+	SFX_CT_MAN2_DODGE_1,
+	SFX_CT_MAN2_DODGE_2,
+	SFX_CT_MAN2_DRIVER_BLOCKED_1,
+	SFX_CT_MAN2_DRIVER_BLOCKED_2,
+	SFX_CT_MAN2_FIGHT_1,
+	SFX_CT_MAN2_FIGHT_2,
+	SFX_CT_MAN2_FIGHT_3,
+	SFX_CT_MAN2_GUN_THREATENED_1,
+	SFX_CT_MAN2_GUN_THREATENED_2,
+	SFX_CT_MAN2_JACKED_CAR_1,
+	SFX_CT_MAN2_JACKED_CAR_2,
+	SFX_CT_MAN2_JACKED_CAR_3,
+	SFX_CT_MAN2_SHOCKED_1,
+	SFX_CT_WOM1_BUMP_1,
+	SFX_CT_WOM1_BUMP_2,
+	SFX_CT_WOM1_BUMP_3,
+	SFX_CT_WOM1_CHAT_1,
+	SFX_CT_WOM1_CHAT_2,
+	SFX_CT_WOM1_CHAT_3,
+	SFX_CT_WOM1_CHAT_4,
+	SFX_CT_WOM1_CRASH_CAR_1,
+	SFX_CT_WOM1_CRASH_CAR_2,
+	SFX_CT_WOM1_DODGE_1,
+	SFX_CT_WOM1_DODGE_2,
+	SFX_CT_WOM1_DRIVER_BLOCKED_1,
+	SFX_CT_WOM1_DRIVER_BLOCKED_2,
+	SFX_CT_WOM1_FIGHT_1,
+	SFX_CT_WOM1_FIGHT_2,
+	SFX_CT_WOM1_FIGHT_3,
+	SFX_CT_WOM1_GUN_THREATENED_1,
+	SFX_CT_WOM1_GUN_THREATENED_2,
+	SFX_CT_WOM1_JACKED_CAR_1,
+	SFX_CT_WOM1_JACKED_CAR_2,
+	SFX_CT_WOM1_JACKED_CAR_3,
+	SFX_CT_WOM1_SHOCKED_1,
+	SFX_CT_WOM2_BUMP_1,
+	SFX_CT_WOM2_BUMP_2,
+	SFX_CT_WOM2_BUMP_3,
+	SFX_CT_WOM2_CHAT_1,
+	SFX_CT_WOM2_CHAT_2,
+	SFX_CT_WOM2_CHAT_3,
+	SFX_CT_WOM2_CHAT_4,
+	SFX_CT_WOM2_CRASH_CAR_1,
+	SFX_CT_WOM2_CRASH_CAR_2,
+	SFX_CT_WOM2_DODGE_1,
+	SFX_CT_WOM2_DODGE_2,
+	SFX_CT_WOM2_DRIVER_BLOCKED_1,
+	SFX_CT_WOM2_DRIVER_BLOCKED_2,
+	SFX_CT_WOM2_FIGHT_1,
+	SFX_CT_WOM2_FIGHT_2,
+	SFX_CT_WOM2_FIGHT_3,
+	SFX_CT_WOM2_GUN_THREATENED_1,
+	SFX_CT_WOM2_GUN_THREATENED_2,
+	SFX_CT_WOM2_JACKED_CAR_1,
+	SFX_CT_WOM2_JACKED_CAR_2,
+	SFX_CT_WOM2_JACKED_CAR_3,
+	SFX_CT_WOM2_SHOCKED_1,
+	SFX_DOCKER_BUMP_1,
+	SFX_DOCKER_BUMP_2,
+	SFX_DOCKER_BUMP_3,
+	SFX_DOCKER_CHAT_1,
+	SFX_DOCKER_CHAT_2,
+	SFX_DOCKER_CHAT_3,
+	SFX_DOCKER_CHAT_4,
+	SFX_DOCKER_CRASH_CAR_1,
+	SFX_DOCKER_CRASH_CAR_2,
+	SFX_DOCKER_DODGE_1,
+	SFX_DOCKER_DODGE_2,
+	SFX_DOCKER_DRIVER_BLOCKED_1,
+	SFX_DOCKER_DRIVER_BLOCKED_2,
+	SFX_DOCKER_FIGHT_1,
+	SFX_DOCKER_FIGHT_2,
+	SFX_DOCKER_FIGHT_3,
+	SFX_DOCKER_GUN_THREATENED_1,
+	SFX_DOCKER_GUN_THREATENED_2,
+	SFX_DOCKER_JACKED_CAR_1,
+	SFX_DOCKER_JACKED_CAR_2,
+	SFX_DOCKER_JACKED_CAR_3,
+	SFX_DOCKER_SHOCKED_1,
+	SFX_DOCKER_SPECIAL_CASE_1,
+	SFX_DOCKER_SPECIAL_CASE_2,
+	SFX_DOCKER_SPECIAL_CASE_3,
+	SFX_DONALD_CRASH_CAR_1,
+	SFX_DONALD_CRASH_CAR_2,
+	SFX_DONALD_CRASH_CAR_3,
+	SFX_DONALD_DRIVER_BLOCKED_1,
+	SFX_DONALD_DRIVER_BLOCKED_2,
+	SFX_DONALD_JACKED_CAR_1,
+	SFX_DONALD_JACKED_CAR_2,
+	SFX_DONALD_JACKED_CAR_3,
+	SFX_DONALD_SHOCKED_1,
+	SFX_DONALD_SHOCKED_2,
+	SFX_DONH1CA,
+	SFX_DONH1DA,
+	SFX_DONH1DB,
+	SFX_DONH1EA,
+	SFX_DONH1EB,
+	SFX_DONH1EC,
+	SFX_DONH1ED,
+	SFX_DONH1EE,
+	SFX_DONH1FA,
+	SFX_DONH1GA,
+	SFX_DONH1GB,
+	SFX_DONH1GC,
+	SFX_DONH1HA,
+	SFX_DONH1IA,
+	SFX_DONH1IB,
+	SFX_DONH1JA,
+	SFX_DONH1JB,
+	SFX_DONH1JC,
+	SFX_DONH1JD,
+	SFX_DONH1JE,
+	SFX_DONH2AA,
+	SFX_DONH2AB,
+	SFX_DONH2AC,
+	SFX_DONH2AD,
+	SFX_DONH2AF,
+	SFX_DONH2AG,
+	SFX_DONH2AH,
+	SFX_DONH2BA,
+	SFX_DONH2BB,
+	SFX_DONH2BC,
+	SFX_DONH2BD,
+	SFX_DONH2BE,
+	SFX_DONH2BF,
+	SFX_DONH2BG,
+	SFX_DONH2BH,
+	SFX_DONH2BI,
+	SFX_DONH2BJ,
+	SFX_DONH2BK,
+	SFX_DONH2BL,
+	SFX_DONH2CA,
+	SFX_DONH2CB,
+	SFX_DONH2CC,
+	SFX_DONH2CD,
+	SFX_DONH2CE,
+	SFX_DONH2CF,
+	SFX_DONH2CG,
+	SFX_DONH2DA,
+	SFX_DONH2DB,
+	SFX_DONH2DC,
+	SFX_DONH2EA,
+	SFX_DONH2EC,
+	SFX_DONH3AA,
+	SFX_DONH3AB,
+	SFX_DONH3AC,
+	SFX_DONH3AD,
+	SFX_DONH3AE,
+	SFX_DONH3AF,
+	SFX_DONH3AG,
+	SFX_DONH3AH,
+	SFX_DONH3AI,
+	SFX_DONH3BA,
+	SFX_DONH3BB,
+	SFX_DONH3CA,
+	SFX_DONH3DA,
+	SFX_DONH3EA,
+	SFX_DONH3EB,
+	SFX_DONH3EC,
+	SFX_DONH3ED,
+	SFX_DONH3EE,
+	SFX_DONH3EF,
+	SFX_DONH3FA,
+	SFX_DONH3GA,
+	SFX_DONH3GB,
+	SFX_DONH3GC,
+	SFX_DONH3GD,
+	SFX_DONH3GE,
+	SFX_DONH3GF,
+	SFX_DONH3HA,
+	SFX_DONH3HB,
+	SFX_DONH3IA,
+	SFX_DONH3JA,
+	SFX_DONH4AA,
+	SFX_DONH4AB,
+	SFX_DONH4AC,
+	SFX_DONH4AD,
+	SFX_DONH4AE,
+	SFX_DONH4AF,
+	SFX_DONH4AG,
+	SFX_DONH4AH,
+	SFX_DONH4AI,
+	SFX_DONH4AJ,
+	SFX_DONH5AA,
+	SFX_DONH5AB,
+	SFX_DONH5AC,
+	SFX_DONH5AD,
+	SFX_DONH5AE,
+	SFX_DONH5AF,
+	SFX_DONH5AG,
+	SFX_DONH5AH,
+	SFX_DONH5AI,
+	SFX_DONH5AJ,
+	SFX_DONH5BA,
+	SFX_DONH5CA,
+	SFX_DONH5CB,
+	SFX_DONH6BA,
+	SFX_DONH6CA,
+	SFX_DONH6CB,
+	SFX_DONH6DA,
+	SFX_DONH6DB,
+	SFX_DONH6EA,
+	SFX_DONH6EB,
+	SFX_DONH6EC,
+	SFX_DONH6FA,
+	SFX_DONH6GA,
+	SFX_DONH6GB,
+	SFX_DONH6GC,
+	SFX_DONH6GD,
+	SFX_DONH6GF,
+	SFX_DONS1AA,
+	SFX_DONS1AB,
+	SFX_DONS1AC,
+	SFX_DONS1BA,
+	SFX_DONS1BB,
+	SFX_DONS2AA,
+	SFX_DONS2AB,
+	SFX_DONS2AC,
+	SFX_DONS2AD,
+	SFX_DONS2AE,
+	SFX_DONS2AF,
+	SFX_DONS2BA,
+	SFX_DONS2BB,
+	SFX_DONS2BC,
+	SFX_DONS2BD,
+	SFX_DONS2BE,
+	SFX_DONS2CA,
+	SFX_DONS2CB,
+	SFX_DONS2CC,
+	SFX_DONS2CD,
+	SFX_DONS2CE,
+	SFX_DONS2CF,
+	SFX_DONS2CG,
+	SFX_DONS2CH,
+	SFX_DONS2CI,
+	SFX_DONS2CJ,
+	SFX_DONS2CK,
+	SFX_DONS2CL,
+	SFX_DONS2CM,
+	SFX_DONS2CN,
+	SFX_DONS4AA,
+	SFX_DONS4AB,
+	SFX_DONS4AC,
+	SFX_DONS4AD,
+	SFX_DONS4AE,
+	SFX_DONS4AF,
+	SFX_DONS5AA,
+	SFX_DONS5AB,
+	SFX_DONS5AC,
+	SFX_DONS5AD,
+	SFX_DONS5AE,
+	SFX_DONS5BA,
+	SFX_DONS5BB,
+	SFX_DONS5BC,
+	SFX_DONS5BD,
+	SFX_DONS5BE,
+	SFX_DONS5CA,
+	SFX_DONS5DA,
+	SFX_DONS5EA,
+	SFX_DONS5EB,
+	SFX_DONS6AA,
+	SFX_DONS6AB,
+	SFX_DONS6AC,
+	SFX_DONS6AD,
+	SFX_DONS6AE,
+	SFX_DONS6AF,
+	SFX_DONS6AG,
+	SFX_DONS7AA,
+	SFX_DONS7AB,
+	SFX_DONS7AC,
+	SFX_DONS7AD,
+	SFX_DONS7AE,
+	SFX_DONS7AF,
+	SFX_DONS7AG,
+	SFX_DONS7CA,
+	SFX_DONS7CB,
+	SFX_DONS7CC,
+	SFX_DONS7CD,
+	SFX_DONS7CE,
+	SFX_DRKNOCK,
+	SFX_FAN_MAN1_BUMP_1,
+	SFX_FAN_MAN1_BUMP_2,
+	SFX_FAN_MAN1_BUMP_3,
+	SFX_FAN_MAN1_CHAT_1,
+	SFX_FAN_MAN1_CHAT_2,
+	SFX_FAN_MAN1_CHAT_3,
+	SFX_FAN_MAN1_CHAT_4,
+	SFX_FAN_MAN1_CRASH_CAR_1,
+	SFX_FAN_MAN1_CRASH_CAR_2,
+	SFX_FAN_MAN1_DODGE_1,
+	SFX_FAN_MAN1_DRIVER_BLOCKED_1,
+	SFX_FAN_MAN1_DRIVER_BLOCKED_2,
+	SFX_FAN_MAN1_FIGHT_1,
+	SFX_FAN_MAN1_FIGHT_2,
+	SFX_FAN_MAN1_FIGHT_3,
+	SFX_FAN_MAN1_GUN_THREATENED_1,
+	SFX_FAN_MAN1_GUN_THREATENED_2,
+	SFX_FAN_MAN1_JACKED_CAR_1,
+	SFX_FAN_MAN1_JACKED_CAR_2,
+	SFX_FAN_MAN1_JACKED_CAR_3,
+	SFX_FAN_MAN1_SHOCKED_1,
+	SFX_FAN_MAN2_BUMP_1,
+	SFX_FAN_MAN2_BUMP_2,
+	SFX_FAN_MAN2_BUMP_3,
+	SFX_FAN_MAN2_CHAT_1,
+	SFX_FAN_MAN2_CHAT_2,
+	SFX_FAN_MAN2_CHAT_3,
+	SFX_FAN_MAN2_CHAT_4,
+	SFX_FAN_MAN2_CRASH_CAR_1,
+	SFX_FAN_MAN2_CRASH_CAR_2,
+	SFX_FAN_MAN2_DODGE_1,
+	SFX_FAN_MAN2_DODGE_2,
+	SFX_FAN_MAN2_DRIVER_BLOCKED_1,
+	SFX_FAN_MAN2_DRIVER_BLOCKED_2,
+	SFX_FAN_MAN2_FIGHT_1,
+	SFX_FAN_MAN2_FIGHT_2,
+	SFX_FAN_MAN2_FIGHT_3,
+	SFX_FAN_MAN2_GUN_THREATENED_1,
+	SFX_FAN_MAN2_GUN_THREATENED_2,
+	SFX_FAN_MAN2_JACKED_CAR_1,
+	SFX_FAN_MAN2_JACKED_CAR_2,
+	SFX_FAN_MAN2_JACKED_CAR_3,
+	SFX_FAN_MAN2_SHOCKED_1,
+	SFX_FAN_WOM_BUMP_1,
+	SFX_FAN_WOM_BUMP_2,
+	SFX_FAN_WOM_BUMP_3,
+	SFX_FAN_WOM_CHAT_1,
+	SFX_FAN_WOM_CHAT_2,
+	SFX_FAN_WOM_CHAT_3,
+	SFX_FAN_WOM_CHAT_4,
+	SFX_FAN_WOM_CRASH_CAR_1,
+	SFX_FAN_WOM_CRASH_CAR_2,
+	SFX_FAN_WOM_DODGE_1,
+	SFX_FAN_WOM_DODGE_2,
+	SFX_FAN_WOM_DRIVER_BLOCKED_1,
+	SFX_FAN_WOM_DRIVER_BLOCKED_2,
+	SFX_FAN_WOM_FIGHT_1,
+	SFX_FAN_WOM_FIGHT_2,
+	SFX_FAN_WOM_FIGHT_3,
+	SFX_FAN_WOM_GUN_THREATENED_1,
+	SFX_FAN_WOM_GUN_THREATENED_2,
+	SFX_FAN_WOM_JACKED_CAR_1,
+	SFX_FAN_WOM_JACKED_CAR_2,
+	SFX_FAN_WOM_JACKED_CAR_3,
+	SFX_FAN_WOM_SHOCKED_1,
+	SFX_FATFEMALE01_BUMP_1,
+	SFX_FATFEMALE01_BUMP_2,
+	SFX_FATFEMALE01_BUMP_3,
+	SFX_FATFEMALE01_CHAT_1,
+	SFX_FATFEMALE01_CHAT_2,
+	SFX_FATFEMALE01_CHAT_3,
+	SFX_FATFEMALE01_CHAT_4,
+	SFX_FATFEMALE01_CRASH_CAR_1,
+	SFX_FATFEMALE01_CRASH_CAR_2,
+	SFX_FATFEMALE01_DODGE_1,
+	SFX_FATFEMALE01_DODGE_2,
+	SFX_FATFEMALE01_DRIVER_BLOCKED_1,
+	SFX_FATFEMALE01_DRIVER_BLOCKED_2,
+	SFX_FATFEMALE01_FIGHT_1,
+	SFX_FATFEMALE01_FIGHT_2,
+	SFX_FATFEMALE01_FIGHT_3,
+	SFX_FATFEMALE01_FIGHT_4,
+	SFX_FATFEMALE01_GUN_THREATENED_1,
+	SFX_FATFEMALE01_GUN_THREATENED_2,
+	SFX_FATFEMALE01_JACKED_CAR_1,
+	SFX_FATFEMALE01_JACKED_CAR_2,
+	SFX_FATFEMALE01_JACKED_CAR_3,
+	SFX_FATFEMALE01_SHOCKED_1,
+	SFX_FATFEMALE02_BUMP_1,
+	SFX_FATFEMALE02_BUMP_2,
+	SFX_FATFEMALE02_BUMP_3,
+	SFX_FATFEMALE02_CHAT_1,
+	SFX_FATFEMALE02_CHAT_2,
+	SFX_FATFEMALE02_CHAT_3,
+	SFX_FATFEMALE02_CHAT_4,
+	SFX_FATFEMALE02_CRASH_CAR_1,
+	SFX_FATFEMALE02_CRASH_CAR_2,
+	SFX_FATFEMALE02_DODGE_1,
+	SFX_FATFEMALE02_DODGE_2,
+	SFX_FATFEMALE02_DRIVER_BLOCKED_1,
+	SFX_FATFEMALE02_DRIVER_BLOCKED_2,
+	SFX_FATFEMALE02_FIGHT_1,
+	SFX_FATFEMALE02_FIGHT_2,
+	SFX_FATFEMALE02_FIGHT_3,
+	SFX_FATFEMALE02_GUN_THREATENED_1,
+	SFX_FATFEMALE02_GUN_THREATENED_2,
+	SFX_FATFEMALE02_JACKED_CAR_1,
+	SFX_FATFEMALE02_JACKED_CAR_2,
+	SFX_FATFEMALE02_JACKED_CAR_3,
+	SFX_FATFEMALE02_SHOCKED_1,
+	SFX_FATMALE_BUMP_1,
+	SFX_FATMALE_BUMP_2,
+	SFX_FATMALE_BUMP_3,
+	SFX_FATMALE_CHAT_1,
+	SFX_FATMALE_CHAT_2,
+	SFX_FATMALE_CHAT_3,
+	SFX_FATMALE_CHAT_4,
+	SFX_FATMALE_CRASH_CAR_1,
+	SFX_FATMALE_CRASH_CAR_2,
+	SFX_FATMALE_DODGE_1,
+	SFX_FATMALE_DODGE_2,
+	SFX_FATMALE_DRIVER_BLOCKED_1,
+	SFX_FATMALE_DRIVER_BLOCKED_2,
+	SFX_FATMALE_FIGHT_1,
+	SFX_FATMALE_FIGHT_2,
+	SFX_FATMALE_FIGHT_3,
+	SFX_FATMALE_GUN_THREATENED_1,
+	SFX_FATMALE_GUN_THREATENED_2,
+	SFX_FATMALE_JACKED_CAR_1,
+	SFX_FATMALE_JACKED_CAR_2,
+	SFX_FATMALE_JACKED_CAR_3,
+	SFX_FATMALE_SHOCKED_1,
+	SFX_FBI_VOICE_1_SHOOT_1,
+	SFX_FBI_VOICE_1_SHOOT_2,
+	SFX_FBI_VOICE_1_SHOOT_3,
+	SFX_FBI_VOICE_1_SHOOT_4,
+	SFX_FBI_VOICE_1_SHOOT_5,
+	SFX_FBI_VOICE_1_VAN_1,
+	SFX_FBI_VOICE_1_VAN_2,
+	SFX_FBI_VOICE_2_SHOOT_1,
+	SFX_FBI_VOICE_2_SHOOT_2,
+	SFX_FBI_VOICE_2_SHOOT_3,
+	SFX_FBI_VOICE_2_SHOOT_4,
+	SFX_FBI_VOICE_2_SHOOT_5,
+	SFX_FBI_VOICE_2_VAN_1,
+	SFX_FBI_VOICE_2_VAN_2,
+	SFX_FEMALE01_BUMP_1,
+	SFX_FEMALE01_BUMP_2,
+	SFX_FEMALE01_BUMP_3,
+	SFX_FEMALE01_CHAT_1,
+	SFX_FEMALE01_CHAT_2,
+	SFX_FEMALE01_CHAT_3,
+	SFX_FEMALE01_CHAT_4,
+	SFX_FEMALE01_CRASH_CAR_1,
+	SFX_FEMALE01_CRASH_CAR_2,
+	SFX_FEMALE01_DODGE_1,
+	SFX_FEMALE01_DODGE_2,
+	SFX_FEMALE01_DRIVER_BLOCKED_1,
+	SFX_FEMALE01_DRIVER_BLOCKED_2,
+	SFX_FEMALE01_FIGHT_1,
+	SFX_FEMALE01_FIGHT_2,
+	SFX_FEMALE01_FIGHT_3,
+	SFX_FEMALE01_GUN_THREATENED_1,
+	SFX_FEMALE01_GUN_THREATENED_2,
+	SFX_FEMALE01_SHOCKED_1,
+	SFX_FEMALE01_SPECIAL_CASE_1,
+	SFX_FEMALE01_SPECIAL_CASE_2,
+	SFX_FEMALE01_SPECIAL_CASE_3,
+	SFX_FEMALE02_BUMP_1,
+	SFX_FEMALE02_BUMP_2,
+	SFX_FEMALE02_CHAT_1,
+	SFX_FEMALE02_CHAT_2,
+	SFX_FEMALE02_CHAT_3,
+	SFX_FEMALE02_CRASH_CAR_1,
+	SFX_FEMALE02_DODGE_1,
+	SFX_FEMALE02_DODGE_2,
+	SFX_FEMALE02_DRIVER_BLOCKED_1,
+	SFX_FEMALE02_DRIVER_BLOCKED_2,
+	SFX_FEMALE02_FIGHT_1,
+	SFX_FEMALE02_FIGHT_2,
+	SFX_FEMALE02_GUN_THREATENED_1,
+	SFX_FEMALE02_GUN_THREATENED_2,
+	SFX_FEMALE02_JACKED_CAR_1,
+	SFX_FEMALE02_JACKED_CAR_2,
+	SFX_FEMALE02_JACKED_CAR_3,
+	SFX_FEMALE02_SHOCKED_1,
+	SFX_FEMALE03_BUMP_1,
+	SFX_FEMALE03_BUMP_2,
+	SFX_FEMALE03_BUMP_3,
+	SFX_FEMALE03_CHAT_1,
+	SFX_FEMALE03_CHAT_2,
+	SFX_FEMALE03_CRASH_CAR_1,
+	SFX_FEMALE03_CRASH_CAR_2,
+	SFX_FEMALE03_CRASH_CAR_3,
+	SFX_FEMALE03_DODGE_1,
+	SFX_FEMALE03_DODGE_2,
+	SFX_FEMALE03_DRIVER_BLOCKED_1,
+	SFX_FEMALE03_FIGHT_1,
+	SFX_FEMALE03_FIGHT_2,
+	SFX_FEMALE03_FIGHT_3,
+	SFX_FEMALE03_GUN_THREATENED_1,
+	SFX_FEMALE03_GUN_THREATENED_2,
+	SFX_FEMALE03_JACKED_CAR_1,
+	SFX_FEMALE03_JACKED_CAR_2,
+	SFX_FEMALE03_JACKED_CAR_3,
+	SFX_FEMALE03_SHOCKED_1,
+	SFX_FEMALE_DEATH_01,
+	SFX_FEMALE_DEATH_02,
+	SFX_FEMALE_DEATH_03,
+	SFX_FEMALE_DEATH_04,
+	SFX_FEMALE_DEATH_05,
+	SFX_FEMALE_DEATH_06,
+	SFX_FEMALE_DEATH_07,
+	SFX_FEMALE_DEATH_08,
+	SFX_FEMALE_DEATH_09,
+	SFX_FEMALE_DEATH_10,
+	SFX_FEMALE_DEATH_11,
+	SFX_FEMALE_DEATH_12,
+	SFX_FEMALE_DEATH_13,
+	SFX_FEMALE_DEATH_14,
+	SFX_FEMALE_DEATH_15,
+	SFX_FEMALE_DEATH_16,
+	SFX_FEMALE_PAIN_01,
+	SFX_FEMALE_PAIN_02,
+	SFX_FEMALE_PAIN_03,
+	SFX_FEMALE_PAIN_04,
+	SFX_FEMALE_PAIN_05,
+	SFX_FEMALE_PAIN_06,
+	SFX_FEMALE_PAIN_07,
+	SFX_FEMALE_PAIN_08,
+	SFX_FEMALE_PAIN_09,
+	SFX_FEMALE_PAIN_10,
+	SFX_FEMALE_PAIN_11,
+	SFX_FEMALE_PAIN_12,
+	SFX_FEMALE_PAIN_13,
+	SFX_FEMALE_PAIN_14,
+	SFX_FEMALE_PAIN_15,
+	SFX_FEMALE_PAIN_16,
+	SFX_FEMALE_PAIN_17,
+	SFX_FEMALE_PAIN_18,
+	SFX_FEMALE_PAIN_19,
+	SFX_FEMALE_PAIN_20,
+	SFX_FEMALE_PAIN_21,
+	SFX_FEMALE_PAIN_22,
+	SFX_FEMALE_PAIN_23,
+	SFX_FEMALE_PAIN_24,
+	SFX_FEMALE_PAIN_25,
+	SFX_FEMALE_PAIN_26,
+	SFX_FEMALE_PAIN_27,
+	SFX_FEMALE_PAIN_28,
+	SFX_FEMALE_PAIN_29,
+	SFX_FEMALE_PAIN_30,
+	SFX_FEMALE_PAIN_31,
+	SFX_FEMALE_PAIN_32,
+	SFX_FEMALE_PAIN_33,
+	SFX_FEMALE_PAIN_34,
+	SFX_FEMALE_PAIN_ON_FIRE_01,
+	SFX_FEMALE_PAIN_ON_FIRE_02,
+	SFX_FEMALE_PAIN_ON_FIRE_03,
+	SFX_FEMALE_PAIN_ON_FIRE_04,
+	SFX_FEMALE_PAIN_ON_FIRE_05,
+	SFX_FEMALE_PAIN_ON_FIRE_06,
+	SFX_FEMALE_PAIN_ON_FIRE_07,
+	SFX_FEMALE_PAIN_ON_FIRE_08,
+	SFX_FEMALE_PAIN_ON_FIRE_09,
+	SFX_FEMALE_PAIN_ON_FIRE_10,
+	SFX_FEMALE_PAIN_ON_FIRE_11,
+	SFX_FEMALE_PANIC_01,
+	SFX_FEMALE_PANIC_02,
+	SFX_FEMALE_PANIC_03,
+	SFX_FEMALE_PANIC_04,
+	SFX_FEMALE_PANIC_05,
+	SFX_FEMALE_PANIC_06,
+	SFX_FEMALE_PANIC_07,
+	SFX_FEMALE_PANIC_08,
+	SFX_FEMALE_PANIC_09,
+	SFX_FEMALE_PANIC_10,
+	SFX_FEMALE_PANIC_11,
+	SFX_FEMALE_PANIC_12,
+	SFX_FEMALE_PANIC_13,
+	SFX_FEMALE_SEX_01,
+	SFX_FEMALE_SEX_02,
+	SFX_FEMALE_SEX_03,
+	SFX_FEMALE_SEX_04,
+	SFX_FEMALE_SEX_05,
+	SFX_FEMALE_SEX_06,
+	SFX_FEMALE_SEX_07,
+	SFX_FEMALE_SEX_08,
+	SFX_FEMALE_SEX_09,
+	SFX_FEMALE_SEX_10,
+	SFX_FEMALE_SEX_11,
+	SFX_GANG01_BUMP_1,
+	SFX_GANG01_BUMP_2,
+	SFX_GANG01_BUMP_3,
+	SFX_GANG01_CHAT_1,
+	SFX_GANG01_CHAT_2,
+	SFX_GANG01_CHAT_3,
+	SFX_GANG01_CRASH_CAR_1,
+	SFX_GANG01_CRASH_CAR_2,
+	SFX_GANG01_DODGE_1,
+	SFX_GANG01_DODGE_2,
+	SFX_GANG01_DRIVER_BLOCKED_1,
+	SFX_GANG01_DRIVER_BLOCKED_2,
+	SFX_GANG01_FIGHT_1,
+	SFX_GANG01_FIGHT_2,
+	SFX_GANG01_GUN_THREATENED_1,
+	SFX_GANG01_GUN_THREATENED_2,
+	SFX_GANG01_JACKED_CAR_1,
+	SFX_GANG01_JACKED_CAR_2,
+	SFX_GANG01_JACKING_1,
+	SFX_GANG01_JACKING_2,
+	SFX_GANG01_SHOOT_1,
+	SFX_GANG01_SHOOT_2,
+	SFX_GANG01_SHOOT_3,
+	SFX_GANG01_SHOOT_4,
+	SFX_GANG01_SHOOT_5,
+	SFX_GANG02_BUMP_1,
+	SFX_GANG02_BUMP_2,
+	SFX_GANG02_BUMP_3,
+	SFX_GANG02_CHAT_1,
+	SFX_GANG02_CHAT_2,
+	SFX_GANG02_CRASH_CAR_1,
+	SFX_GANG02_CRASH_CAR_2,
+	SFX_GANG02_DODGE_1,
+	SFX_GANG02_DODGE_2,
+	SFX_GANG02_DRIVER_BLOCKED_1,
+	SFX_GANG02_DRIVER_BLOCKED_2,
+	SFX_GANG02_FIGHT_1,
+	SFX_GANG02_FIGHT_2,
+	SFX_GANG02_GUN_THREATENED_1,
+	SFX_GANG02_GUN_THREATENED_2,
+	SFX_GANG02_JACKED_CAR_1,
+	SFX_GANG02_JACKED_CAR_2,
+	SFX_GANG02_JACKING_1,
+	SFX_GANG02_JACKING_2,
+	SFX_GANG02_SHOOT_1,
+	SFX_GANG02_SHOOT_2,
+	SFX_GANG02_SHOOT_3,
+	SFX_GANG02_SHOOT_4,
+	SFX_GANG02_SHOOT_5,
+	SFX_GANG03_BUMP_1,
+	SFX_GANG03_BUMP_2,
+	SFX_GANG03_BUMP_3,
+	SFX_GANG03_CHAT_1,
+	SFX_GANG03_CHAT_2,
+	SFX_GANG03_CHAT_3,
+	SFX_GANG03_CHAT_4,
+	SFX_GANG03_CRASH_CAR_1,
+	SFX_GANG03_CRASH_CAR_2,
+	SFX_GANG03_CRASH_CAR_3,
+	SFX_GANG03_DODGE_1,
+	SFX_GANG03_DODGE_2,
+	SFX_GANG03_DRIVER_BLOCKED_1,
+	SFX_GANG03_DRIVER_BLOCKED_2,
+	SFX_GANG03_FIGHT_1,
+	SFX_GANG03_FIGHT_2,
+	SFX_GANG03_FIGHT_3,
+	SFX_GANG03_GUN_THREATENED_1,
+	SFX_GANG03_GUN_THREATENED_2,
+	SFX_GANG03_JACKED_CAR_1,
+	SFX_GANG03_JACKED_CAR_2,
+	SFX_GANG03_SHOOT_1,
+	SFX_GANG03_SHOOT_2,
+	SFX_GANG03_SHOOT_3,
+	SFX_GANG03_SHOOT_4,
+	SFX_GANG04_BUMP_1,
+	SFX_GANG04_BUMP_2,
+	SFX_GANG04_BUMP_3,
+	SFX_GANG04_CHAT_1,
+	SFX_GANG04_CHAT_2,
+	SFX_GANG04_CRASH_CAR_1,
+	SFX_GANG04_CRASH_CAR_2,
+	SFX_GANG04_DODGE_1,
+	SFX_GANG04_DODGE_2,
+	SFX_GANG04_DRIVER_BLOCKED_1,
+	SFX_GANG04_DRIVER_BLOCKED_2,
+	SFX_GANG04_FIGHT_1,
+	SFX_GANG04_FIGHT_2,
+	SFX_GANG04_GUN_THREATENED_1,
+	SFX_GANG04_GUN_THREATENED_2,
+	SFX_GANG04_JACKED_CAR_1,
+	SFX_GANG04_JACKED_CAR_2,
+	SFX_GANG04_JACKING_1,
+	SFX_GANG04_JACKING_2,
+	SFX_GANG04_SHOOT_1,
+	SFX_GANG04_SHOOT_2,
+	SFX_GANG04_SHOOT_3,
+	SFX_GANG04_SHOOT_4,
+	SFX_GANG04_SHOOT_5,
+	SFX_GANG05_BUMP_1,
+	SFX_GANG05_BUMP_2,
+	SFX_GANG05_BUMP_3,
+	SFX_GANG05_CHAT_1,
+	SFX_GANG05_CHAT_2,
+	SFX_GANG05_CHAT_3,
+	SFX_GANG05_CRASH_CAR_1,
+	SFX_GANG05_CRASH_CAR_2,
+	SFX_GANG05_DODGE_1,
+	SFX_GANG05_DODGE_2,
+	SFX_GANG05_DRIVER_BLOCKED_1,
+	SFX_GANG05_DRIVER_BLOCKED_2,
+	SFX_GANG05_FIGHT_1,
+	SFX_GANG05_FIGHT_2,
+	SFX_GANG05_GUN_THREATENED_1,
+	SFX_GANG05_GUN_THREATENED_2,
+	SFX_GANG05_JACKED_CAR_1,
+	SFX_GANG05_JACKED_CAR_2,
+	SFX_GANG05_JACKING_1,
+	SFX_GANG05_JACKING_2,
+	SFX_GANG05_SHOOT_1,
+	SFX_GANG05_SHOOT_2,
+	SFX_GANG05_SHOOT_3,
+	SFX_GANG05_SHOOT_4,
+	SFX_GANG06_BUMP_1,
+	SFX_GANG06_BUMP_2,
+	SFX_GANG06_BUMP_3,
+	SFX_GANG06_CHAT_1,
+	SFX_GANG06_CHAT_2,
+	SFX_GANG06_CHAT_3,
+	SFX_GANG06_CRASH_CAR_1,
+	SFX_GANG06_CRASH_CAR_2,
+	SFX_GANG06_DODGE_1,
+	SFX_GANG06_DODGE_2,
+	SFX_GANG06_DRIVER_BLOCKED_1,
+	SFX_GANG06_DRIVER_BLOCKED_2,
+	SFX_GANG06_FIGHT_1,
+	SFX_GANG06_FIGHT_2,
+	SFX_GANG06_GUN_THREATENED_1,
+	SFX_GANG06_GUN_THREATENED_2,
+	SFX_GANG06_JACKED_CAR_1,
+	SFX_GANG06_JACKED_CAR_2,
+	SFX_GANG06_JACKING_1,
+	SFX_GANG06_JACKING_2,
+	SFX_GANG06_SHOOT_1,
+	SFX_GANG06_SHOOT_2,
+	SFX_GANG06_SHOOT_3,
+	SFX_GANG06_SHOOT_4,
+	SFX_GANG06_SHOOT_5,
+	SFX_GANG07_BUMP_1,
+	SFX_GANG07_BUMP_2,
+	SFX_GANG07_BUMP_3,
+	SFX_GANG07_CHAT_1,
+	SFX_GANG07_CHAT_2,
+	SFX_GANG07_CRASH_CAR_1,
+	SFX_GANG07_CRASH_CAR_2,
+	SFX_GANG07_DODGE_1,
+	SFX_GANG07_DODGE_2,
+	SFX_GANG07_DRIVER_BLOCKED_1,
+	SFX_GANG07_DRIVER_BLOCKED_2,
+	SFX_GANG07_FIGHT_1,
+	SFX_GANG07_FIGHT_2,
+	SFX_GANG07_GUN_THREATENED_1,
+	SFX_GANG07_GUN_THREATENED_2,
+	SFX_GANG07_JACKED_CAR_1,
+	SFX_GANG07_JACKED_CAR_2,
+	SFX_GANG07_JACKING_1,
+	SFX_GANG07_SHOOT_1,
+	SFX_GANG07_SHOOT_2,
+	SFX_GANG07_SHOOT_3,
+	SFX_GANG07_SHOOT_4,
+	SFX_GANG08_BUMP_1,
+	SFX_GANG08_BUMP_2,
+	SFX_GANG08_BUMP_3,
+	SFX_GANG08_CHAT_1,
+	SFX_GANG08_CHAT_2,
+	SFX_GANG08_CRASH_CAR_1,
+	SFX_GANG08_CRASH_CAR_2,
+	SFX_GANG08_DODGE_1,
+	SFX_GANG08_DODGE_2,
+	SFX_GANG08_DRIVER_BLOCKED_1,
+	SFX_GANG08_DRIVER_BLOCKED_2,
+	SFX_GANG08_FIGHT_1,
+	SFX_GANG08_FIGHT_2,
+	SFX_GANG08_GUN_THREATENED_1,
+	SFX_GANG08_GUN_THREATENED_2,
+	SFX_GANG08_JACKED_CAR_1,
+	SFX_GANG08_JACKED_CAR_2,
+	SFX_GANG08_JACKING_1,
+	SFX_GANG08_JACKING_2,
+	SFX_GANG08_SHOOT_1,
+	SFX_GANG08_SHOOT_2,
+	SFX_GANG08_SHOOT_3,
+	SFX_GANG08_SHOOT_4,
+	SFX_GANG08_SHOOT_5,
+	SFX_GANG09_BUMP_1,
+	SFX_GANG09_BUMP_2,
+	SFX_GANG09_BUMP_3,
+	SFX_GANG09_CHAT_1,
+	SFX_GANG09_CHAT_2,
+	SFX_GANG09_CHAT_3,
+	SFX_GANG09_CRASH_CAR_1,
+	SFX_GANG09_CRASH_CAR_2,
+	SFX_GANG09_DODGE_1,
+	SFX_GANG09_DODGE_2,
+	SFX_GANG09_DRIVER_BLOCKED_1,
+	SFX_GANG09_DRIVER_BLOCKED_2,
+	SFX_GANG09_FIGHT_1,
+	SFX_GANG09_FIGHT_2,
+	SFX_GANG09_GUN_THREATENED_1,
+	SFX_GANG09_GUN_THREATENED_2,
+	SFX_GANG09_JACKED_CAR_1,
+	SFX_GANG09_JACKED_CAR_2,
+	SFX_GANG09_JACKING_1,
+	SFX_GANG09_JACKING_2,
+	SFX_GANG09_SHOOT_1,
+	SFX_GANG09_SHOOT_2,
+	SFX_GANG09_SHOOT_3,
+	SFX_GANG09_SHOOT_4,
+	SFX_GANG09_SHOOT_5,
+	SFX_GANG10_BUMP_1,
+	SFX_GANG10_BUMP_2,
+	SFX_GANG10_BUMP_3,
+	SFX_GANG10_CHAT_1,
+	SFX_GANG10_CHAT_2,
+	SFX_GANG10_CHAT_3,
+	SFX_GANG10_CRASH_CAR_1,
+	SFX_GANG10_CRASH_CAR_2,
+	SFX_GANG10_DODGE_1,
+	SFX_GANG10_DODGE_2,
+	SFX_GANG10_DRIVER_BLOCKED_1,
+	SFX_GANG10_DRIVER_BLOCKED_2,
+	SFX_GANG10_FIGHT_1,
+	SFX_GANG10_FIGHT_2,
+	SFX_GANG10_GUN_THREATENED_1,
+	SFX_GANG10_GUN_THREATENED_2,
+	SFX_GANG10_JACKED_CAR_1,
+	SFX_GANG10_JACKED_CAR_2,
+	SFX_GANG10_JACKING_1,
+	SFX_GANG10_JACKING_2,
+	SFX_GANG10_SHOOT_1,
+	SFX_GANG10_SHOOT_2,
+	SFX_GANG10_SHOOT_3,
+	SFX_GANG10_SHOOT_4,
+	SFX_GANG10_SHOOT_5,
+	SFX_GANG11_BUMP_1,
+	SFX_GANG11_BUMP_2,
+	SFX_GANG11_BUMP_3,
+	SFX_GANG11_CHAT_1,
+	SFX_GANG11_CHAT_2,
+	SFX_GANG11_CRASH_CAR_1,
+	SFX_GANG11_CRASH_CAR_2,
+	SFX_GANG11_DODGE_1,
+	SFX_GANG11_DODGE_2,
+	SFX_GANG11_DRIVER_BLOCKED_1,
+	SFX_GANG11_DRIVER_BLOCKED_2,
+	SFX_GANG11_FIGHT_1,
+	SFX_GANG11_FIGHT_2,
+	SFX_GANG11_GUN_THREATENED_1,
+	SFX_GANG11_GUN_THREATENED_2,
+	SFX_GANG11_JACKED_CAR_1,
+	SFX_GANG11_JACKED_CAR_2,
+	SFX_GANG11_JACKING_1,
+	SFX_GANG11_JACKING_2,
+	SFX_GANG11_SHOOT_1,
+	SFX_GANG11_SHOOT_2,
+	SFX_GANG11_SHOOT_3,
+	SFX_GANG11_SHOOT_4,
+	SFX_GANG11_SHOOT_5,
+	SFX_GANG12_BUMP_1,
+	SFX_GANG12_BUMP_2,
+	SFX_GANG12_BUMP_3,
+	SFX_GANG12_CHAT_1,
+	SFX_GANG12_CHAT_2,
+	SFX_GANG12_CHAT_3,
+	SFX_GANG12_CRASH_CAR_1,
+	SFX_GANG12_CRASH_CAR_2,
+	SFX_GANG12_DODGE_1,
+	SFX_GANG12_DODGE_2,
+	SFX_GANG12_DRIVER_BLOCKED_1,
+	SFX_GANG12_DRIVER_BLOCKED_2,
+	SFX_GANG12_FIGHT_1,
+	SFX_GANG12_FIGHT_2,
+	SFX_GANG12_GUN_THREATENED_1,
+	SFX_GANG12_GUN_THREATENED_2,
+	SFX_GANG12_JACKED_CAR_1,
+	SFX_GANG12_JACKED_CAR_2,
+	SFX_GANG12_JACKING_1,
+	SFX_GANG12_JACKING_2,
+	SFX_GANG12_SHOOT_1,
+	SFX_GANG12_SHOOT_2,
+	SFX_GANG12_SHOOT_3,
+	SFX_GANG12_SHOOT_4,
+	SFX_GANG12_SHOOT_5,
+	SFX_GANG13_BUMP_1,
+	SFX_GANG13_BUMP_2,
+	SFX_GANG13_BUMP_3,
+	SFX_GANG13_CHAT_1,
+	SFX_GANG13_CHAT_2,
+	SFX_GANG13_CRASH_CAR_1,
+	SFX_GANG13_CRASH_CAR_2,
+	SFX_GANG13_DODGE_1,
+	SFX_GANG13_DODGE_2,
+	SFX_GANG13_DRIVER_BLOCKED_1,
+	SFX_GANG13_DRIVER_BLOCKED_2,
+	SFX_GANG13_FIGHT_1,
+	SFX_GANG13_FIGHT_2,
+	SFX_GANG13_GUN_THREATENED_1,
+	SFX_GANG13_GUN_THREATENED_2,
+	SFX_GANG13_JACKED_CAR_1,
+	SFX_GANG13_JACKED_CAR_2,
+	SFX_GANG13_JACKING_1,
+	SFX_GANG13_JACKING_2,
+	SFX_GANG13_SHOOT_1,
+	SFX_GANG13_SHOOT_2,
+	SFX_GANG13_SHOOT_3,
+	SFX_GANG13_SHOOT_4,
+	SFX_GANG13_SHOOT_5,
+	SFX_GANG14_BUMP_1,
+	SFX_GANG14_BUMP_2,
+	SFX_GANG14_BUMP_3,
+	SFX_GANG14_CHAT_1,
+	SFX_GANG14_CHAT_2,
+	SFX_GANG14_CHAT_3,
+	SFX_GANG14_CRASH_CAR_1,
+	SFX_GANG14_CRASH_CAR_2,
+	SFX_GANG14_DODGE_1,
+	SFX_GANG14_DODGE_2,
+	SFX_GANG14_DRIVER_BLOCKED_1,
+	SFX_GANG14_DRIVER_BLOCKED_2,
+	SFX_GANG14_FIGHT_1,
+	SFX_GANG14_FIGHT_2,
+	SFX_GANG14_GUN_THREATENED_1,
+	SFX_GANG14_GUN_THREATENED_2,
+	SFX_GANG14_JACKED_CAR_1,
+	SFX_GANG14_JACKED_CAR_2,
+	SFX_GANG14_JACKING_1,
+	SFX_GANG14_JACKING_2,
+	SFX_GANG14_SHOOT_1,
+	SFX_GANG14_SHOOT_2,
+	SFX_GANG14_SHOOT_3,
+	SFX_GANG14_SHOOT_4,
+	SFX_GANG14_SHOOT_5,
+	SFX_GANG15_BUMP_1,
+	SFX_GANG15_BUMP_2,
+	SFX_GANG15_BUMP_3,
+	SFX_GANG15_CHAT_1,
+	SFX_GANG15_CHAT_2,
+	SFX_GANG15_CHAT_3,
+	SFX_GANG15_CRASH_CAR_1,
+	SFX_GANG15_CRASH_CAR_2,
+	SFX_GANG15_DODGE_1,
+	SFX_GANG15_DODGE_2,
+	SFX_GANG15_DRIVER_BLOCKED_1,
+	SFX_GANG15_DRIVER_BLOCKED_2,
+	SFX_GANG15_FIGHT_1,
+	SFX_GANG15_FIGHT_2,
+	SFX_GANG15_GUN_THREATENED_1,
+	SFX_GANG15_GUN_THREATENED_2,
+	SFX_GANG15_JACKING_1,
+	SFX_GANG15_JACKING_2,
+	SFX_GANG15_JACKING_CAR_1,
+	SFX_GANG15_JACKING_CAR_2,
+	SFX_GANG15_SHOOT_1,
+	SFX_GANG15_SHOOT_2,
+	SFX_GANG15_SHOOT_3,
+	SFX_GANG15_SHOOT_4,
+	SFX_GANG16_BUMP_1,
+	SFX_GANG16_BUMP_2,
+	SFX_GANG16_BUMP_3,
+	SFX_GANG16_CHAT_1,
+	SFX_GANG16_CHAT_2,
+	SFX_GANG16_CRASH_CAR_1,
+	SFX_GANG16_CRASH_CAR_2,
+	SFX_GANG16_DODGE_1,
+	SFX_GANG16_DODGE_2,
+	SFX_GANG16_DRIVER_BLOCKED_1,
+	SFX_GANG16_DRIVER_BLOCKED_2,
+	SFX_GANG16_FIGHT_1,
+	SFX_GANG16_FIGHT_2,
+	SFX_GANG16_GUN_THREATENED_1,
+	SFX_GANG16_GUN_THREATENED_2,
+	SFX_GANG16_JACKED_CAR_1,
+	SFX_GANG16_JACKED_CAR_2,
+	SFX_GANG16_JACKING_1,
+	SFX_GANG16_JACKING_2,
+	SFX_GANG16_SHOOT_1,
+	SFX_GANG16_SHOOT_2,
+	SFX_GANG16_SHOOT_3,
+	SFX_GANG16_SHOOT_4,
+	SFX_GANG16_SHOOT_5,
+	SFX_GANG17_BUMP_1,
+	SFX_GANG17_BUMP_2,
+	SFX_GANG17_BUMP_3,
+	SFX_GANG17_CHAT_1,
+	SFX_GANG17_CHAT_2,
+	SFX_GANG17_CRASH_CAR_1,
+	SFX_GANG17_CRASH_CAR_2,
+	SFX_GANG17_DODGE_1,
+	SFX_GANG17_DODGE_2,
+	SFX_GANG17_DRIVER_BLOCKED_1,
+	SFX_GANG17_DRIVER_BLOCKED_2,
+	SFX_GANG17_FIGHT_1,
+	SFX_GANG17_FIGHT_2,
+	SFX_GANG17_GUN_THREATENED_1,
+	SFX_GANG17_GUN_THREATENED_2,
+	SFX_GANG17_JACKED_CAR_1,
+	SFX_GANG17_JACKED_CAR_2,
+	SFX_GANG17_JACKING_1,
+	SFX_GANG17_JACKING_2,
+	SFX_GANG17_SHOOT_1,
+	SFX_GANG17_SHOOT_2,
+	SFX_GANG17_SHOOT_3,
+	SFX_GANG17_SHOOT_4,
+	SFX_GANG17_SHOOT_5,
+	SFX_GANG18_BUMP_1,
+	SFX_GANG18_BUMP_2,
+	SFX_GANG18_BUMP_3,
+	SFX_GANG18_CHAT_1,
+	SFX_GANG18_CHAT_2,
+	SFX_GANG18_CHAT_3,
+	SFX_GANG18_CRASH_CAR_1,
+	SFX_GANG18_CRASH_CAR_2,
+	SFX_GANG18_DODGE_1,
+	SFX_GANG18_DODGE_2,
+	SFX_GANG18_DRIVER_BLOCKED_1,
+	SFX_GANG18_DRIVER_BLOCKED_2,
+	SFX_GANG18_FIGHT_1,
+	SFX_GANG18_FIGHT_2,
+	SFX_GANG18_GUN_THREATENED_1,
+	SFX_GANG18_GUN_THREATENED_2,
+	SFX_GANG18_JACKED_CAR_1,
+	SFX_GANG18_JACKED_CAR_2,
+	SFX_GANG18_JACKING_1,
+	SFX_GANG18_JACKING_2,
+	SFX_GANG18_SHOOT_1,
+	SFX_GANG18_SHOOT_2,
+	SFX_GANG18_SHOOT_3,
+	SFX_GANG18_SHOOT_4,
+	SFX_GRDANG1_BUMP_1,
+	SFX_GRDANG1_BUMP_2,
+	SFX_GRDANG1_BUMP_3,
+	SFX_GRDANG1_CHAT_1,
+	SFX_GRDANG1_CHAT_2,
+	SFX_GRDANG1_CHAT_3,
+	SFX_GRDANG1_CRASH_CAR_1,
+	SFX_GRDANG1_CRASH_CAR_2,
+	SFX_GRDANG1_DODGE_1,
+	SFX_GRDANG1_DODGE_2,
+	SFX_GRDANG1_DRIVER_BLOCKED_1,
+	SFX_GRDANG1_DRIVER_BLOCKED_2,
+	SFX_GRDANG1_FIGHT_1,
+	SFX_GRDANG1_FIGHT_2,
+	SFX_GRDANG1_FIGHT_3,
+	SFX_GRDANG1_GUN_THREATENED_1,
+	SFX_GRDANG1_GUN_THREATENED_2,
+	SFX_GRDANG1_JACKED_CAR_1,
+	SFX_GRDANG1_JACKED_CAR_2,
+	SFX_GRDANG1_JACKED_CAR_3,
+	SFX_GRDANG1_SHOCKED_1,
+	SFX_GRDANG1_SPECIAL_CASE_1,
+	SFX_GRDANG1_SPECIAL_CASE_2,
+	SFX_GRDANG1_SPECIAL_CASE_3,
+	SFX_GRDANG2_BUMP_1,
+	SFX_GRDANG2_BUMP_2,
+	SFX_GRDANG2_BUMP_3,
+	SFX_GRDANG2_CHAT_1,
+	SFX_GRDANG2_CHAT_2,
+	SFX_GRDANG2_CHAT_3,
+	SFX_GRDANG2_CHAT_4,
+	SFX_GRDANG2_CRASH_CAR_1,
+	SFX_GRDANG2_CRASH_CAR_2,
+	SFX_GRDANG2_DODGE_1,
+	SFX_GRDANG2_DODGE_2,
+	SFX_GRDANG2_DRIVER_BLOCKED_1,
+	SFX_GRDANG2_DRIVER_BLOCKED_2,
+	SFX_GRDANG2_FIGHT_1,
+	SFX_GRDANG2_FIGHT_2,
+	SFX_GRDANG2_FIGHT_3,
+	SFX_GRDANG2_GUN_THREATENED_1,
+	SFX_GRDANG2_GUN_THREATENED_2,
+	SFX_GRDANG2_JACKED_CAR_1,
+	SFX_GRDANG2_JACKED_CAR_2,
+	SFX_GRDANG2_JACKED_CAR_3,
+	SFX_GRDANG2_SHOCKED_1,
+	SFX_HIT1_AA,
+	SFX_HIT1_AB,
+	SFX_HIT1_AC,
+	SFX_HIT1_AD,
+	SFX_HIT1_AE,
+	SFX_HIT1_AF,
+	SFX_HIT1_AG,
+	SFX_HIT2_AA,
+	SFX_HIT2_AB,
+	SFX_HIT2_AC,
+	SFX_HIT2_AD,
+	SFX_HIT2_AE,
+	SFX_HIT2_AF,
+	SFX_HIT2_AG,
+	SFX_HIT2_AH,
+	SFX_HIT3_AA,
+	SFX_HIT3_AB,
+	SFX_HIT3_AC,
+	SFX_HIT3_AD,
+	SFX_HIT3_AE,
+	SFX_HIT3_AF,
+	SFX_HIT3_AG,
+	SFX_HITM_AA,
+	SFX_HITM_AB,
+	SFX_HITM_AC,
+	SFX_HITM_AD,
+	SFX_HOS_MAN_BUMP_1,
+	SFX_HOS_MAN_BUMP_2,
+	SFX_HOS_MAN_BUMP_3,
+	SFX_HOS_MAN_CHAT_1,
+	SFX_HOS_MAN_CHAT_2,
+	SFX_HOS_MAN_CHAT_3,
+	SFX_HOS_MAN_CRASH_CAR_1,
+	SFX_HOS_MAN_CRASH_CAR_2,
+	SFX_HOS_MAN_DODGE_1,
+	SFX_HOS_MAN_DODGE_2,
+	SFX_HOS_MAN_DRIVER_BLOCKED_1,
+	SFX_HOS_MAN_DRIVER_BLOCKED_2,
+	SFX_HOS_MAN_FIGHT_1,
+	SFX_HOS_MAN_FIGHT_2,
+	SFX_HOS_MAN_FIGHT_3,
+	SFX_HOS_MAN_GUN_THREATENED_1,
+	SFX_HOS_MAN_GUN_THREATENED_2,
+	SFX_HOS_MAN_JACKED_CAR_1,
+	SFX_HOS_MAN_JACKED_CAR_2,
+	SFX_HOS_MAN_JACKED_CAR_3,
+	SFX_HOS_MAN_SHOCKED_1,
+	SFX_HOS_WOM_BUMP_1,
+	SFX_HOS_WOM_BUMP_2,
+	SFX_HOS_WOM_BUMP_3,
+	SFX_HOS_WOM_CHAT_1,
+	SFX_HOS_WOM_CHAT_2,
+	SFX_HOS_WOM_CHAT_3,
+	SFX_HOS_WOM_CRASH_CAR_1,
+	SFX_HOS_WOM_CRASH_CAR_2,
+	SFX_HOS_WOM_DODGE_1,
+	SFX_HOS_WOM_DODGE_2,
+	SFX_HOS_WOM_DRIVER_BLOCKED_1,
+	SFX_HOS_WOM_DRIVER_BLOCKED_2,
+	SFX_HOS_WOM_FIGHT_1,
+	SFX_HOS_WOM_FIGHT_2,
+	SFX_HOS_WOM_FIGHT_3,
+	SFX_HOS_WOM_GUN_THREATENED_1,
+	SFX_HOS_WOM_GUN_THREATENED_2,
+	SFX_HOS_WOM_JACKED_CAR_1,
+	SFX_HOS_WOM_JACKED_CAR_2,
+	SFX_HOS_WOM_JACKED_CAR_3,
+	SFX_HOS_WOM_SHOCKED_1,
+	SFX_JDT1_BA,
+	SFX_JDT1_BB,
+	SFX_JDT1_CA,
+	SFX_JDT1_CB,
+	SFX_JDT1_DA,
+	SFX_JDT1_DB,
+	SFX_JDT1_DC,
+	SFX_JDT1_DD,
+	SFX_JDT1_DE,
+	SFX_JDT1_DF,
+	SFX_JDT1_DG,
+	SFX_JDT1_DH,
+	SFX_JDT1_DI,
+	SFX_JDT1_DJ,
+	SFX_JDT1_EA,
+	SFX_JDT1_EB,
+	SFX_JDT1_EC,
+	SFX_JDT1_ED,
+	SFX_JDT1_EE,
+	SFX_JDT1_FA,
+	SFX_JDT1_FB,
+	SFX_JDT1_FC,
+	SFX_JDT1_FD,
+	SFX_JDT1_FE,
+	SFX_JDT1_FF,
+	SFX_JDT1_GA,
+	SFX_JDT1_HA,
+	SFX_JDT1_HB,
+	SFX_JDT1_HC,
+	SFX_JDT1_HD,
+	SFX_JDT1_HE,
+	SFX_JDT1_HF,
+	SFX_JDT1_IA,
+	SFX_JDT1_JA,
+	SFX_JDT1_JB,
+	SFX_JDT1_KA,
+	SFX_JDT1_KB,
+	SFX_JDT1_KC,
+	SFX_JDT1_KD,
+	SFX_JDT1_KE,
+	SFX_JDT1_KF,
+	SFX_JDT1_LA,
+	SFX_JDT1_LB,
+	SFX_JDT1_MA,
+	SFX_JDT1_MB,
+	SFX_JDT1_MC,
+	SFX_JDT1_MD,
+	SFX_JDT1_ME,
+	SFX_JDT1_MF,
+	SFX_JDT1_MG,
+	SFX_JDT1_MH,
+	SFX_JDT2_AA,
+	SFX_JDT2_AB,
+	SFX_JDT2_AC,
+	SFX_JDT2_AD,
+	SFX_JDT2_AE,
+	SFX_JDT2_AF,
+	SFX_JDT2_AG,
+	SFX_JDT2_AH,
+	SFX_JDT2_BA,
+	SFX_JDT2_BB,
+	SFX_JDT2_BC,
+	SFX_JDT2_CA,
+	SFX_JDT2_CB,
+	SFX_JDT2_DA,
+	SFX_JDT2_DC,
+	SFX_JDT2_DD,
+	SFX_JDT2_DE,
+	SFX_JDT2_DF,
+	SFX_JDT3_AA,
+	SFX_JDT3_AB,
+	SFX_JDT3_AC,
+	SFX_JDT3_AD,
+	SFX_JDT3_AE,
+	SFX_JDT3_AG,
+	SFX_JDT3_AH,
+	SFX_JDT3_BA,
+	SFX_JDT3_BB,
+	SFX_JDT3_BC,
+	SFX_JDT3_BD,
+	SFX_JDT3_BE,
+	SFX_JDT3_BF,
+	SFX_JDT4_AA,
+	SFX_JDT4_AB,
+	SFX_JDT4_AC,
+	SFX_JDT4_AD,
+	SFX_JDT4_AE,
+	SFX_JDT4_AF,
+	SFX_JDT4_BA,
+	SFX_JDT4_BB,
+	SFX_JDT4_BC,
+	SFX_JDT5_BA,
+	SFX_JDT5_CA,
+	SFX_JDT5_CC,
+	SFX_JDT5_CD,
+	SFX_JDT5_CE,
+	SFX_JDT5_CG,
+	SFX_JDT5_CI,
+	SFX_JDT5_DA,
+	SFX_JDT5_EA,
+	SFX_JDT5_EB,
+	SFX_JDT5_EC,
+	SFX_JDT5_ED,
+	SFX_JDT5_EE,
+	SFX_JDT5_FA,
+	SFX_JDT5_FB,
+	SFX_JDT5_FC,
+	SFX_JDT5_GA,
+	SFX_JDT5_GB,
+	SFX_JDT6_AA,
+	SFX_JDT6_AB,
+	SFX_JDT6_AC,
+	SFX_JDT6_AE,
+	SFX_JDT6_AF,
+	SFX_JDT6_AG,
+	SFX_JDT6_AH,
+	SFX_JDT6_BA,
+	SFX_JDT6_BB,
+	SFX_JDT6_BC,
+	SFX_JDT6_BD,
+	SFX_JDT6_BE,
+	SFX_JDT6_BF,
+	SFX_JDT6_BG,
+	SFX_JDT6_CA,
+	SFX_JDT6_CB,
+	SFX_JDT6_DA,
+	SFX_JDT7_AA,
+	SFX_JDT7_AB,
+	SFX_JDT7_AC,
+	SFX_JDT7_AD,
+	SFX_JDT7_AE,
+	SFX_JDT7_AF,
+	SFX_JDT7_AG,
+	SFX_JDT7_BA,
+	SFX_JDT7_BB,
+	SFX_JDT7_BC,
+	SFX_JDT7_CA,
+	SFX_JDT7_CB,
+	SFX_JDT7_CC,
+	SFX_JDT7_CD,
+	SFX_JDT8_AA,
+	SFX_JDT8_AB,
+	SFX_JDT8_AC,
+	SFX_JDT8_AD,
+	SFX_JDT8_AE,
+	SFX_JDT8_AF,
+	SFX_JDT8_AG,
+	SFX_JDT8_AH,
+	SFX_JDT8_AI,
+	SFX_JDT8_BA,
+	SFX_JDT8_CA,
+	SFX_JDT8_CB,
+	SFX_JDT8_DA,
+	SFX_JDT8_DB,
+	SFX_JDT8_DC,
+	SFX_JDT8_DD,
+	SFX_JDT8_DE,
+	SFX_JDT8_DF,
+	SFX_JDT8_DG,
+	SFX_JDT8_EA,
+	SFX_JDT8_EB,
+	SFX_JDT8_EC,
+	SFX_JDT8_ED,
+	SFX_JDT8_EE,
+	SFX_JDT8_FA,
+	SFX_JDT8_FB,
+	SFX_JDT8_FC,
+	SFX_JDT8_FD,
+	SFX_JDT8_FE,
+	SFX_JDT8_FF,
+	SFX_JDT8_FG,
+	SFX_JDT8_FH,
+	SFX_JDT8_GA,
+	SFX_JDT8_HA,
+	SFX_JDT8_HB,
+	SFX_JDX_AA,
+	SFX_JDX_AB,
+	SFX_JDX_AC,
+	SFX_JD_CRASH_CAR_1,
+	SFX_JD_CRASH_CAR_2,
+	SFX_JD_CRASH_CAR_3,
+	SFX_JD_JACKED_CAR_1,
+	SFX_JD_JACKED_CAR_2,
+	SFX_JD_JACKED_CAR_3,
+	SFX_JD_SHOCKED_1,
+	SFX_JD_SHOCKED_2,
+	SFX_JD_SLPN,
+	SFX_LCN_AA,
+	SFX_LCN_AB,
+	SFX_LEAR,
+	SFX_LEON_CRASH_CAR_1,
+	SFX_LEON_CRASH_CAR_2,
+	SFX_LEON_CRASH_CAR_3,
+	SFX_LEON_CRASH_CAR_4,
+	SFX_LEON_CRASH_CAR_5,
+	SFX_LEON_DRIVER_BLOCKED_1,
+	SFX_LEON_DRIVER_BLOCKED_2,
+	SFX_LEON_DRIVER_BLOCKED_3,
+	SFX_LEON_DRIVER_BLOCKED_4,
+	SFX_LEON_JACKED_CAR_1,
+	SFX_LEON_JACKED_CAR_2,
+	SFX_LEON_JACKED_CAR_3,
+	SFX_LEON_SHOCKED_1,
+	SFX_LEON_SHOCKED_2,
+	SFX_LI_MAN1_BUMP_1,
+	SFX_LI_MAN1_BUMP_2,
+	SFX_LI_MAN1_BUMP_3,
+	SFX_LI_MAN1_CHAT_1,
+	SFX_LI_MAN1_CHAT_2,
+	SFX_LI_MAN1_CHAT_3,
+	SFX_LI_MAN1_CHAT_4,
+	SFX_LI_MAN1_CRASH_CAR_1,
+	SFX_LI_MAN1_CRASH_CAR_2,
+	SFX_LI_MAN1_DODGE_1,
+	SFX_LI_MAN1_DODGE_2,
+	SFX_LI_MAN1_DRIVER_BLOCKED_1,
+	SFX_LI_MAN1_DRIVER_BLOCKED_2,
+	SFX_LI_MAN1_FIGHT_1,
+	SFX_LI_MAN1_FIGHT_2,
+	SFX_LI_MAN1_FIGHT_3,
+	SFX_LI_MAN1_GUN_THREATENED_1,
+	SFX_LI_MAN1_GUN_THREATENED_2,
+	SFX_LI_MAN1_JACKED_CAR_1,
+	SFX_LI_MAN1_JACKED_CAR_2,
+	SFX_LI_MAN1_JACKED_CAR_3,
+	SFX_LI_MAN2_BUMP_1,
+	SFX_LI_MAN2_BUMP_2,
+	SFX_LI_MAN2_BUMP_3,
+	SFX_LI_MAN2_CHAT_1,
+	SFX_LI_MAN2_CHAT_2,
+	SFX_LI_MAN2_CHAT_3,
+	SFX_LI_MAN2_CHAT_4,
+	SFX_LI_MAN2_CRASH_CAR_1,
+	SFX_LI_MAN2_CRASH_CAR_2,
+	SFX_LI_MAN2_DODGE_1,
+	SFX_LI_MAN2_DODGE_2,
+	SFX_LI_MAN2_DRIVER_BLOCKED_1,
+	SFX_LI_MAN2_DRIVER_BLOCKED_2,
+	SFX_LI_MAN2_FIGHT_1,
+	SFX_LI_MAN2_FIGHT_2,
+	SFX_LI_MAN2_FIGHT_3,
+	SFX_LI_MAN2_GUN_THREATENED_1,
+	SFX_LI_MAN2_GUN_THREATENED_2,
+	SFX_LI_MAN2_JACKED_CAR_1,
+	SFX_LI_MAN2_JACKED_CAR_2,
+	SFX_LI_MAN2_JACKED_CAR_3,
+	SFX_LI_MAN2_SHOCKED_1,
+	SFX_LI_WOM1_BUMP_1,
+	SFX_LI_WOM1_BUMP_2,
+	SFX_LI_WOM1_BUMP_3,
+	SFX_LI_WOM1_CHAT_1,
+	SFX_LI_WOM1_CHAT_2,
+	SFX_LI_WOM1_CHAT_3,
+	SFX_LI_WOM1_CRASH_CAR_1,
+	SFX_LI_WOM1_CRASH_CAR_2,
+	SFX_LI_WOM1_DODGE_1,
+	SFX_LI_WOM1_DODGE_2,
+	SFX_LI_WOM1_DRIVER_BLOCKED_1,
+	SFX_LI_WOM1_DRIVER_BLOCKED_2,
+	SFX_LI_WOM1_FIGHT_1,
+	SFX_LI_WOM1_FIGHT_2,
+	SFX_LI_WOM1_FIGHT_3,
+	SFX_LI_WOM1_GUN_THREATENED_1,
+	SFX_LI_WOM1_GUN_THREATENED_2,
+	SFX_LI_WOM1_JACKED_CAR_1,
+	SFX_LI_WOM1_JACKED_CAR_2,
+	SFX_LI_WOM1_SHOCKED_1,
+	SFX_LI_WOM2_BUMP_1,
+	SFX_LI_WOM2_BUMP_2,
+	SFX_LI_WOM2_BUMP_3,
+	SFX_LI_WOM2_CHAT_1,
+	SFX_LI_WOM2_CHAT_2,
+	SFX_LI_WOM2_CHAT_3,
+	SFX_LI_WOM2_CHAT_4,
+	SFX_LI_WOM2_CRASH_CAR_1,
+	SFX_LI_WOM2_CRASH_CAR_2,
+	SFX_LI_WOM2_DODGE_1,
+	SFX_LI_WOM2_DODGE_2,
+	SFX_LI_WOM2_DRIVER_BLOCKED_1,
+	SFX_LI_WOM2_DRIVER_BLOCKED_2,
+	SFX_LI_WOM2_FIGHT_1,
+	SFX_LI_WOM2_FIGHT_2,
+	SFX_LI_WOM2_FIGHT_3,
+	SFX_LI_WOM2_GUN_THREATENED_1,
+	SFX_LI_WOM2_GUN_THREATENED_2,
+	SFX_LI_WOM2_JACKED_CAR_1,
+	SFX_LI_WOM2_JACKED_CAR_2,
+	SFX_LI_WOM2_JACKED_CAR_3,
+	SFX_LI_WOM2_SHOCKED_1,
+	SFX_M8B1AA,
+	SFX_M8B1AB,
+	SFX_MAC1_AA,
+	SFX_MAC1_AB,
+	SFX_MAC1_AC,
+	SFX_MAC1_AD,
+	SFX_MAC1_AE,
+	SFX_MAC1_AF,
+	SFX_MAC1_AG,
+	SFX_MAC1_AH,
+	SFX_MAC1_AI,
+	SFX_MAC1_AJ,
+	SFX_MAC1_AK,
+	SFX_MAC1_AL,
+	SFX_MAC1_AM,
+	SFX_MAC1_AN,
+	SFX_MAC1_AO,
+	SFX_MAC1_BA,
+	SFX_MAC1_BB,
+	SFX_MAC1_BC,
+	SFX_MAC1_BD,
+	SFX_MAC1_BE,
+	SFX_MAC1_BF,
+	SFX_MAC1_BG,
+	SFX_MAC1_CA,
+	SFX_MAC1_CB,
+	SFX_MAC1_DA,
+	SFX_MAC1_EA,
+	SFX_MAC1_FA,
+	SFX_MAC1_FB,
+	SFX_MAC1_GA,
+	SFX_MAC1_GB,
+	SFX_MAC1_HA,
+	SFX_MAC1_IA,
+	SFX_MAC1_IB,
+	SFX_MAC1_JA,
+	SFX_MAC1_JB,
+	SFX_MAC1_JC,
+	SFX_MAC2_AA,
+	SFX_MAC2_AB,
+	SFX_MAC2_AC,
+	SFX_MAC2_AD,
+	SFX_MAC2_AE,
+	SFX_MAC2_AF,
+	SFX_MAC2_AG,
+	SFX_MAC2_AH,
+	SFX_MAC2_AI,
+	SFX_MAC2_BA,
+	SFX_MAC2_BB,
+	SFX_MAC2_BC,
+	SFX_MAC3_AA,
+	SFX_MAC3_AB,
+	SFX_MAC3_AC,
+	SFX_MAC3_AD,
+	SFX_MAC3_AE,
+	SFX_MAC3_AF,
+	SFX_MAC3_AG,
+	SFX_MAC3_AH,
+	SFX_MAC3_AI,
+	SFX_MAC3_AJ,
+	SFX_MAC3_AK,
+	SFX_MAC3_AL,
+	SFX_MAC3_AM,
+	SFX_MAC3_AN,
+	SFX_MAC3_BA,
+	SFX_MAC4_AA,
+	SFX_MAC4_AB,
+	SFX_MAC4_AC,
+	SFX_MAC4_AD,
+	SFX_MAC4_AE,
+	SFX_MAC4_AF,
+	SFX_MAC4_AG,
+	SFX_MAC4_AH,
+	SFX_MAC4_AI,
+	SFX_MAC4_AJ,
+	SFX_MAC4_AK,
+	SFX_MAC4_AL,
+	SFX_MAC4_BA,
+	SFX_MAC4_BB,
+	SFX_MAC4_BC,
+	SFX_MAC4_BD,
+	SFX_MAC4_BE,
+	SFX_MAC4_BF,
+	SFX_MAC4_BG,
+	SFX_MAC4_BI,
+	SFX_MAC4_BJ,
+	SFX_MAC4_BL,
+	SFX_MAC4_BM,
+	SFX_MAC4_BO,
+	SFX_MAC4_BP,
+	SFX_MAC4_BQ,
+	SFX_MAC4_BR,
+	SFX_MAC4_BS,
+	SFX_MAC4_BT,
+	SFX_MAC4_BU,
+	SFX_MAC4_CA,
+	SFX_MAC4_CB,
+	SFX_MAC4_CC,
+	SFX_MAC4_CD,
+	SFX_MAC4_CE,
+	SFX_MAC4_CF,
+	SFX_MAC4_CG,
+	SFX_MAC4_CH,
+	SFX_MAC4_CI,
+	SFX_MAC4_CK,
+	SFX_MAC4_CM,
+	SFX_MAC4_CN,
+	SFX_MAC4_CO,
+	SFX_MAC4_CP,
+	SFX_MAC4_CQ,
+	SFX_MAC4_CR,
+	SFX_MAC4_CS,
+	SFX_MAC4_DA,
+	SFX_MAC4_DB,
+	SFX_MAC4_DC,
+	SFX_MAC4_DD,
+	SFX_MAC4_DE,
+	SFX_MAC4_DF,
+	SFX_MAC4_DG,
+	SFX_MAC4_DH,
+	SFX_MAC5_AA,
+	SFX_MAC5_AB,
+	SFX_MAC5_AC,
+	SFX_MAC5_AD,
+	SFX_MAC5_AE,
+	SFX_MAC5_AF,
+	SFX_MAC5_AG,
+	SFX_MAC5_AH,
+	SFX_MAC5_AI,
+	SFX_MAC5_AJ,
+	SFX_MAC5_AK,
+	SFX_MAC5_AL,
+	SFX_MAC5_AM,
+	SFX_MAC5_AN,
+	SFX_MALE01_BUMP_1,
+	SFX_MALE01_BUMP_2,
+	SFX_MALE01_BUMP_3,
+	SFX_MALE01_CHAT_1,
+	SFX_MALE01_CHAT_2,
+	SFX_MALE01_CHAT_3,
+	SFX_MALE01_CHAT_4,
+	SFX_MALE01_CRASH_CAR_1,
+	SFX_MALE01_CRASH_CAR_2,
+	SFX_MALE01_DRIVER_BLOCKED_1,
+	SFX_MALE01_DRIVER_BLOCKED_2,
+	SFX_MALE01_FIGHT_1,
+	SFX_MALE01_FIGHT_2,
+	SFX_MALE01_FIGHT_3,
+	SFX_MALE01_GUN_THREATENED_1,
+	SFX_MALE01_GUN_THREATENED_2,
+	SFX_MALE01_JACKED_CAR_1,
+	SFX_MALE01_JACKED_CAR_2,
+	SFX_MALE01_SHOCKED_1,
+	SFX_MALE02_BUMP_1,
+	SFX_MALE02_BUMP_2,
+	SFX_MALE02_BUMP_3,
+	SFX_MALE02_CHAT_1,
+	SFX_MALE02_CHAT_2,
+	SFX_MALE02_CHAT_3,
+	SFX_MALE02_CHAT_4,
+	SFX_MALE02_CRASH_CAR_1,
+	SFX_MALE02_CRASH_CAR_2,
+	SFX_MALE02_DODGE_1,
+	SFX_MALE02_DODGE_2,
+	SFX_MALE02_DRIVER_BLOCKED_1,
+	SFX_MALE02_DRIVER_BLOCKED_2,
+	SFX_MALE02_FIGHT_1,
+	SFX_MALE02_FIGHT_2,
+	SFX_MALE02_FIGHT_3,
+	SFX_MALE02_GUN_THREATENED_1,
+	SFX_MALE02_GUN_THREATENED_2,
+	SFX_MALE02_JACKED_CAR_1,
+	SFX_MALE02_JACKED_CAR_2,
+	SFX_MALE02_JACKED_CAR_3,
+	SFX_MALE02_SHOCKED_1,
+	SFX_MALE02_SPECIAL_CASE_1,
+	SFX_MALE02_SPECIAL_CASE_2,
+	SFX_MALE03_BUMP_1,
+	SFX_MALE03_BUMP_2,
+	SFX_MALE03_BUMP_3,
+	SFX_MALE03_CHAT_1,
+	SFX_MALE03_CHAT_2,
+	SFX_MALE03_CHAT_3,
+	SFX_MALE03_CRASH_CAR_1,
+	SFX_MALE03_CRASH_CAR_2,
+	SFX_MALE03_DODGE_1,
+	SFX_MALE03_DODGE_2,
+	SFX_MALE03_DRIVER_BLOCKED_1,
+	SFX_MALE03_DRIVER_BLOCKED_2,
+	SFX_MALE03_FIGHT_1,
+	SFX_MALE03_FIGHT_2,
+	SFX_MALE03_FIGHT_3,
+	SFX_MALE03_GUN_THREATENED_1,
+	SFX_MALE03_GUN_THREATENED_2,
+	SFX_MALE03_JACKED_CAR_1,
+	SFX_MALE03_JACKED_CAR_2,
+	SFX_MALE03_JACKED_CAR_3,
+	SFX_MALE03_SHOCKED_1,
+	SFX_MALE_DEATH_01,
+	SFX_MALE_DEATH_02,
+	SFX_MALE_DEATH_03,
+	SFX_MALE_DEATH_04,
+	SFX_MALE_DEATH_05,
+	SFX_MALE_DEATH_06,
+	SFX_MALE_DEATH_07,
+	SFX_MALE_DEATH_08,
+	SFX_MALE_DEATH_09,
+	SFX_MALE_DEATH_10,
+	SFX_MALE_DEATH_11,
+	SFX_MALE_DEATH_12,
+	SFX_MALE_DEATH_13,
+	SFX_MALE_DEATH_14,
+	SFX_MALE_DEATH_15,
+	SFX_MALE_DEATH_16,
+	SFX_MALE_DEATH_17,
+	SFX_MALE_DEATH_18,
+	SFX_MALE_DEATH_19,
+	SFX_MALE_DEATH_20,
+	SFX_MALE_DEATH_21,
+	SFX_MALE_DEATH_22,
+	SFX_MALE_DEATH_23,
+	SFX_MALE_DEATH_24,
+	SFX_MALE_DEATH_25,
+	SFX_MALE_DEATH_26,
+	SFX_MALE_DEATH_27,
+	SFX_MALE_DEATH_28,
+	SFX_MALE_PAIN_01,
+	SFX_MALE_PAIN_02,
+	SFX_MALE_PAIN_03,
+	SFX_MALE_PAIN_04,
+	SFX_MALE_PAIN_05,
+	SFX_MALE_PAIN_06,
+	SFX_MALE_PAIN_07,
+	SFX_MALE_PAIN_08,
+	SFX_MALE_PAIN_09,
+	SFX_MALE_PAIN_10,
+	SFX_MALE_PAIN_11,
+	SFX_MALE_PAIN_12,
+	SFX_MALE_PAIN_13,
+	SFX_MALE_PAIN_16,
+	SFX_MALE_PAIN_17,
+	SFX_MALE_PAIN_18,
+	SFX_MALE_PAIN_19,
+	SFX_MALE_PAIN_20,
+	SFX_MALE_PAIN_21,
+	SFX_MALE_PAIN_22,
+	SFX_MALE_PAIN_23,
+	SFX_MALE_PAIN_24,
+	SFX_MALE_PAIN_25,
+	SFX_MALE_PAIN_26,
+	SFX_MALE_PAIN_27,
+	SFX_MALE_PAIN_28,
+	SFX_MALE_PAIN_29,
+	SFX_MALE_PAIN_30,
+	SFX_MALE_PAIN_31,
+	SFX_MALE_PAIN_32,
+	SFX_MALE_PAIN_33,
+	SFX_MALE_PAIN_34,
+	SFX_MALE_PAIN_35,
+	SFX_MALE_PAIN_36,
+	SFX_MALE_PAIN_37,
+	SFX_MALE_PAIN_38,
+	SFX_MALE_PAIN_39,
+	SFX_MALE_PAIN_40,
+	SFX_MALE_PAIN_41,
+	SFX_MALE_PAIN_42,
+	SFX_MALE_PAIN_43,
+	SFX_MALE_PAIN_44,
+	SFX_MALE_PAIN_45,
+	SFX_MALE_PAIN_46,
+	SFX_MALE_PAIN_47,
+	SFX_MALE_PAIN_48,
+	SFX_MALE_PAIN_49,
+	SFX_MALE_PAIN_50,
+	SFX_MALE_PAIN_51,
+	SFX_MALE_PAIN_52,
+	SFX_MALE_PAIN_53,
+	SFX_MALE_PAIN_ON_FIRE_01,
+	SFX_MALE_PAIN_ON_FIRE_02,
+	SFX_MALE_PAIN_ON_FIRE_03,
+	SFX_MALE_PAIN_ON_FIRE_04,
+	SFX_MALE_PAIN_ON_FIRE_05,
+	SFX_MALE_PAIN_ON_FIRE_06,
+	SFX_MALE_PAIN_ON_FIRE_07,
+	SFX_MALE_PAIN_ON_FIRE_08,
+	SFX_MALE_PAIN_ON_FIRE_09,
+	SFX_MALE_PAIN_ON_FIRE_10,
+	SFX_MALE_PAIN_ON_FIRE_11,
+	SFX_MALE_PAIN_ON_FIRE_12,
+	SFX_MALE_PAIN_ON_FIRE_13,
+	SFX_MALE_PAIN_ON_FIRE_14,
+	SFX_MALE_PAIN_ON_FIRE_15,
+	SFX_MALE_PAIN_ON_FIRE_16,
+	SFX_MALE_PAIN_ON_FIRE_17,
+	SFX_MALE_PAIN_ON_FIRE_18,
+	SFX_MALE_PAIN_ON_FIRE_19,
+	SFX_MALE_PAIN_ON_FIRE_20,
+	SFX_MALE_PAIN_ON_FIRE_21,
+	SFX_MALE_PANIC_01,
+	SFX_MALE_PANIC_02,
+	SFX_MALE_PANIC_03,
+	SFX_MALE_PANIC_04,
+	SFX_MALE_PANIC_05,
+	SFX_MALE_PANIC_06,
+	SFX_MALE_PANIC_07,
+	SFX_MALE_PANIC_08,
+	SFX_MALE_PANIC_09,
+	SFX_MALE_PANIC_10,
+	SFX_MALE_PANIC_11,
+	SFX_MALE_PANIC_12,
+	SFX_MALE_PANIC_13,
+	SFX_MALE_PANIC_14,
+	SFX_MALE_PANIC_15,
+	SFX_MALE_PANIC_16,
+	SFX_MALE_PANIC_17,
+	SFX_MALE_PANIC_18,
+	SFX_MALE_PANIC_19,
+	SFX_MALE_PANIC_20,
+	SFX_MALE_PANIC_21,
+	SFX_MALE_PANIC_22,
+	SFX_MALE_PANIC_23,
+	SFX_MAR1_AA,
+	SFX_MAR1_AB,
+	SFX_MAR1_AC,
+	SFX_MAR1_AD,
+	SFX_MAR1_AE,
+	SFX_MAR1_BA,
+	SFX_MAR1_CA,
+	SFX_MAR1_DA,
+	SFX_MAR1_DB,
+	SFX_MAR1_EA,
+	SFX_MAR1_FA,
+	SFX_MAR1_FB,
+	SFX_MAR1_FC,
+	SFX_MAR1_FD,
+	SFX_MAR1_GA,
+	SFX_MAR1_GB,
+	SFX_MAR1_GC,
+	SFX_MAR1_HA,
+	SFX_MAR1_HB,
+	SFX_MAR1_HC,
+	SFX_MAR1_HD,
+	SFX_MAR1_IA,
+	SFX_MAR1_IB,
+	SFX_MAR1_IC,
+	SFX_MAR2_AA,
+	SFX_MAR2_AB,
+	SFX_MAR2_AC,
+	SFX_MAR2_AD,
+	SFX_MAR2_AE,
+	SFX_MAR2_AF,
+	SFX_MAR2_AG,
+	SFX_MAR2_AH,
+	SFX_MAR2_BA,
+	SFX_MAR2_BB,
+	SFX_MAR2_BC,
+	SFX_MAR2_CA,
+	SFX_MAR2_CB,
+	SFX_MAR2_CC,
+	SFX_MAR2_CD,
+	SFX_MAR2_CE,
+	SFX_MAR2_DA,
+	SFX_MAR2_EA,
+	SFX_MAR2_EB,
+	SFX_MAR2_EC,
+	SFX_MAR2_FA,
+	SFX_MAR2_FB,
+	SFX_MAR2_GA,
+	SFX_MAR2_GB,
+	SFX_MAR2_GC,
+	SFX_MAR2_GE,
+	SFX_MAR2_GF,
+	SFX_MAR2_GG,
+	SFX_MAR2_GH,
+	SFX_MAR2_HA,
+	SFX_MAR2_HB,
+	SFX_MAR2_HC,
+	SFX_MAR3_AA,
+	SFX_MAR3_AB,
+	SFX_MAR3_AC,
+	SFX_MAR3_AD,
+	SFX_MAR3_BA,
+	SFX_MAR3_BB,
+	SFX_MAR3_BC,
+	SFX_MAR3_BD,
+	SFX_MAR3_BE,
+	SFX_MAR3_BF,
+	SFX_MAR4_BA,
+	SFX_MAR4_BC,
+	SFX_MAR4_BD,
+	SFX_MAR4_BF,
+	SFX_MAR5_AA,
+	SFX_MAR5_AB,
+	SFX_MAR5_AC,
+	SFX_MAR5_AD,
+	SFX_MAR5_AE,
+	SFX_MAR5_BA,
+	SFX_MAR5_BB,
+	SFX_MAR5_CA,
+	SFX_MAR5_CB,
+	SFX_MAR5_CC,
+	SFX_MAR5_CD,
+	SFX_MAR5_CE,
+	SFX_MAR5_DA,
+	SFX_MAR5_DB,
+	SFX_MAR5_DC,
+	SFX_MAR5_EA,
+	SFX_MAR5_EB,
+	SFX_MAR5_EC,
+	SFX_MAR5_ED,
+	SFX_MAR5_FA,
+	SFX_MAR5_FB,
+	SFX_MAR5_FC,
+	SFX_MAR5_FD,
+	SFX_MAR5_FE,
+	SFX_MAR5_FF,
+	SFX_MARIA_CRASH_CAR_1,
+	SFX_MARIA_CRASH_CAR_2,
+	SFX_MARIA_CRASH_CAR_3,
+	SFX_MARIA_CRASH_CAR_4,
+	SFX_MARIA_DRIVER_BLOCKED_1,
+	SFX_MARIA_DRIVER_BLOCKED_2,
+	SFX_MARIA_JACKED_CAR_1,
+	SFX_MARIA_JACKED_CAR_2,
+	SFX_MARIA_JACKED_CAR_3,
+	SFX_MARIA_SHOCKED_1,
+	SFX_MARIA_SHOCKED_2,
+	SFX_MARX_AA,
+	SFX_MARX_AB,
+	SFX_MARX_AC,
+	SFX_MDON1AA,
+	SFX_MDON1AB,
+	SFX_MDON1AC,
+	SFX_MDON2AA,
+	SFX_MDON2AB,
+	SFX_MDON2AC,
+	SFX_MDON2AD,
+	SFX_MDON2AE,
+	SFX_MDON2AF,
+	SFX_MDON2AG,
+	SFX_MDON2AH,
+	SFX_MDON3AA,
+	SFX_MDON3AB,
+	SFX_MDON3AC,
+	SFX_MDON3AD,
+	SFX_MDON3AE,
+	SFX_MDON3AF,
+	SFX_MDON3AG,
+	SFX_MDON3AH,
+	SFX_MICKEY_BUMP_1,
+	SFX_MICKEY_BUMP_2,
+	SFX_MICKEY_BUMP_3,
+	SFX_MICKEY_BUMP_4,
+	SFX_MICKEY_CHAT_1,
+	SFX_MICKEY_CHAT_2,
+	SFX_MICKEY_CRASH_CAR_1,
+	SFX_MICKEY_CRASH_CAR_2,
+	SFX_MICKEY_DODGE_1,
+	SFX_MICKEY_DODGE_2,
+	SFX_MICKEY_DRIVER_BLOCKED_1,
+	SFX_MICKEY_DRIVER_BLOCKED_2,
+	SFX_MICKEY_FIGHT_1,
+	SFX_MICKEY_FIGHT_2,
+	SFX_MICKEY_GUN_THREATENED_1,
+	SFX_MICKEY_GUN_THREATENED_2,
+	SFX_MICKEY_JACKED_CAR_1,
+	SFX_MICKEY_JACKED_CAR_2,
+	SFX_MICKEY_JACKING_1,
+	SFX_MICKEY_JACKING_2,
+	SFX_MICKEY_SHOOT_1,
+	SFX_MICKEY_SHOOT_2,
+	SFX_MICKEY_SHOOT_3,
+	SFX_MICKEY_SHOOT_4,
+	SFX_MICKEY_SHOOT_5,
+	SFX_MJDT1AA,
+	SFX_MJDT1AB,
+	SFX_MJDT1AC,
+	SFX_MJDT1AE,
+	SFX_MMA1AA,
+	SFX_MMA1AB,
+	SFX_MMA1AC,
+	SFX_MMA1AD,
+	SFX_MMA1AE,
+	SFX_MMA2AA,
+	SFX_MMA2AB,
+	SFX_MMA2AC,
+	SFX_MMA2AD,
+	SFX_MMA2AE,
+	SFX_MMA2AF,
+	SFX_MMA2AG,
+	SFX_MMA2AH,
+	SFX_MMA2AI,
+	SFX_MMA2AJ,
+	SFX_MMAR1AA,
+	SFX_MMAR1AB,
+	SFX_MMAR1AC,
+	SFX_MMAR1AD,
+	SFX_MMCA1AA,
+	SFX_MMCA1AB,
+	SFX_MMCA1AC,
+	SFX_MMCA1AD,
+	SFX_MMCA2AA,
+	SFX_MMCA2AB,
+	SFX_MMCA2AC,
+	SFX_MMCA2AD,
+	SFX_MMCA2AE,
+	SFX_MMCA2AF,
+	SFX_MOD_MAN_BUMP_1,
+	SFX_MOD_MAN_BUMP_2,
+	SFX_MOD_MAN_BUMP_3,
+	SFX_MOD_MAN_CHAT_1,
+	SFX_MOD_MAN_CHAT_2,
+	SFX_MOD_MAN_CHAT_3,
+	SFX_MOD_MAN_CHAT_4,
+	SFX_MOD_MAN_CRASH_CAR_1,
+	SFX_MOD_MAN_CRASH_CAR_2,
+	SFX_MOD_MAN_DODGE_1,
+	SFX_MOD_MAN_DODGE_2,
+	SFX_MOD_MAN_DRIVER_BLOCKED_1,
+	SFX_MOD_MAN_DRIVER_BLOCKED_2,
+	SFX_MOD_MAN_FIGHT_1,
+	SFX_MOD_MAN_FIGHT_2,
+	SFX_MOD_MAN_FIGHT_3,
+	SFX_MOD_MAN_GUN_THREATENED_1,
+	SFX_MOD_MAN_GUN_THREATENED_2,
+	SFX_MOD_MAN_JACKED_CAR_1,
+	SFX_MOD_MAN_JACKED_CAR_2,
+	SFX_MOD_MAN_JACKED_CAR_3,
+	SFX_MOD_MAN_SHOCKED_1,
+	SFX_MOD_WOM_BUMP_1,
+	SFX_MOD_WOM_BUMP_2,
+	SFX_MOD_WOM_BUMP_3,
+	SFX_MOD_WOM_CHAT_1,
+	SFX_MOD_WOM_CHAT_2,
+	SFX_MOD_WOM_CHAT_3,
+	SFX_MOD_WOM_CHAT_4,
+	SFX_MOD_WOM_CRASH_CAR_1,
+	SFX_MOD_WOM_CRASH_CAR_2,
+	SFX_MOD_WOM_DODGE_1,
+	SFX_MOD_WOM_DODGE_2,
+	SFX_MOD_WOM_DRIVER_BLOCKED_1,
+	SFX_MOD_WOM_DRIVER_BLOCKED_2,
+	SFX_MOD_WOM_FIGHT_1,
+	SFX_MOD_WOM_FIGHT_2,
+	SFX_MOD_WOM_FIGHT_3,
+	SFX_MOD_WOM_GUN_THREATENED_1,
+	SFX_MOD_WOM_GUN_THREATENED_2,
+	SFX_MOD_WOM_JACKED_CAR_1,
+	SFX_MOD_WOM_JACKED_CAR_2,
+	SFX_MOD_WOM_JACKED_CAR_3,
+	SFX_MOD_WOM_SHOCKED_1,
+	SFX_MSA10AA,
+	SFX_MSA10AB,
+	SFX_MSA10AC,
+	SFX_MSA10AD,
+	SFX_MSA11AA,
+	SFX_MSA11AB,
+	SFX_MSA11AC,
+	SFX_MSA11AD,
+	SFX_MSA12AA,
+	SFX_MSA12AC,
+	SFX_MSA12AD,
+	SFX_MSA13AA,
+	SFX_MSA13AB,
+	SFX_MSA13AC,
+	SFX_MSA13AD,
+	SFX_MSA13AE,
+	SFX_MSA13AF,
+	SFX_MSA13AG,
+	SFX_MSA13AH,
+	SFX_MSA14AA,
+	SFX_MSA14AB,
+	SFX_MSA14AC,
+	SFX_MSA14AD,
+	SFX_MSAL5AA,
+	SFX_MSAL5AB,
+	SFX_MSAL6AA,
+	SFX_MSAL6AB,
+	SFX_MSAL6AC,
+	SFX_MSAL6AD,
+	SFX_MSAL7AA,
+	SFX_MSAL7AB,
+	SFX_MSAL7AC,
+	SFX_MSAL7AD,
+	SFX_MSAL7AE,
+	SFX_MSAL7AF,
+	SFX_MSAL7AG,
+	SFX_MSAL8AA,
+	SFX_MSAL8AB,
+	SFX_MSAL8AC,
+	SFX_MSAL8AD,
+	SFX_MSAL8AF,
+	SFX_MSAL8AG,
+	SFX_MSAL9AA,
+	SFX_MSAL9AB,
+	SFX_MSAL9AC,
+	SFX_MSAL9AD,
+	SFX_MSAL9AE,
+	SFX_MSAL9AF,
+	SFX_MTOS1AA,
+	SFX_MTOS1AB,
+	SFX_MTOS1AC,
+	SFX_MTOS1AD,
+	SFX_MTOS1AE,
+	SFX_MTOS1AF,
+	SFX_MTOS1AG,
+	SFX_MTOS2AA,
+	SFX_MTOS2AB,
+	SFX_MTOS2AC,
+	SFX_MTOS2AD,
+	SFX_MTOS2AE,
+	SFX_MTOS2AF,
+	SFX_MTOS2AG,
+	SFX_MVIC1AA,
+	SFX_MVIC1AB,
+	SFX_MVIC1AC,
+	SFX_MVIC1AD,
+	SFX_MVIC1AE,
+	SFX_MVIC1AF,
+	SFX_MVIC1AG,
+	SFX_MVIC1AH,
+	SFX_MVIC1AI,
+	SFX_MVIC1AJ,
+	SFX_MVIC1AK,
+	SFX_NEDS1AA,
+	SFX_NEDS1AB,
+	SFX_NEDS1AC,
+	SFX_NEDS1AD,
+	SFX_NEDS1AE,
+	SFX_NEDS1AF,
+	SFX_NEDS1AG,
+	SFX_NEDS1BA,
+	SFX_NEDS1BB,
+	SFX_NEDS1BC,
+	SFX_NEDS1BD,
+	SFX_NEDS1BE,
+	SFX_NEDS1BF,
+	SFX_NEDS2AA,
+	SFX_NEDS2AB,
+	SFX_NEDS2AC,
+	SFX_NEDS2AD,
+	SFX_NEDS2AE,
+	SFX_NEDS2AF,
+	SFX_NEDS2BA,
+	SFX_NEDS3AA,
+	SFX_NEDS3AB,
+	SFX_NEDS3AC,
+	SFX_NEDS3AD,
+	SFX_NEDS4AA,
+	SFX_NEDS4AB,
+	SFX_NEDS4AC,
+	SFX_NEDS4AD,
+	SFX_NEDS4AE,
+	SFX_NEDS4BA,
+	SFX_NEDS4BB,
+	SFX_NEDS4BC,
+	SFX_NEDS4BD,
+	SFX_NEDS4BE,
+	SFX_NEDS4BF,
+	SFX_NEDS4CA,
+	SFX_NOOD_AA,
+	SFX_NOOD_AB,
+	SFX_NOOD_AC,
+	SFX_NOOD_AD,
+	SFX_NOOD_AE,
+	SFX_NOOD_AF,
+	SFX_NOOD_AG,
+	SFX_NOOD_AH,
+	SFX_NOOD_AI,
+	SFX_NOOD_AJ,
+	SFX_NOOD_AK,
+	SFX_NOOD_AL,
+	SFX_NOOD_AM,
+	SFX_NOOD_AN,
+	SFX_NOOD_AO,
+	SFX_NOOD_AP,
+	SFX_NOOD_AQ,
+	SFX_NOOD_AR,
+	SFX_NOOD_AS,
+	SFX_NOOD_AT,
+	SFX_PBCHAT1,
+	SFX_PBCHAT10,
+	SFX_PBCHAT11,
+	SFX_PBCHAT12,
+	SFX_PBCHAT13,
+	SFX_PBCHAT14,
+	SFX_PBCHAT15,
+	SFX_PBCHAT16,
+	SFX_PBCHAT17,
+	SFX_PBCHAT18,
+	SFX_PBCHAT19,
+	SFX_PBCHAT2,
+	SFX_PBCHAT20,
+	SFX_PBCHAT21,
+	SFX_PBCHAT22,
+	SFX_PBCHAT23,
+	SFX_PBCHAT24,
+	SFX_PBCHAT25,
+	SFX_PBCHAT26,
+	SFX_PBCHAT27,
+	SFX_PBCHAT28,
+	SFX_PBCHAT29,
+	SFX_PBCHAT3,
+	SFX_PBCHAT4,
+	SFX_PBCHAT5,
+	SFX_PBCHAT6,
+	SFX_PBCHAT7,
+	SFX_PBCHAT8,
+	SFX_PBCHAT9,
+	SFX_PHCHAT1,
+	SFX_PHCHAT10,
+	SFX_PHCHAT11,
+	SFX_PHCHAT12,
+	SFX_PHCHAT13,
+	SFX_PHCHAT14,
+	SFX_PHCHAT15,
+	SFX_PHCHAT16,
+	SFX_PHCHAT17,
+	SFX_PHCHAT18,
+	SFX_PHCHAT19,
+	SFX_PHCHAT2,
+	SFX_PHCHAT20,
+	SFX_PHCHAT21,
+	SFX_PHCHAT22,
+	SFX_PHCHAT23,
+	SFX_PHCHAT24,
+	SFX_PHCHAT25,
+	SFX_PHCHAT26,
+	SFX_PHCHAT27,
+	SFX_PHCHAT28,
+	SFX_PHCHAT29,
+	SFX_PHCHAT3,
+	SFX_PHCHAT4,
+	SFX_PHCHAT5,
+	SFX_PHCHAT6,
+	SFX_PHCHAT7,
+	SFX_PHCHAT8,
+	SFX_PHCHAT9,
+	SFX_PIMP_BUMP_1,
+	SFX_PIMP_BUMP_2,
+	SFX_PIMP_BUMP_3,
+	SFX_PIMP_CHAT_1,
+	SFX_PIMP_CHAT_2,
+	SFX_PIMP_CHAT_3,
+	SFX_PIMP_CHAT_4,
+	SFX_PIMP_CRASH_CAR_1,
+	SFX_PIMP_CRASH_CAR_2,
+	SFX_PIMP_DODGE_1,
+	SFX_PIMP_DODGE_2,
+	SFX_PIMP_DRIVER_BLOCKED_1,
+	SFX_PIMP_DRIVER_BLOCKED_2,
+	SFX_PIMP_FIGHT_1,
+	SFX_PIMP_FIGHT_2,
+	SFX_PIMP_FIGHT_3,
+	SFX_PIMP_GUN_THREATENED_1,
+	SFX_PIMP_GUN_THREATENED_2,
+	SFX_PIMP_JACKED_CAR_1,
+	SFX_PIMP_JACKED_CAR_2,
+	SFX_PIMP_JACKED_CAR_3,
+	SFX_PIMP_SHOCKED_1,
+	SFX_PIMP_SPECIAL_CASE_1,
+	SFX_PIMP_SPECIAL_CASE_2,
+	SFX_PIMP_SPECIAL_CASE_3,
+	SFX_PIZZ_AA,
+	SFX_PIZZ_AB,
+	SFX_PIZZ_AC,
+	SFX_PIZZ_AD,
+	SFX_PIZZ_AE,
+	SFX_PIZZ_AF,
+	SFX_PIZZ_AG,
+	SFX_PIZZ_AH,
+	SFX_PIZZ_AI,
+	SFX_PIZZ_AJ,
+	SFX_PIZZ_AK,
+	SFX_PIZZ_AL,
+	SFX_PIZZ_AM,
+	SFX_PIZZ_AN,
+	SFX_PIZZ_AO,
+	SFX_PIZZ_AP,
+	SFX_PIZZ_AQ,
+	SFX_PIZZ_AR,
+	SFX_PIZZ_AS,
+	SFX_PIZZ_AT,
+	SFX_PROSTITUTE2_BUMP_1,
+	SFX_PROSTITUTE2_BUMP_2,
+	SFX_PROSTITUTE2_BUMP_3,
+	SFX_PROSTITUTE2_CHAT_1,
+	SFX_PROSTITUTE2_CHAT_2,
+	SFX_PROSTITUTE2_CHAT_3,
+	SFX_PROSTITUTE2_CHAT_4,
+	SFX_PROSTITUTE2_CRASH_CAR_1,
+	SFX_PROSTITUTE2_CRASH_CAR_2,
+	SFX_PROSTITUTE2_DODGE_1,
+	SFX_PROSTITUTE2_DODGE_2,
+	SFX_PROSTITUTE2_DRIVER_BLOCKED_1,
+	SFX_PROSTITUTE2_DRIVER_BLOCKED_2,
+	SFX_PROSTITUTE2_FIGHT_1,
+	SFX_PROSTITUTE2_FIGHT_2,
+	SFX_PROSTITUTE2_FIGHT_3,
+	SFX_PROSTITUTE2_GUN_THREATENED_1,
+	SFX_PROSTITUTE2_GUN_THREATENED_2,
+	SFX_PROSTITUTE2_JACKED_CAR_1,
+	SFX_PROSTITUTE2_JACKED_CAR_2,
+	SFX_PROSTITUTE2_JACKED_CAR_3,
+	SFX_PROSTITUTE2_SPECIAL_CASE_1,
+	SFX_PROSTITUTE2_SPECIAL_CASE_2,
+	SFX_PROSTITUTE2_SPECIAL_CASE_3,
+	SFX_PROSTITUTE_BUMP_1,
+	SFX_PROSTITUTE_BUMP_2,
+	SFX_PROSTITUTE_BUMP_3,
+	SFX_PROSTITUTE_CHAT_1,
+	SFX_PROSTITUTE_CHAT_2,
+	SFX_PROSTITUTE_CHAT_3,
+	SFX_PROSTITUTE_CHAT_4,
+	SFX_PROSTITUTE_CRASH_CAR_1,
+	SFX_PROSTITUTE_CRASH_CAR_2,
+	SFX_PROSTITUTE_DODGE_1,
+	SFX_PROSTITUTE_DODGE_2,
+	SFX_PROSTITUTE_DRIVER_BLOCKED_1,
+	SFX_PROSTITUTE_DRIVER_BLOCKED_2,
+	SFX_PROSTITUTE_FIGHT_1,
+	SFX_PROSTITUTE_FIGHT_2,
+	SFX_PROSTITUTE_GUN_THREATENED_1,
+	SFX_PROSTITUTE_GUN_THREATENED_2,
+	SFX_PROSTITUTE_JACKED_CAR_1,
+	SFX_PROSTITUTE_JACKED_CAR_2,
+	SFX_PROSTITUTE_JACKED_CAR_3,
+	SFX_PROSTITUTE_JACKED_CAR_4,
+	SFX_PROSTITUTE_SHOCKED_1,
+	SFX_PROSTITUTE_SHOCKED_2,
+	SFX_PROSTITUTE_SHOCKED_3,
+	SFX_P_MAN1_BUMP_1,
+	SFX_P_MAN1_BUMP_2,
+	SFX_P_MAN1_BUMP_3,
+	SFX_P_MAN1_CHAT_1,
+	SFX_P_MAN1_CHAT_2,
+	SFX_P_MAN1_CHAT_3,
+	SFX_P_MAN1_CRASH_CAR_1,
+	SFX_P_MAN1_CRASH_CAR_2,
+	SFX_P_MAN1_DODGE_1,
+	SFX_P_MAN1_DODGE_2,
+	SFX_P_MAN1_DRIVER_BLOCKED_1,
+	SFX_P_MAN1_DRIVER_BLOCKED_2,
+	SFX_P_MAN1_FIGHT_1,
+	SFX_P_MAN1_FIGHT_2,
+	SFX_P_MAN1_FIGHT_3,
+	SFX_P_MAN1_GUN_THREATENED_1,
+	SFX_P_MAN1_GUN_THREATENED_2,
+	SFX_P_MAN1_JACKED_CAR_1,
+	SFX_P_MAN1_JACKED_CAR_2,
+	SFX_P_MAN1_JACKED_CAR_3,
+	SFX_P_MAN2_BUMP_1,
+	SFX_P_MAN2_BUMP_2,
+	SFX_P_MAN2_BUMP_3,
+	SFX_P_MAN2_CHAT_1,
+	SFX_P_MAN2_CHAT_2,
+	SFX_P_MAN2_CHAT_3,
+	SFX_P_MAN2_CHAT_4,
+	SFX_P_MAN2_CRASH_CAR_1,
+	SFX_P_MAN2_CRASH_CAR_2,
+	SFX_P_MAN2_DODGE_1,
+	SFX_P_MAN2_DODGE_2,
+	SFX_P_MAN2_DRIVER_BLOCKED_1,
+	SFX_P_MAN2_DRIVER_BLOCKED_2,
+	SFX_P_MAN2_FIGHT_1,
+	SFX_P_MAN2_FIGHT_2,
+	SFX_P_MAN2_FIGHT_3,
+	SFX_P_MAN2_FIGHT_4,
+	SFX_P_MAN2_GUN_THREATENED_1,
+	SFX_P_MAN2_GUN_THREATENED_2,
+	SFX_P_MAN2_JACKED_CAR_1,
+	SFX_P_MAN2_JACKED_CAR_2,
+	SFX_P_MAN2_JACKED_CAR_3,
+	SFX_P_MAN2_SHOCKED_1,
+	SFX_P_WOM1_BUMP_1,
+	SFX_P_WOM1_BUMP_2,
+	SFX_P_WOM1_BUMP_3,
+	SFX_P_WOM1_CHAT_1,
+	SFX_P_WOM1_CHAT_2,
+	SFX_P_WOM1_CHAT_3,
+	SFX_P_WOM1_CHAT_4,
+	SFX_P_WOM1_CRASH_CAR_1,
+	SFX_P_WOM1_CRASH_CAR_2,
+	SFX_P_WOM1_DODGE_1,
+	SFX_P_WOM1_DODGE_2,
+	SFX_P_WOM1_DRIVER_BLOCKED_1,
+	SFX_P_WOM1_DRIVER_BLOCKED_2,
+	SFX_P_WOM1_FIGHT_1,
+	SFX_P_WOM1_FIGHT_2,
+	SFX_P_WOM1_FIGHT_3,
+	SFX_P_WOM1_GUN_THREATENED_1,
+	SFX_P_WOM1_GUN_THREATENED_2,
+	SFX_P_WOM1_JACKED_CAR_1,
+	SFX_P_WOM1_JACKED_CAR_2,
+	SFX_P_WOM1_JACKED_CAR_3,
+	SFX_P_WOM1_SHOCKED_1,
+	SFX_P_WOM2_BUMP_1,
+	SFX_P_WOM2_BUMP_2,
+	SFX_P_WOM2_BUMP_3,
+	SFX_P_WOM2_CHAT_1,
+	SFX_P_WOM2_CHAT_2,
+	SFX_P_WOM2_CHAT_3,
+	SFX_P_WOM2_CHAT_4,
+	SFX_P_WOM2_CRASH_CAR_1,
+	SFX_P_WOM2_CRASH_CAR_2,
+	SFX_P_WOM2_DODGE_1,
+	SFX_P_WOM2_DODGE_2,
+	SFX_P_WOM2_DRIVER_BLOCKED_1,
+	SFX_P_WOM2_DRIVER_BLOCKED_2,
+	SFX_P_WOM2_FIGHT_1,
+	SFX_P_WOM2_FIGHT_2,
+	SFX_P_WOM2_FIGHT_3,
+	SFX_P_WOM2_GUN_THREATENED_1,
+	SFX_P_WOM2_GUN_THREATENED_2,
+	SFX_P_WOM2_JACKED_CAR_1,
+	SFX_P_WOM2_JACKED_CAR_2,
+	SFX_P_WOM2_SHOCKED_1,
+	SFX_RAC1_AA,
+	SFX_RAC1_AB,
+	SFX_RAC1_AC,
+	SFX_RAC1_AD,
+	SFX_RAC1_AE,
+	SFX_RAC1_AF,
+	SFX_RAC1_AG,
+	SFX_RAC2_AA,
+	SFX_RAC2_AB,
+	SFX_RAC2_AC,
+	SFX_RAC2_AD,
+	SFX_RAC2_AE,
+	SFX_RAC2_AF,
+	SFX_RAC3_AB,
+	SFX_RAC3_AC,
+	SFX_RAC3_AD,
+	SFX_RAC3_AE,
+	SFX_RAC3_AF,
+	SFX_RAC3_AG,
+	SFX_RAYS1AA,
+	SFX_RAYS1AB,
+	SFX_RAYS1AC,
+	SFX_RAYS1BA,
+	SFX_RAYS1BB,
+	SFX_RAYS1CA,
+	SFX_RAYS1CB,
+	SFX_RAYS1CC,
+	SFX_RAYS1CD,
+	SFX_RAYS1CE,
+	SFX_RAYS1CF,
+	SFX_RAYS1DA,
+	SFX_RAYS1DB,
+	SFX_RAYS1DC,
+	SFX_RAYS2AA,
+	SFX_RAYS2AB,
+	SFX_RAYS2AD,
+	SFX_RAYS2AE,
+	SFX_RAYS2AF,
+	SFX_RAYS2AG,
+	SFX_RAYS2AH,
+	SFX_RAYS2AI,
+	SFX_RAYS2BA,
+	SFX_RAYS2BB,
+	SFX_RAYS2CA,
+	SFX_RAYS2CB,
+	SFX_RAYS2DA,
+	SFX_RAYS2DB,
+	SFX_RAYS2EA,
+	SFX_RAYS2EB,
+	SFX_RAYS4AA,
+	SFX_RAYS4AB,
+	SFX_RAYS4AC,
+	SFX_RAYS4AD,
+	SFX_RAYS4AE,
+	SFX_RAYS4AF,
+	SFX_RAYS4BA,
+	SFX_RAYS4BB,
+	SFX_RAYS4BC,
+	SFX_RAYS4BD,
+	SFX_RAYS4BE,
+	SFX_RAYS4BF,
+	SFX_RAYS4BG,
+	SFX_RAYS5AA,
+	SFX_RAYS5AB,
+	SFX_RAYS5AC,
+	SFX_RAYS5AD,
+	SFX_RAYS5AE,
+	SFX_RAYS5AF,
+	SFX_RAYS5AG,
+	SFX_RAYS5AH,
+	SFX_RAYS5AI,
+	SFX_RAYS5BA,
+	SFX_RAYS5BB,
+	SFX_RMN_AA,
+	SFX_RMN_AB,
+	SFX_RMN_AC,
+	SFX_RMN_AD,
+	SFX_RMN_AE,
+	SFX_RMN_AF,
+	SFX_RMN_AG,
+	SFX_RMN_AH,
+	SFX_RMN_AI,
+	SFX_RMN_AJ,
+	SFX_RMN_AK,
+	SFX_RUNPAST,
+	SFX_SAL1_AA,
+	SFX_SAL1_AB,
+	SFX_SAL1_AC,
+	SFX_SAL1_AE,
+	SFX_SAL1_BA,
+	SFX_SAL1_BB,
+	SFX_SAL1_BC,
+	SFX_SAL1_BD,
+	SFX_SAL2_AA,
+	SFX_SAL2_AB,
+	SFX_SAL2_AC,
+	SFX_SAL2_AD,
+	SFX_SAL2_AF,
+	SFX_SAL2_AG,
+	SFX_SAL2_BA,
+	SFX_SAL2_BB,
+	SFX_SAL2_BC,
+	SFX_SAL2_BD,
+	SFX_SAL2_CA,
+	SFX_SAL2_CB,
+	SFX_SAL2_CC,
+	SFX_SAL2_CD,
+	SFX_SAL2_CE,
+	SFX_SAL2_CF,
+	SFX_SAL2_CG,
+	SFX_SAL2_CH,
+	SFX_SAL2_CI,
+	SFX_SAL2_CJ,
+	SFX_SAL2_CK,
+	SFX_SAL2_CL,
+	SFX_SAL2_CM,
+	SFX_SAL2_CN,
+	SFX_SAL2_CO,
+	SFX_SAL2_CP,
+	SFX_SAL2_CQ,
+	SFX_SAL2_CR,
+	SFX_SAL2_CS,
+	SFX_SAL2_CT,
+	SFX_SAL2_CU,
+	SFX_SAL2_CV,
+	SFX_SAL2_DA,
+	SFX_SAL2_DB,
+	SFX_SAL2_DC,
+	SFX_SAL2_DD,
+	SFX_SAL2_DE,
+	SFX_SAL2_EA,
+	SFX_SAL3_AA,
+	SFX_SAL3_AD,
+	SFX_SAL3_AE,
+	SFX_SAL3_AF,
+	SFX_SAL3_AG,
+	SFX_SAL3_AI,
+	SFX_SAL3_BA,
+	SFX_SAL3_BB,
+	SFX_SAL3_CA,
+	SFX_SAL3_CB,
+	SFX_SAL3_DA,
+	SFX_SAL4_AA,
+	SFX_SAL4_AB,
+	SFX_SAL4_AC,
+	SFX_SAL4_AD,
+	SFX_SAL4_AE,
+	SFX_SAL4_AF,
+	SFX_SAL4_AH,
+	SFX_SAL4_AI,
+	SFX_SAL4_AJ,
+	SFX_SAL4_BA,
+	SFX_SAL4_CA,
+	SFX_SAL4_CB,
+	SFX_SAL4_CC,
+	SFX_SAL4_CD,
+	SFX_SAL4_CE,
+	SFX_SAL4_CF,
+	SFX_SAL4_CG,
+	SFX_SAL4_CH,
+	SFX_SAL4_CI,
+	SFX_SAL4_CJ,
+	SFX_SAL4_CK,
+	SFX_SAL4_CL,
+	SFX_SAL4_CM,
+	SFX_SAL4_CN,
+	SFX_SAL4_CO,
+	SFX_SAL4_CP,
+	SFX_SAL4_CQ,
+	SFX_SAL4_DA,
+	SFX_SAL4_EA,
+	SFX_SAL5_AA,
+	SFX_SAL5_AB,
+	SFX_SAL5_AD,
+	SFX_SAL5_AE,
+	SFX_SAL5_AF,
+	SFX_SAL5_AG,
+	SFX_SAL5_AH,
+	SFX_SAL5_AI,
+	SFX_SAL5_AJ,
+	SFX_SAL6_AA,
+	SFX_SAL6_AB,
+	SFX_SAL6_AC,
+	SFX_SAL6_AE,
+	SFX_SAL6_AF,
+	SFX_SAL6_AG,
+	SFX_SAL6_AH,
+	SFX_SAL6_AI,
+	SFX_SAL6_AJ,
+	SFX_SAL6_BA,
+	SFX_SAL6_BB,
+	SFX_SAL6_BC,
+	SFX_SAL6_BD,
+	SFX_SAL6_BE,
+	SFX_SAL6_BF,
+	SFX_SAL6_BH,
+	SFX_SAL6_BJ,
+	SFX_SAL6_BK,
+	SFX_SAL6_CA,
+	SFX_SAL6_CB,
+	SFX_SAL6_CC,
+	SFX_SAL6_CD,
+	SFX_SAL7_AA,
+	SFX_SAL7_AB,
+	SFX_SAL7_AC,
+	SFX_SAL7_AD,
+	SFX_SAL7_AE,
+	SFX_SAL7_AF,
+	SFX_SAL7_AG,
+	SFX_SAL7_AI,
+	SFX_SAL7_AJ,
+	SFX_SAL7_AK,
+	SFX_SAL7_BA,
+	SFX_SAL7_BB,
+	SFX_SAL7_BC,
+	SFX_SAL7_BD,
+	SFX_SAL7_BE,
+	SFX_SAL7_BF,
+	SFX_SAL7_BG,
+	SFX_SAL7_BH,
+	SFX_SAL7_CA,
+	SFX_SAL7_CB,
+	SFX_SAL7_CC,
+	SFX_SAL7_CD,
+	SFX_SAL8_AA,
+	SFX_SAL8_AB,
+	SFX_SAL8_AC,
+	SFX_SAL8_BA,
+	SFX_SAL8_BC,
+	SFX_SAL8_BD,
+	SFX_SAL8_BE,
+	SFX_SAL8_BF,
+	SFX_SAL8_CA,
+	SFX_SAL8_CC,
+	SFX_SAL8_DA,
+	SFX_SAL8_DB,
+	SFX_SAL8_DC,
+	SFX_SAL8_EA,
+	SFX_SAL8_EC,
+	SFX_SAL8_ED,
+	SFX_SAL8_EE,
+	SFX_SAL8_FA,
+	SFX_SAL8_GA,
+	SFX_SAL8_GB,
+	SFX_SAL8_HA,
+	SFX_SAL8_HB,
+	SFX_SAL8_HC,
+	SFX_SAL8_HD,
+	SFX_SAL8_HE,
+	SFX_SAL8_HF,
+	SFX_SAL8_HG,
+	SFX_SAL8_HH,
+	SFX_SALH1AA,
+	SFX_SALH1AB,
+	SFX_SALH1BA,
+	SFX_SALH1BB,
+	SFX_SALH1CA,
+	SFX_SALH1CB,
+	SFX_SALH1DA,
+	SFX_SALH1EA,
+	SFX_SALH1EB,
+	SFX_SALH1FB,
+	SFX_SALH1FC,
+	SFX_SALH1FG,
+	SFX_SALH1GA,
+	SFX_SALH1GB,
+	SFX_SALH1HA,
+	SFX_SALH1HB,
+	SFX_SALH2AA,
+	SFX_SALH2AB,
+	SFX_SALH2AC,
+	SFX_SALH2AD,
+	SFX_SALH2AE,
+	SFX_SALH2AF,
+	SFX_SALH2AG,
+	SFX_SALH2AH,
+	SFX_SALH2BA,
+	SFX_SALH2BB,
+	SFX_SALH2BC,
+	SFX_SALH2BD,
+	SFX_SALH2BE,
+	SFX_SALH2BF,
+	SFX_SALH2BG,
+	SFX_SALH2BH,
+	SFX_SALH2BI,
+	SFX_SALH2CA,
+	SFX_SALH3AA,
+	SFX_SALH3AB,
+	SFX_SALH3AC,
+	SFX_SALH3AD,
+	SFX_SALH3AE,
+	SFX_SALH3AF,
+	SFX_SALH3AG,
+	SFX_SALH3AH,
+	SFX_SALH3AI,
+	SFX_SALH3AJ,
+	SFX_SALH3AK,
+	SFX_SALH3BA,
+	SFX_SALH3BB,
+	SFX_SALH3CA,
+	SFX_SALH3CC,
+	SFX_SALH3CD,
+	SFX_SALH4AA,
+	SFX_SALH4AB,
+	SFX_SALH4AC,
+	SFX_SALH4AD,
+	SFX_SALH4AE,
+	SFX_SALH4AF,
+	SFX_SALH4AG,
+	SFX_SALH4AH,
+	SFX_SALH4AI,
+	SFX_SALH4AJ,
+	SFX_SALH4BA,
+	SFX_SALH4BB,
+	SFX_SALH4BC,
+	SFX_SALH4CA,
+	SFX_SALH4CB,
+	SFX_SALH5CA,
+	SFX_SALH5CB,
+	SFX_SALH5CC,
+	SFX_SALH5DA,
+	SFX_SALH5DB,
+	SFX_SALH5EA,
+	SFX_SALH5EB,
+	SFX_SALH5FA,
+	SFX_SALH5GA,
+	SFX_SALH5GB,
+	SFX_SALH5GC,
+	SFX_SALH5HA,
+	SFX_SALH5IA,
+	SFX_SALH5IB,
+	SFX_SALH5JA,
+	SFX_SALH5KA,
+	SFX_SALH5KB,
+	SFX_SALH5LA,
+	SFX_SALH5LB,
+	SFX_SALH5MA,
+	SFX_SALH5MB,
+	SFX_SALH5MC,
+	SFX_SALH5NA,
+	SFX_SALH5OA,
+	SFX_SALH5OB,
+	SFX_SALH5OC,
+	SFX_SALH5OD,
+	SFX_SALH5OE,
+	SFX_SALH5OF,
+	SFX_SALH5OG,
+	SFX_SALH5OH,
+	SFX_SALH5OI,
+	SFX_SALH5OJ,
+	SFX_SALH5OK,
+	SFX_SALS1AA,
+	SFX_SALS1AB,
+	SFX_SALS1AC,
+	SFX_SALS1AD,
+	SFX_SALS1AE,
+	SFX_SALS1AF,
+	SFX_SALS1AG,
+	SFX_SALS1AH,
+	SFX_SALS1AI,
+	SFX_SALS1BA,
+	SFX_SALS1BB,
+	SFX_SALS1BC,
+	SFX_SALS1BD,
+	SFX_SALS2AA,
+	SFX_SALS2AB,
+	SFX_SALS2AC,
+	SFX_SALS2AD,
+	SFX_SALS2BA,
+	SFX_SALS2BB,
+	SFX_SALS2BC,
+	SFX_SALS2BD,
+	SFX_SALS2BE,
+	SFX_SALS2BF,
+	SFX_SALS2CA,
+	SFX_SALS2CB,
+	SFX_SALS2CC,
+	SFX_SALS2CD,
+	SFX_SALS2CE,
+	SFX_SALS3AA,
+	SFX_SALS3AB,
+	SFX_SALS3AC,
+	SFX_SALS3BA,
+	SFX_SALS3BB,
+	SFX_SALS3BC,
+	SFX_SALS3BD,
+	SFX_SALS3CA,
+	SFX_SALS3CB,
+	SFX_SALS3CC,
+	SFX_SALS3CD,
+	SFX_SALS3CE,
+	SFX_SALS3CF,
+	SFX_SALS3CG,
+	SFX_SALS3DA,
+	SFX_SALS3DB,
+	SFX_SALS3DC,
+	SFX_SALS3DD,
+	SFX_SALS3DE,
+	SFX_SALS3DF,
+	SFX_SALS3DG,
+	SFX_SALS3DH,
+	SFX_SALS3DI,
+	SFX_SALS4AA,
+	SFX_SALS4AB,
+	SFX_SALS4AC,
+	SFX_SALS4AD,
+	SFX_SALS4AE,
+	SFX_SALS4AF,
+	SFX_SALS4BA,
+	SFX_SALS4BB,
+	SFX_SALS4BC,
+	SFX_SALS4BD,
+	SFX_SALS4BE,
+	SFX_SALS4BF,
+	SFX_SALS4BG,
+	SFX_SALS4BH,
+	SFX_SALS5AA,
+	SFX_SALS5AB,
+	SFX_SALS5AC,
+	SFX_SALS5AD,
+	SFX_SALS5AE,
+	SFX_SALS5AF,
+	SFX_SALS5BA,
+	SFX_SALS5BB,
+	SFX_SALS5BC,
+	SFX_SALS5BD,
+	SFX_SALS5BE,
+	SFX_SALS5BF,
+	SFX_SALS5BG,
+	SFX_SALS5CA,
+	SFX_SALS5CB,
+	SFX_SALS5CC,
+	SFX_SALS5CD,
+	SFX_SALS5CE,
+	SFX_SALS5CF,
+	SFX_SALS5CG,
+	SFX_SALS6AA,
+	SFX_SALS6AB,
+	SFX_SALS6AD,
+	SFX_SALS6AE,
+	SFX_SALS6AF,
+	SFX_SALS6AG,
+	SFX_SALS6AH,
+	SFX_SALVATORE_CRASH_CAR_1,
+	SFX_SALVATORE_CRASH_CAR_2,
+	SFX_SALVATORE_CRASH_CAR_3,
+	SFX_SALVATORE_CRASH_CAR_4,
+	SFX_SALVATORE_DRIVER_BLOCKED_1,
+	SFX_SALVATORE_DRIVER_BLOCKED_2,
+	SFX_SALVATORE_DRIVER_BLOCKED_3,
+	SFX_SALVATORE_JACKED_CAR_1,
+	SFX_SALVATORE_JACKED_CAR_2,
+	SFX_SALVATORE_SHOCKED_1,
+	SFX_SALVATORE_SHOCKED_2,
+	SFX_SALX_AA,
+	SFX_SALX_AB,
+	SFX_SALX_AC,
+	SFX_SALX_AD,
+	SFX_SALX_AE,
+	SFX_SALX_AF,
+	SFX_SALX_AG,
+	SFX_SALX_AH,
+	SFX_SALX_AI,
+	SFX_SALX_AK,
+	SFX_SALX_AL,
+	SFX_SALX_AM,
+	SFX_SALX_AN,
+	SFX_SALX_AO,
+	SFX_SALX_AP,
+	SFX_SALX_AQ,
+	SFX_SALX_AR,
+	SFX_SALX_AS,
+	SFX_SCUM_MAN_BUMP_1,
+	SFX_SCUM_MAN_BUMP_2,
+	SFX_SCUM_MAN_BUMP_3,
+	SFX_SCUM_MAN_CHAT_1,
+	SFX_SCUM_MAN_CHAT_2,
+	SFX_SCUM_MAN_CHAT_3,
+	SFX_SCUM_MAN_CHAT_4,
+	SFX_SCUM_MAN_CRASH_CAR_1,
+	SFX_SCUM_MAN_CRASH_CAR_2,
+	SFX_SCUM_MAN_DODGE_1,
+	SFX_SCUM_MAN_DODGE_2,
+	SFX_SCUM_MAN_DRIVER_BLOCKED_1,
+	SFX_SCUM_MAN_DRIVER_BLOCKED_2,
+	SFX_SCUM_MAN_FIGHT_1,
+	SFX_SCUM_MAN_FIGHT_2,
+	SFX_SCUM_MAN_FIGHT_3,
+	SFX_SCUM_MAN_GUN_THREATENED_1,
+	SFX_SCUM_MAN_GUN_THREATENED_2,
+	SFX_SCUM_MAN_JACKED_CAR_1,
+	SFX_SCUM_MAN_JACKED_CAR_2,
+	SFX_SCUM_MAN_JACKED_CAR_3,
+	SFX_SCUM_MAN_SHOCKED_1,
+	SFX_SCUM_MAN_SPECIAL_CASE_1,
+	SFX_SCUM_MAN_SPECIAL_CASE_2,
+	SFX_SCUM_MAN_SPECIAL_CASE_3,
+	SFX_SCUM_WOM_BUMP_1,
+	SFX_SCUM_WOM_BUMP_2,
+	SFX_SCUM_WOM_BUMP_3,
+	SFX_SCUM_WOM_CAR_JACKED_1,
+	SFX_SCUM_WOM_CAR_JACKED_2,
+	SFX_SCUM_WOM_CHAT_1,
+	SFX_SCUM_WOM_CHAT_2,
+	SFX_SCUM_WOM_CHAT_3,
+	SFX_SCUM_WOM_CHAT_4,
+	SFX_SCUM_WOM_CRASH_CAR_1,
+	SFX_SCUM_WOM_CRASH_CAR_2,
+	SFX_SCUM_WOM_DODGE_1,
+	SFX_SCUM_WOM_DODGE_2,
+	SFX_SCUM_WOM_DRIVER_BLOCKED_1,
+	SFX_SCUM_WOM_DRIVER_BLOCKED_2,
+	SFX_SCUM_WOM_FIGHT_1,
+	SFX_SCUM_WOM_FIGHT_2,
+	SFX_SCUM_WOM_FIGHT_3,
+	SFX_SCUM_WOM_GUN_THREATENED_1,
+	SFX_SCUM_WOM_GUN_THREATENED_2,
+	SFX_SCUM_WOM_SHOCKED_1,
+	SFX_SFX_AIRHORN_LEFT,
+	SFX_SFX_AIRHORN_RIGH,
+	SFX_SFX_ANG1_AA,
+	SFX_SFX_ANG1_AB,
+	SFX_SFX_ANG1_AC,
+	SFX_SFX_ANG1_AD,
+	SFX_SFX_ANG1_AE,
+	SFX_SFX_ANG1_AF,
+	SFX_SFX_ANG1_AG,
+	SFX_SFX_ANG1_AH,
+	SFX_SFX_ANG1_AI,
+	SFX_SFX_ANG1_AJ,
+	SFX_SFX_ANG1_AK,
+	SFX_SFX_ANG1_AL,
+	SFX_SFX_ANG1_AM,
+	SFX_SFX_ANG1_AN,
+	SFX_SFX_ANG1_AO,
+	SFX_SFX_ANG1_AP,
+	SFX_SFX_ANG1_AQ,
+	SFX_SFX_ANG1_AR,
+	SFX_SFX_ANG1_AS,
+	SFX_SFX_ANG1_AT,
+	SFX_SFX_ANG1_AU,
+	SFX_SFX_ANG1_AV,
+	SFX_SFX_ANG1_AW,
+	SFX_SFX_BLOW_ROOF,
+	SFX_SFX_BNK1_12,
+	SFX_SFX_CAMERA_LEFT,
+	SFX_SFX_CAMERA_RIGHT,
+	SFX_SFX_CHEER1,
+	SFX_SFX_CHEER2,
+	SFX_SFX_CHEER3,
+	SFX_SFX_CHEER4,
+	SFX_SFX_CRIME_1,
+	SFX_SFX_CRIME_10,
+	SFX_SFX_CRIME_11,
+	SFX_SFX_CRIME_12,
+	SFX_SFX_CRIME_2,
+	SFX_SFX_CRIME_3,
+	SFX_SFX_CRIME_4,
+	SFX_SFX_CRIME_5,
+	SFX_SFX_CRIME_6,
+	SFX_SFX_CRIME_7,
+	SFX_SFX_CRIME_8,
+	SFX_SFX_CRIME_9,
+	SFX_SFX_IN_LIFT,
+	SFX_SFX_JDT3_AA,
+	SFX_SFX_JDT3_AB,
+	SFX_SFX_JDT3_AC,
+	SFX_SFX_JDT3_AD,
+	SFX_SFX_JDT3_AE,
+	SFX_SFX_JDT3_AG,
+	SFX_SFX_JDT3_AH,
+	SFX_SFX_JDT3_BA,
+	SFX_SFX_JDT3_BB,
+	SFX_SFX_JDT3_BC,
+	SFX_SFX_JDT3_BD,
+	SFX_SFX_JDT3_BE,
+	SFX_SFX_JDT3_BF,
+	SFX_SFX_LANAMU1,
+	SFX_SFX_LANAMU2,
+	SFX_SFX_LANSTP1,
+	SFX_SFX_LANSTP2,
+	SFX_SFX_LIFT_BELL,
+	SFX_SFX_LIFT_CLOSE,
+	SFX_SFX_LIFT_OPEN,
+	SFX_SFX_LIFT_RUNNING,
+	SFX_SFX_MAR4_AA,
+	SFX_SFX_MAR4_AB,
+	SFX_SFX_MAR4_AC,
+	SFX_SFX_MAR4_AD,
+	SFX_SFX_MAR4_BA,
+	SFX_SFX_MAR4_BB,
+	SFX_SFX_MAR4_BC,
+	SFX_SFX_MAR4_BD,
+	SFX_SFX_MAR4_BE,
+	SFX_SFX_MAR4_BF,
+	SFX_SFX_MAR4_BG,
+	SFX_SFX_RING,
+	SFX_SFX_OOH1,
+	SFX_SFX_OOH2,
+	SFX_SFX_PAGER_RING,
+	SFX_SFX_POLICE_RADIO_AMBULANCE,
+	SFX_SFX_POLICE_RADIO_BLACK,
+	SFX_SFX_POLICE_RADIO_BLUE,
+	SFX_SFX_POLICE_RADIO_BOAT,
+	SFX_SFX_POLICE_RADIO_BUGGY,
+	SFX_SFX_POLICE_RADIO_BUS,
+	SFX_SFX_POLICE_RADIO_COACH,
+	SFX_SFX_POLICE_RADIO_CRUISER,
+	SFX_SFX_POLICE_RADIO_DINGHY,
+	SFX_SFX_POLICE_RADIO_DOWNTOWN,
+	SFX_SFX_POLICE_RADIO_ESCOBAR_INTERNATIONAL,
+	SFX_SFX_POLICE_RADIO_FIRE_TRUCK,
+	SFX_SFX_POLICE_RADIO_GARBAGE_TRUCK,
+	SFX_SFX_POLICE_RADIO_GOLF_CART,
+	SFX_SFX_POLICE_RADIO_GREEN,
+	SFX_SFX_POLICE_RADIO_GREY,
+	SFX_SFX_POLICE_RADIO_HEARSE,
+	SFX_SFX_POLICE_RADIO_HELICOPTER,
+	SFX_SFX_POLICE_RADIO_ICE_CREAM_VAN,
+	SFX_SFX_POLICE_RADIO_LEAF_LINKS,
+	SFX_SFX_POLICE_RADIO_LITTLE_HAITI,
+	SFX_SFX_POLICE_RADIO_LITTLE_HAVANA,
+	SFX_SFX_POLICE_RADIO_LOWRIDER,
+	SFX_SFX_POLICE_RADIO_MOPED,
+	SFX_SFX_POLICE_RADIO_MOTOBIKE,
+	SFX_SFX_POLICE_RADIO_OCEAN_BEACH,
+	SFX_SFX_POLICE_RADIO_OFFROAD,
+	SFX_SFX_POLICE_RADIO_ORANGE,
+	SFX_SFX_POLICE_RADIO_PICKUP,
+	SFX_SFX_POLICE_RADIO_PLANE,
+	SFX_SFX_POLICE_RADIO_POLICE_CAR,
+	SFX_SFX_POLICE_RADIO_PRAWN_ISLAND,
+	SFX_SFX_POLICE_RADIO_PURPLE,
+	SFX_SFX_POLICE_RADIO_RED,
+	SFX_SFX_POLICE_RADIO_RIG,
+	SFX_SFX_POLICE_RADIO_SEDAN,
+	SFX_SFX_POLICE_RADIO_SILVER,
+	SFX_SFX_POLICE_RADIO_SPEEDBOAT,
+	SFX_SFX_POLICE_RADIO_SPORTS_CAR,
+	SFX_SFX_POLICE_RADIO_STARFISH_ISLAND,
+	SFX_SFX_POLICE_RADIO_STATION_WAGON,
+	SFX_SFX_POLICE_RADIO_STRETCH,
+	SFX_SFX_POLICE_RADIO_SWAT_VAN,
+	SFX_SFX_POLICE_RADIO_TANK,
+	SFX_SFX_POLICE_RADIO_TAXI,
+	SFX_SFX_POLICE_RADIO_TRUCK,
+	SFX_SFX_POLICE_RADIO_TUDOOR,
+	SFX_SFX_POLICE_RADIO_VAN,
+	SFX_SFX_POLICE_RADIO_VICEPORT,
+	SFX_SFX_POLICE_RADIO_VICE_CITY,
+	SFX_SFX_POLICE_RADIO_VICE_CITY_BEACH,
+	SFX_SFX_POLICE_RADIO_VICE_CITY_MAINLAND,
+	SFX_SFX_POLICE_RADIO_VICE_POINT,
+	SFX_SFX_POLICE_RADIO_WASHINGTON_BEACH,
+	SFX_SFX_POLICE_RADIO_WHITE,
+	SFX_SFX_POLICE_RADIO_YELLOW,
+	SFX_SFX_PSYCH_1,
+	SFX_SFX_PSYCH_2,
+	SFX_SFX_SAL7_BA,
+	SFX_SFX_SAL7_BB,
+	SFX_SFX_SAL7_BC,
+	SFX_SFX_SAL7_BD,
+	SFX_SFX_SAL7_BE,
+	SFX_SFX_SAL7_BF,
+	SFX_SFX_SAL7_BG,
+	SFX_SFX_SAL7_BH,
+	SFX_SFX_SAL7_CA,
+	SFX_SFX_SAL7_CB,
+	SFX_SFX_SAL7_CC,
+	SFX_SFX_SAL7_CD,
+	SFX_SFX_SFX_01,
+	SFX_SFX_SFX_02,
+	SFX_SFX_SNIPER_SHOT_1,
+	SFX_SFX_SNIPER_SHOT_2,
+	SFX_SFX_TAX1_1,
+	SFX_SFX_TAX1_2,
+	SFX_SFX_TAX1_3,
+	SFX_SFX_TAX1_4,
+	SFX_SFX_TAX1_5,
+	SFX_SFX_TAX2_1,
+	SFX_SFX_TAX2_2,
+	SFX_SFX_TAX2_3,
+	SFX_SFX_TAX2_4,
+	SFX_SFX_TAX2_5,
+	SFX_SFX_TAX2_6,
+	SFX_SFX_TAX2_7,
+	SFX_SFX_TAX3_1,
+	SFX_SFX_TAX3_2,
+	SFX_SFX_TAX3_3,
+	SFX_SFX_TAX3_4,
+	SFX_SFX_TAX3_5,
+	SFX_SFX_VICE_VOICE_1_ARREST_1,
+	SFX_SFX_VICE_VOICE_1_ARREST_2,
+	SFX_SFX_VICE_VOICE_1_ARREST_3,
+	SFX_SFX_VICE_VOICE_1_MIAMIVICE_EXITING_CAR_1,
+	SFX_SFX_VICE_VOICE_2_ARREST_1,
+	SFX_SFX_VICE_VOICE_2_ARREST_2,
+	SFX_SFX_VICE_VOICE_2_ARREST_3,
+	SFX_SFX_VICE_VOICE_2_MIAMIVICE_EXITING_CAR_1,
+	SFX_SFX_VICE_VOICE_3_ARREST_1,
+	SFX_SFX_VICE_VOICE_3_ARREST_2,
+	SFX_SFX_VICE_VOICE_3_ARREST_3,
+	SFX_SFX_VICE_VOICE_3_MIAMIVICE_EXITING_CAR_1,
+	SFX_SFX_VICE_VOICE_4_ARREST_1,
+	SFX_SFX_VICE_VOICE_4_ARREST_2,
+	SFX_SFX_VICE_VOICE_4_ARREST_3,
+	SFX_SFX_VICE_VOICE_4_MIAMIVICE_EXITING_CAR_1,
+	SFX_SFX_VICE_VOICE_5_ARREST_1,
+	SFX_SFX_VICE_VOICE_5_ARREST_2,
+	SFX_SFX_VICE_VOICE_5_ARREST_3,
+	SFX_SFX_VICE_VOICE_5_MIAMIVICE_EXITING_CAR_1,
+	SFX_SFX_VICE_VOICE_6_ARREST_1,
+	SFX_SFX_VICE_VOICE_6_ARREST_2,
+	SFX_SFX_VICE_VOICE_6_ARREST_3,
+	SFX_SFX_VICE_VOICE_6_MIAMIVICE_EXITING_CAR_1,
+	SFX_SFX_WILLIE_BIKE_REV,
+	SFX_SFX_WILLIE_CAR_REV,
+	SFX_SHOPBELL,
+	SFX_SHOPPER1_BUMP_1,
+	SFX_SHOPPER1_BUMP_2,
+	SFX_SHOPPER1_BUMP_3,
+	SFX_SHOPPER1_CHAT_1,
+	SFX_SHOPPER1_CHAT_2,
+	SFX_SHOPPER1_CHAT_3,
+	SFX_SHOPPER1_CHAT_4,
+	SFX_SHOPPER1_CRASH_CAR_1,
+	SFX_SHOPPER1_CRASH_CAR_2,
+	SFX_SHOPPER1_DODGE_1,
+	SFX_SHOPPER1_DODGE_2,
+	SFX_SHOPPER1_DRIVER_BLOCKED_1,
+	SFX_SHOPPER1_DRIVER_BLOCKED_2,
+	SFX_SHOPPER1_FIGHT_1,
+	SFX_SHOPPER1_FIGHT_2,
+	SFX_SHOPPER1_FIGHT_3,
+	SFX_SHOPPER1_GUN_THREATENED_1,
+	SFX_SHOPPER1_GUN_THREATENED_2,
+	SFX_SHOPPER1_JACKED_CAR_1,
+	SFX_SHOPPER1_JACKED_CAR_2,
+	SFX_SHOPPER1_JACKED_CAR_3,
+	SFX_SHOPPER1_SHOCKED_1,
+	SFX_SHOPPER2_BUMP_1,
+	SFX_SHOPPER2_BUMP_2,
+	SFX_SHOPPER2_BUMP_3,
+	SFX_SHOPPER2_CHAT_1,
+	SFX_SHOPPER2_CHAT_2,
+	SFX_SHOPPER2_CHAT_3,
+	SFX_SHOPPER2_CRASH_CAR_1,
+	SFX_SHOPPER2_CRASH_CAR_2,
+	SFX_SHOPPER2_DODGE_1,
+	SFX_SHOPPER2_DODGE_2,
+	SFX_SHOPPER2_DRIVER_BLOCKED_1,
+	SFX_SHOPPER2_DRIVER_BLOCKED_2,
+	SFX_SHOPPER2_FIGHT_1,
+	SFX_SHOPPER2_FIGHT_2,
+	SFX_SHOPPER2_FIGHT_3,
+	SFX_SHOPPER2_GUN_THREATENED_1,
+	SFX_SHOPPER2_GUN_THREATENED_2,
+	SFX_SHOPPER2_JACKED_CAR_1,
+	SFX_SHOPPER2_JACKED_CAR_2,
+	SFX_SHOPPER2_JACKED_CAR_3,
+	SFX_SHOPPER2_SHOCKED_1,
+	SFX_SHOPPER3_BUMP_1,
+	SFX_SHOPPER3_BUMP_2,
+	SFX_SHOPPER3_BUMP_3,
+	SFX_SHOPPER3_CHAT_1,
+	SFX_SHOPPER3_CHAT_2,
+	SFX_SHOPPER3_CHAT_3,
+	SFX_SHOPPER3_CRASH_CAR_1,
+	SFX_SHOPPER3_CRASH_CAR_2,
+	SFX_SHOPPER3_DODGE_1,
+	SFX_SHOPPER3_DODGE_2,
+	SFX_SHOPPER3_DRIVER_BLOCKED_1,
+	SFX_SHOPPER3_DRIVER_BLOCKED_2,
+	SFX_SHOPPER3_FIGHT_1,
+	SFX_SHOPPER3_FIGHT_2,
+	SFX_SHOPPER3_FIGHT_3,
+	SFX_SHOPPER3_GUN_THREATENED_1,
+	SFX_SHOPPER3_GUN_THREATENED_2,
+	SFX_SHOPPER3_JACKED_CAR_1,
+	SFX_SHOPPER3_JACKED_CAR_2,
+	SFX_SHOPPER3_JACKED_CAR_3,
+	SFX_SHOPPER3_SHOCKED_1,
+	SFX_STRE_AA,
+	SFX_STRE_AB,
+	SFX_STRE_AC,
+	SFX_STRE_AD,
+	SFX_STRE_AE,
+	SFX_STRE_AF,
+	SFX_STRE_AG,
+	SFX_STRE_BA,
+	SFX_STRE_BB,
+	SFX_STRE_BC,
+	SFX_STRE_BD,
+	SFX_STRE_BE,
+	SFX_STRE_BF,
+	SFX_STRE_BG,
+	SFX_STRE_CA,
+	SFX_STRE_CB,
+	SFX_STRE_CC,
+	SFX_STUD_MAN_CHAT_1,
+	SFX_STUD_MAN_CHAT_2,
+	SFX_STUD_MAN_CHAT_3,
+	SFX_STUD_MAN_CHAT_4,
+	SFX_STUD_MAN_CRASH_CAR_1,
+	SFX_STUD_MAN_CRASH_CAR_2,
+	SFX_STUD_MAN_DODGE_1,
+	SFX_STUD_MAN_DODGE_2,
+	SFX_STUD_MAN_DRIVER_BLOCKED_1,
+	SFX_STUD_MAN_DRIVER_BLOCKED_2,
+	SFX_STUD_MAN_FIGHT_1,
+	SFX_STUD_MAN_FIGHT_2,
+	SFX_STUD_MAN_FIGHT_3,
+	SFX_STUD_MAN_GUN_THREATENED_1,
+	SFX_STUD_MAN_GUN_THREATENED_2,
+	SFX_STUD_MAN_JACKED_CAR_1,
+	SFX_STUD_MAN_JACKED_CAR_2,
+	SFX_STUD_MAN_JACKED_CAR_3,
+	SFX_STUD_MAN_SHOCKED_1,
+	SFX_STUD_MAN_SPECIAL_CASE_1,
+	SFX_STUD_MAN_SPECIAL_CASE_2,
+	SFX_STUD_MAN_SPECIAL_CASE_3,
+	SFX_STUD_WOM_BUMP_1,
+	SFX_STUD_WOM_BUMP_2,
+	SFX_STUD_WOM_BUMP_3,
+	SFX_STUD_WOM_CHAT_1,
+	SFX_STUD_WOM_CHAT_2,
+	SFX_STUD_WOM_CHAT_3,
+	SFX_STUD_WOM_CHAT_4,
+	SFX_STUD_WOM_CRASH_CAR_1,
+	SFX_STUD_WOM_CRASH_CAR_2,
+	SFX_STUD_WOM_DODGE_1,
+	SFX_STUD_WOM_DODGE_2,
+	SFX_STUD_WOM_DRIVER_BLOCKED_1,
+	SFX_STUD_WOM_DRIVER_BLOCKED_2,
+	SFX_STUD_WOM_FIGHT_1,
+	SFX_STUD_WOM_FIGHT_2,
+	SFX_STUD_WOM_GUN_THREATENED_1,
+	SFX_STUD_WOM_GUN_THREATENED_2,
+	SFX_STUD_WOM_JACKED_CAR_1,
+	SFX_STUD_WOM_JACKED_CAR_2,
+	SFX_STUD_WOM_JACKED_CAR_3,
+	SFX_STUD_WOM_SHOCKED_1,
+	SFX_ST_MAN_BUMP_1,
+	SFX_ST_MAN_BUMP_2,
+	SFX_ST_MAN_BUMP_3,
+	SFX_ST_MAN_CHAT_1,
+	SFX_ST_MAN_CHAT_2,
+	SFX_ST_MAN_CHAT_3,
+	SFX_ST_MAN_CRASH_CAR_1,
+	SFX_ST_MAN_CRASH_CAR_2,
+	SFX_ST_MAN_DODGE_1,
+	SFX_ST_MAN_DODGE_2,
+	SFX_ST_MAN_DRIVER_BLOCKED_1,
+	SFX_ST_MAN_DRIVER_BLOCKED_2,
+	SFX_ST_MAN_FIGHT_1,
+	SFX_ST_MAN_FIGHT_2,
+	SFX_ST_MAN_GUN_THREATENED_1,
+	SFX_ST_MAN_GUN_THREATENED_2,
+	SFX_ST_MAN_JACKED_CAR_1,
+	SFX_ST_MAN_JACKED_CAR_2,
+	SFX_ST_MAN_JACKED_CAR_3,
+	SFX_ST_WOM_BUMP_1,
+	SFX_ST_WOM_BUMP_2,
+	SFX_ST_WOM_BUMP_3,
+	SFX_ST_WOM_CHAT_1,
+	SFX_ST_WOM_CHAT_2,
+	SFX_ST_WOM_CHAT_3,
+	SFX_ST_WOM_CHAT_4,
+	SFX_ST_WOM_CRASH_CAR_1,
+	SFX_ST_WOM_CRASH_CAR_2,
+	SFX_ST_WOM_DODGE_1,
+	SFX_ST_WOM_DODGE_2,
+	SFX_ST_WOM_DRIVER_BLOCKED_1,
+	SFX_ST_WOM_DRIVER_BLOCKED_2,
+	SFX_ST_WOM_FIGHT_1,
+	SFX_ST_WOM_FIGHT_2,
+	SFX_ST_WOM_FIGHT_3,
+	SFX_ST_WOM_GUN_THREATENED_1,
+	SFX_ST_WOM_GUN_THREATENED_2,
+	SFX_ST_WOM_JACKED_CAR_1,
+	SFX_ST_WOM_JACKED_CAR_2,
+	SFX_ST_WOM_JACKED_CAR_3,
+	SFX_ST_WOM_SHOCKED_1,
+	SFX_SWAT_VOICE_1_ROPE_1,
+	SFX_SWAT_VOICE_1_ROPE_2,
+	SFX_SWAT_VOICE_1_SHOOT_1,
+	SFX_SWAT_VOICE_1_SHOOT_2,
+	SFX_SWAT_VOICE_1_SHOOT_3,
+	SFX_SWAT_VOICE_1_SHOOT_4,
+	SFX_SWAT_VOICE_1_SHOOT_5,
+	SFX_SWAT_VOICE_2_ROPE_1,
+	SFX_SWAT_VOICE_2_ROPE_2,
+	SFX_SWAT_VOICE_2_SHOOT_1,
+	SFX_SWAT_VOICE_2_SHOOT_2,
+	SFX_SWAT_VOICE_2_SHOOT_3,
+	SFX_SWAT_VOICE_2_SHOOT_4,
+	SFX_SWAT_VOICE_2_SHOOT_5,
+	SFX_TAN1_AA,
+	SFX_TAN1_AB,
+	SFX_TAN1_AD,
+	SFX_TAN1_AE,
+	SFX_TAN1_AF,
+	SFX_TAN1_AG,
+	SFX_TAN1_AH,
+	SFX_TAN1_AI,
+	SFX_TAN1_AJ,
+	SFX_TAN2_AA,
+	SFX_TAN2_AB,
+	SFX_TAN2_AC,
+	SFX_TAN2_AE,
+	SFX_TAN2_AF,
+	SFX_TAN2_AG,
+	SFX_TAN2_AH,
+	SFX_TAN2_AJ,
+	SFX_TAN3_AA,
+	SFX_TAN3_AB,
+	SFX_TAN3_AC,
+	SFX_TAN3_AD,
+	SFX_TAN3_AE,
+	SFX_TAN3_AF,
+	SFX_TAN3_AG,
+	SFX_TAN3_AH,
+	SFX_TING,
+	SFX_TONI_ANGRY_BUSTED_01,
+	SFX_TONI_ANGRY_BUSTED_02,
+	SFX_TONI_ANGRY_BUSTED_03,
+	SFX_TONI_ANGRY_BUSTED_04,
+	SFX_TONI_ANGRY_BUSTED_05,
+	SFX_TONI_ANGRY_BUSTED_06,
+	SFX_TONI_ANGRY_BUSTED_07,
+	SFX_TONI_ANGRY_BUSTED_08,
+	SFX_TONI_ANGRY_BUSTED_09,
+	SFX_TONI_ANGRY_BUSTED_10,
+	SFX_TONI_ANGRY_BUSTED_11,
+	SFX_TONI_ANGRY_BUSTED_12,
+	SFX_TONI_ANGRY_BUSTED_13,
+	SFX_TONI_ANGRY_BUSTED_14,
+	SFX_TONI_ANGRY_BUSTED_15,
+	SFX_TONI_ANGRY_BUSTED_16,
+	SFX_TONI_ANGRY_CHASED_01,
+	SFX_TONI_ANGRY_CHASED_02,
+	SFX_TONI_ANGRY_CHASED_03,
+	SFX_TONI_ANGRY_CHASED_04,
+	SFX_TONI_ANGRY_CHASED_05,
+	SFX_TONI_ANGRY_CHASED_06,
+	SFX_TONI_ANGRY_CHASED_07,
+	SFX_TONI_ANGRY_CHASED_08,
+	SFX_TONI_ANGRY_CHASED_09,
+	SFX_TONI_ANGRY_CHASED_10,
+	SFX_TONI_ANGRY_CHASED_11,
+	SFX_TONI_ANGRY_CHASED_12,
+	SFX_TONI_ANGRY_CHASED_13,
+	SFX_TONI_ANGRY_CHASED_14,
+	SFX_TONI_ANGRY_CHASED_15,
+	SFX_TONI_ANGRY_CHASED_16,
+	SFX_TONI_ANGRY_CHASED_17,
+	SFX_TONI_ANGRY_CHASED_18,
+	SFX_TONI_ANGRY_CHASED_19,
+	SFX_TONI_ANGRY_CHASED_20,
+	SFX_TONI_ANGRY_CHASED_21,
+	SFX_TONI_ANGRY_CHASED_22,
+	SFX_TONI_ANGRY_CHASED_23,
+	SFX_TONI_ANGRY_CHASED_24,
+	SFX_TONI_ANGRY_CHASED_25,
+	SFX_TONI_ANGRY_CRASH_01,
+	SFX_TONI_ANGRY_CRASH_02,
+	SFX_TONI_ANGRY_CRASH_03,
+	SFX_TONI_ANGRY_CRASH_04,
+	SFX_TONI_ANGRY_CRASH_05,
+	SFX_TONI_ANGRY_CRASH_06,
+	SFX_TONI_ANGRY_CRASH_07,
+	SFX_TONI_ANGRY_CRASH_08,
+	SFX_TONI_ANGRY_CRASH_09,
+	SFX_TONI_ANGRY_CRASH_10,
+	SFX_TONI_ANGRY_CRASH_11,
+	SFX_TONI_ANGRY_CRASH_12,
+	SFX_TONI_ANGRY_CRASH_13,
+	SFX_TONI_ANGRY_CRASH_14,
+	SFX_TONI_ANGRY_CRASH_15,
+	SFX_TONI_ANGRY_CRASH_16,
+	SFX_TONI_ANGRY_CRASH_17,
+	SFX_TONI_ANGRY_CRASH_18,
+	SFX_TONI_ANGRY_CRASH_19,
+	SFX_TONI_ANGRY_CRASH_20,
+	SFX_TONI_ANGRY_CRASH_21,
+	SFX_TONI_ANGRY_CRASH_22,
+	SFX_TONI_ANGRY_CRASH_23,
+	SFX_TONI_ANGRY_CRASH_24,
+	SFX_TONI_ANGRY_CRASH_25,
+	SFX_TONI_ANGRY_CRASH_26,
+	SFX_TONI_ANGRY_CRASH_27,
+	SFX_TONI_ANGRY_CRASH_28,
+	SFX_TONI_ANGRY_CRASH_29,
+	SFX_TONI_ANGRY_FIGHT_01,
+	SFX_TONI_ANGRY_FIGHT_02,
+	SFX_TONI_ANGRY_FIGHT_03,
+	SFX_TONI_ANGRY_FIGHT_04,
+	SFX_TONI_ANGRY_FIGHT_05,
+	SFX_TONI_ANGRY_FIGHT_06,
+	SFX_TONI_ANGRY_FIGHT_07,
+	SFX_TONI_ANGRY_FIGHT_08,
+	SFX_TONI_ANGRY_FIGHT_09,
+	SFX_TONI_ANGRY_FIGHT_10,
+	SFX_TONI_ANGRY_FIGHT_11,
+	SFX_TONI_ANGRY_FIGHT_12,
+	SFX_TONI_ANGRY_FIGHT_13,
+	SFX_TONI_ANGRY_FIGHT_14,
+	SFX_TONI_ANGRY_FIGHT_15,
+	SFX_TONI_ANGRY_FIGHT_16,
+	SFX_TONI_ANGRY_FIGHT_17,
+	SFX_TONI_ANGRY_FIGHT_18,
+	SFX_TONI_ANGRY_FIGHT_19,
+	SFX_TONI_ANGRY_FIGHT_20,
+	SFX_TONI_ANGRY_FIGHT_21,
+	SFX_TONI_ANGRY_FIGHT_22,
+	SFX_TONI_ANGRY_FIGHT_23,
+	SFX_TONI_ANGRY_FIGHT_24,
+	SFX_TONI_ANGRY_FIGHT_25,
+	SFX_TONI_ANGRY_FIGHT_26,
+	SFX_TONI_ANGRY_FIGHT_27,
+	SFX_TONI_ANGRY_FIGHT_28,
+	SFX_TONI_ANGRY_FIGHT_29,
+	SFX_TONI_ANGRY_FIGHT_30,
+	SFX_TONI_ANGRY_FIGHT_31,
+	SFX_TONI_ANGRY_FIGHT_32,
+	SFX_TONI_ANGRY_FIGHT_33,
+	SFX_TONI_ANGRY_FIGHT_34,
+	SFX_TONI_ANGRY_FIGHT_35,
+	SFX_TONI_ANGRY_FIGHT_36,
+	SFX_TONI_ANGRY_FIGHT_37,
+	SFX_TONI_ANGRY_FIGHT_38,
+	SFX_TONI_ANGRY_FIGHT_39,
+	SFX_TONI_ANGRY_JACKED_01,
+	SFX_TONI_ANGRY_JACKED_02,
+	SFX_TONI_ANGRY_JACKED_03,
+	SFX_TONI_ANGRY_JACKED_04,
+	SFX_TONI_ANGRY_JACKED_05,
+	SFX_TONI_ANGRY_JACKED_06,
+	SFX_TONI_ANGRY_JACKED_07,
+	SFX_TONI_ANGRY_JACKED_08,
+	SFX_TONI_ANGRY_JACKED_09,
+	SFX_TONI_ANGRY_JACKED_10,
+	SFX_TONI_ANGRY_JACKED_11,
+	SFX_TONI_ANGRY_JACKED_12,
+	SFX_TONI_ANGRY_JACKED_13,
+	SFX_TONI_ANGRY_JACKED_14,
+	SFX_TONI_ANGRY_JACKED_15,
+	SFX_TONI_ANGRY_JACKED_16,
+	SFX_TONI_ANGRY_JACKING_01,
+	SFX_TONI_ANGRY_JACKING_02,
+	SFX_TONI_ANGRY_JACKING_03,
+	SFX_TONI_ANGRY_JACKING_04,
+	SFX_TONI_ANGRY_JACKING_05,
+	SFX_TONI_ANGRY_JACKING_06,
+	SFX_TONI_ANGRY_JACKING_07,
+	SFX_TONI_ANGRY_JACKING_08,
+	SFX_TONI_ANGRY_JACKING_09,
+	SFX_TONI_ANGRY_JACKING_10,
+	SFX_TONI_ANGRY_JACKING_11,
+	SFX_TONI_ANGRY_JACKING_12,
+	SFX_TONI_ANGRY_JACKING_13,
+	SFX_TONI_ANGRY_JACKING_14,
+	SFX_TONI_ANGRY_JACKING_15,
+	SFX_TONI_ANGRY_JACKING_16,
+	SFX_TONI_ANGRY_JACKING_17,
+	SFX_TONI_ANGRY_JACKING_18,
+	SFX_TONI_ANGRY_JACKING_19,
+	SFX_TONI_ANGRY_JACKING_20,
+	SFX_TONI_ANGRY_JACKING_21,
+	SFX_TONI_ANGRY_JACKING_22,
+	SFX_TONI_ANGRY_JACKING_23,
+	SFX_TONI_ANGRY_JACKING_24,
+	SFX_TONI_ANGRY_JACKING_25,
+	SFX_TONI_ANGRY_JACKING_26,
+	SFX_TONI_ANGRY_JACKING_27,
+	SFX_TONI_ANGRY_JACKING_28,
+	SFX_TONI_ANGRY_JACKING_29,
+	SFX_TONI_ANGRY_JACKING_30,
+	SFX_TONI_ANGRY_JACKING_31,
+	SFX_TONI_ANGRY_JACKING_32,
+	SFX_TONI_ANGRY_JACKING_33,
+	SFX_TONI_ANGRY_PICK_UP_CASH_01,
+	SFX_TONI_ANGRY_PICK_UP_CASH_02,
+	SFX_TONI_ANGRY_PICK_UP_CASH_03,
+	SFX_TONI_ANGRY_PICK_UP_CASH_04,
+	SFX_TONI_ANGRY_PICK_UP_CASH_05,
+	SFX_TONI_ANGRY_PICK_UP_CASH_06,
+	SFX_TONI_ANGRY_PICK_UP_CASH_07,
+	SFX_TONI_ANGRY_PICK_UP_CASH_08,
+	SFX_TONI_ANGRY_PICK_UP_CASH_09,
+	SFX_TONI_ANGRY_PICK_UP_CASH_10,
+	SFX_TONI_ANGRY_PICK_UP_CASH_11,
+	SFX_TONI_ANGRY_PICK_UP_CASH_12,
+	SFX_TONI_ANGRY_PICK_UP_HOOKER_01,
+	SFX_TONI_ANGRY_PICK_UP_HOOKER_02,
+	SFX_TONI_ANGRY_PICK_UP_HOOKER_03,
+	SFX_TONI_ANGRY_PICK_UP_HOOKER_04,
+	SFX_TONI_ANGRY_PICK_UP_HOOKER_05,
+	SFX_TONI_ANGRY_PICK_UP_HOOKER_06,
+	SFX_TONI_ANGRY_PICK_UP_HOOKER_07,
+	SFX_TONI_ANGRY_PICK_UP_HOOKER_08,
+	SFX_TONI_ANGRY_PULL_GUN_01,
+	SFX_TONI_ANGRY_PULL_GUN_02,
+	SFX_TONI_ANGRY_PULL_GUN_03,
+	SFX_TONI_ANGRY_PULL_GUN_04,
+	SFX_TONI_ANGRY_PULL_GUN_05,
+	SFX_TONI_ANGRY_PULL_GUN_06,
+	SFX_TONI_ANGRY_PULL_GUN_07,
+	SFX_TONI_ANGRY_PULL_GUN_08,
+	SFX_TONI_ANGRY_PULL_GUN_09,
+	SFX_TONI_ANGRY_PULL_GUN_10,
+	SFX_TONI_ANGRY_PULL_GUN_11,
+	SFX_TONI_ANGRY_PULL_GUN_12,
+	SFX_TONI_ANGRY_PULL_GUN_13,
+	SFX_TONI_ANGRY_PULL_GUN_14,
+	SFX_TONI_ANGRY_PULL_GUN_15,
+	SFX_TONI_ANGRY_PULL_GUN_16,
+	SFX_TONI_ANGRY_PULL_GUN_17,
+	SFX_TONI_ANGRY_PULL_GUN_18,
+	SFX_TONI_ANGRY_PULL_GUN_19,
+	SFX_TONI_ANGRY_PULL_GUN_20,
+	SFX_TONI_ANGRY_PULL_GUN_21,
+	SFX_TONI_ANGRY_PULL_GUN_22,
+	SFX_TONI_ANGRY_PULL_GUN_23,
+	SFX_TONI_ANGRY_PULL_GUN_24,
+	SFX_TONI_ANGRY_PULL_GUN_25,
+	SFX_TONI_ANGRY_PULL_GUN_26,
+	SFX_TONI_ANGRY_PULL_GUN_27,
+	SFX_TONI_ANGRY_PULL_GUN_28,
+	SFX_TONI_ANGRY_PULL_GUN_29,
+	SFX_TONI_ANGRY_SEX_01,
+	SFX_TONI_ANGRY_SEX_02,
+	SFX_TONI_ANGRY_SEX_03,
+	SFX_TONI_ANGRY_SEX_04,
+	SFX_TONI_ANGRY_SEX_05,
+	SFX_TONI_ANGRY_SEX_06,
+	SFX_TONI_ANGRY_SEX_07,
+	SFX_TONI_ANGRY_SEX_08,
+	SFX_TONI_ANGRY_SEX_09,
+	SFX_TONI_ANGRY_SEX_10,
+	SFX_TONI_ANGRY_SHOOT_01,
+	SFX_TONI_ANGRY_SHOOT_02,
+	SFX_TONI_ANGRY_SHOOT_03,
+	SFX_TONI_ANGRY_SHOOT_04,
+	SFX_TONI_ANGRY_SHOOT_05,
+	SFX_TONI_ANGRY_SHOOT_06,
+	SFX_TONI_ANGRY_SHOOT_07,
+	SFX_TONI_ANGRY_SHOOT_08,
+	SFX_TONI_ANGRY_SHOOT_09,
+	SFX_TONI_ANGRY_SHOOT_10,
+	SFX_TONI_ANGRY_SHOOT_11,
+	SFX_TONI_ANGRY_SHOOT_12,
+	SFX_TONI_ANGRY_SHOOT_13,
+	SFX_TONI_ANGRY_SHOOT_14,
+	SFX_TONI_ANGRY_SHOOT_15,
+	SFX_TONI_ANGRY_SHOOT_16,
+	SFX_TONI_ANGRY_SHOOT_17,
+	SFX_TONI_ANGRY_SHOOT_18,
+	SFX_TONI_ANGRY_SHOOT_19,
+	SFX_TONI_ANGRY_SHOOT_20,
+	SFX_TONI_ANGRY_SHOOT_21,
+	SFX_TONI_ANGRY_SHOOT_22,
+	SFX_TONI_ANGRY_SHOOT_23,
+	SFX_TONI_ANGRY_SHOOT_24,
+	SFX_TONI_ANGRY_SHOOT_25,
+	SFX_TONI_ANGRY_SHOOT_26,
+	SFX_TONI_ANGRY_SHOOT_27,
+	SFX_TONI_ANGRY_SHOOT_28,
+	SFX_TONI_ANGRY_SHOOT_29,
+	SFX_TONI_ANGRY_SHOOT_30,
+	SFX_TONI_ANGRY_SHOOT_31,
+	SFX_TONI_ANGRY_SHOOT_32,
+	SFX_TONI_ANGRY_SHOOT_33,
+	SFX_TONI_ANGRY_SHOOT_34,
+	SFX_TONI_ANGRY_SHOOT_35,
+	SFX_TONI_ANGRY_SHOOT_36,
+	SFX_TONI_CALM_BUSTED_01,
+	SFX_TONI_CALM_BUSTED_02,
+	SFX_TONI_CALM_BUSTED_03,
+	SFX_TONI_CALM_BUSTED_04,
+	SFX_TONI_CALM_BUSTED_05,
+	SFX_TONI_CALM_BUSTED_06,
+	SFX_TONI_CALM_BUSTED_07,
+	SFX_TONI_CALM_BUSTED_08,
+	SFX_TONI_CALM_BUSTED_10,
+	SFX_TONI_CALM_BUSTED_11,
+	SFX_TONI_CALM_BUSTED_12,
+	SFX_TONI_CALM_BUSTED_13,
+	SFX_TONI_CALM_BUSTED_14,
+	SFX_TONI_CALM_BUSTED_15,
+	SFX_TONI_CALM_BUSTED_16,
+	SFX_TONI_CALM_BUSTED_17,
+	SFX_TONI_CALM_BUSTED_18,
+	SFX_TONI_CALM_BUSTED_19,
+	SFX_TONI_CALM_BUSTED_20,
+	SFX_TONI_CALM_BUSTED_21,
+	SFX_TONI_CALM_BUSTED_22,
+	SFX_TONI_CALM_BUSTED_23,
+	SFX_TONI_CALM_BUSTED_24,
+	SFX_TONI_CALM_BUSTED_25,
+	SFX_TONI_CALM_CHASED_01,
+	SFX_TONI_CALM_CHASED_02,
+	SFX_TONI_CALM_CHASED_03,
+	SFX_TONI_CALM_CHASED_04,
+	SFX_TONI_CALM_CHASED_05,
+	SFX_TONI_CALM_CHASED_06,
+	SFX_TONI_CALM_CHASED_07,
+	SFX_TONI_CALM_CHASED_08,
+	SFX_TONI_CALM_CHASED_09,
+	SFX_TONI_CALM_CHASED_10,
+	SFX_TONI_CALM_CHASED_11,
+	SFX_TONI_CALM_CHASED_12,
+	SFX_TONI_CALM_CHASED_13,
+	SFX_TONI_CALM_CHASED_14,
+	SFX_TONI_CALM_CHASED_15,
+	SFX_TONI_CALM_CHASED_16,
+	SFX_TONI_CALM_CHASED_17,
+	SFX_TONI_CALM_CHASED_18,
+	SFX_TONI_CALM_CHASED_19,
+	SFX_TONI_CALM_CHASED_20,
+	SFX_TONI_CALM_CRASH_01,
+	SFX_TONI_CALM_CRASH_02,
+	SFX_TONI_CALM_CRASH_03,
+	SFX_TONI_CALM_CRASH_04,
+	SFX_TONI_CALM_CRASH_05,
+	SFX_TONI_CALM_CRASH_06,
+	SFX_TONI_CALM_CRASH_07,
+	SFX_TONI_CALM_CRASH_08,
+	SFX_TONI_CALM_CRASH_09,
+	SFX_TONI_CALM_CRASH_10,
+	SFX_TONI_CALM_CRASH_11,
+	SFX_TONI_CALM_CRASH_12,
+	SFX_TONI_CALM_CRASH_13,
+	SFX_TONI_CALM_CRASH_14,
+	SFX_TONI_CALM_CRASH_15,
+	SFX_TONI_CALM_CRASH_16,
+	SFX_TONI_CALM_CRASH_17,
+	SFX_TONI_CALM_CRASH_18,
+	SFX_TONI_CALM_CRASH_19,
+	SFX_TONI_CALM_CRASH_20,
+	SFX_TONI_CALM_CRASH_21,
+	SFX_TONI_CALM_CRASH_22,
+	SFX_TONI_CALM_CRASH_23,
+	SFX_TONI_CALM_CRASH_24,
+	SFX_TONI_CALM_CRASH_25,
+	SFX_TONI_CALM_CRASH_26,
+	SFX_TONI_CALM_CRASH_27,
+	SFX_TONI_CALM_CRASH_28,
+	SFX_TONI_CALM_CRASH_29,
+	SFX_TONI_CALM_CRASH_30,
+	SFX_TONI_CALM_CRASH_31,
+	SFX_TONI_CALM_FIGHT_01,
+	SFX_TONI_CALM_FIGHT_02,
+	SFX_TONI_CALM_FIGHT_03,
+	SFX_TONI_CALM_FIGHT_04,
+	SFX_TONI_CALM_FIGHT_05,
+	SFX_TONI_CALM_FIGHT_06,
+	SFX_TONI_CALM_FIGHT_07,
+	SFX_TONI_CALM_FIGHT_08,
+	SFX_TONI_CALM_FIGHT_09,
+	SFX_TONI_CALM_FIGHT_10,
+	SFX_TONI_CALM_FIGHT_11,
+	SFX_TONI_CALM_FIGHT_12,
+	SFX_TONI_CALM_FIGHT_13,
+	SFX_TONI_CALM_FIGHT_14,
+	SFX_TONI_CALM_FIGHT_15,
+	SFX_TONI_CALM_FIGHT_16,
+	SFX_TONI_CALM_FIGHT_17,
+	SFX_TONI_CALM_FIGHT_18,
+	SFX_TONI_CALM_FIGHT_19,
+	SFX_TONI_CALM_FIGHT_20,
+	SFX_TONI_CALM_FIGHT_21,
+	SFX_TONI_CALM_FIGHT_22,
+	SFX_TONI_CALM_FIGHT_23,
+	SFX_TONI_CALM_FIGHT_24,
+	SFX_TONI_CALM_FIGHT_25,
+	SFX_TONI_CALM_FIGHT_26,
+	SFX_TONI_CALM_FIGHT_27,
+	SFX_TONI_CALM_FIGHT_28,
+	SFX_TONI_CALM_FIGHT_29,
+	SFX_TONI_CALM_FIGHT_30,
+	SFX_TONI_CALM_FIGHT_31,
+	SFX_TONI_CALM_FIGHT_32,
+	SFX_TONI_CALM_FIGHT_33,
+	SFX_TONI_CALM_FIGHT_34,
+	SFX_TONI_CALM_FIGHT_35,
+	SFX_TONI_CALM_FIGHT_36,
+	SFX_TONI_CALM_FIGHT_37,
+	SFX_TONI_CALM_FIGHT_38,
+	SFX_TONI_CALM_FIGHT_39,
+	SFX_TONI_CALM_FIGHT_40,
+	SFX_TONI_CALM_FIGHT_41,
+	SFX_TONI_CALM_FIGHT_42,
+	SFX_TONI_CALM_JACKED_01,
+	SFX_TONI_CALM_JACKED_02,
+	SFX_TONI_CALM_JACKED_03,
+	SFX_TONI_CALM_JACKED_04,
+	SFX_TONI_CALM_JACKED_05,
+	SFX_TONI_CALM_JACKED_06,
+	SFX_TONI_CALM_JACKED_07,
+	SFX_TONI_CALM_JACKED_08,
+	SFX_TONI_CALM_JACKED_09,
+	SFX_TONI_CALM_JACKED_10,
+	SFX_TONI_CALM_JACKED_11,
+	SFX_TONI_CALM_JACKED_12,
+	SFX_TONI_CALM_JACKED_13,
+	SFX_TONI_CALM_JACKED_14,
+	SFX_TONI_CALM_JACKED_15,
+	SFX_TONI_CALM_JACKED_16,
+	SFX_TONI_CALM_JACKED_17,
+	SFX_TONI_CALM_JACKED_18,
+	SFX_TONI_CALM_JACKED_19,
+	SFX_TONI_CALM_JACKED_20,
+	SFX_TONI_CALM_JACKED_21,
+	SFX_TONI_CALM_JACKED_22,
+	SFX_TONI_CALM_JACKED_23,
+	SFX_TONI_CALM_JACKING_01,
+	SFX_TONI_CALM_JACKING_02,
+	SFX_TONI_CALM_JACKING_03,
+	SFX_TONI_CALM_JACKING_04,
+	SFX_TONI_CALM_JACKING_05,
+	SFX_TONI_CALM_JACKING_06,
+	SFX_TONI_CALM_JACKING_07,
+	SFX_TONI_CALM_JACKING_08,
+	SFX_TONI_CALM_JACKING_09,
+	SFX_TONI_CALM_JACKING_10,
+	SFX_TONI_CALM_JACKING_11,
+	SFX_TONI_CALM_JACKING_12,
+	SFX_TONI_CALM_JACKING_13,
+	SFX_TONI_CALM_JACKING_14,
+	SFX_TONI_CALM_JACKING_15,
+	SFX_TONI_CALM_JACKING_16,
+	SFX_TONI_CALM_JACKING_17,
+	SFX_TONI_CALM_JACKING_18,
+	SFX_TONI_CALM_JACKING_19,
+	SFX_TONI_CALM_JACKING_20,
+	SFX_TONI_CALM_JACKING_21,
+	SFX_TONI_CALM_JACKING_22,
+	SFX_TONI_CALM_JACKING_23,
+	SFX_TONI_CALM_JACKING_24,
+	SFX_TONI_CALM_JACKING_25,
+	SFX_TONI_CALM_JACKING_26,
+	SFX_TONI_CALM_JACKING_27,
+	SFX_TONI_CALM_JACKING_28,
+	SFX_TONI_CALM_JACKING_29,
+	SFX_TONI_CALM_JACKING_30,
+	SFX_TONI_CALM_JACKING_31,
+	SFX_TONI_CALM_JACKING_32,
+	SFX_TONI_CALM_JACKING_33,
+	SFX_TONI_CALM_JACKING_34,
+	SFX_TONI_CALM_JACKING_35,
+	SFX_TONI_CALM_JACKING_36,
+	SFX_TONI_CALM_JACKING_37,
+	SFX_TONI_CALM_JACKING_38,
+	SFX_TONI_CALM_JACKING_39,
+	SFX_TONI_CALM_PICK_UP_CASH_01,
+	SFX_TONI_CALM_PICK_UP_CASH_02,
+	SFX_TONI_CALM_PICK_UP_CASH_03,
+	SFX_TONI_CALM_PICK_UP_CASH_04,
+	SFX_TONI_CALM_PICK_UP_CASH_05,
+	SFX_TONI_CALM_PICK_UP_CASH_06,
+	SFX_TONI_CALM_PICK_UP_CASH_07,
+	SFX_TONI_CALM_PICK_UP_CASH_08,
+	SFX_TONI_CALM_PICK_UP_CASH_09,
+	SFX_TONI_CALM_PICK_UP_CASH_10,
+	SFX_TONI_CALM_PICK_UP_CASH_11,
+	SFX_TONI_CALM_PICK_UP_CASH_12,
+	SFX_TONI_CALM_PICK_UP_CASH_13,
+	SFX_TONI_CALM_PICK_UP_CASH_14,
+	SFX_TONI_CALM_PICK_UP_CASH_15,
+	SFX_TONI_CALM_PICK_UP_CASH_16,
+	SFX_TONI_CALM_PICK_UP_HOOKER_01,
+	SFX_TONI_CALM_PICK_UP_HOOKER_02,
+	SFX_TONI_CALM_PICK_UP_HOOKER_03,
+	SFX_TONI_CALM_PICK_UP_HOOKER_04,
+	SFX_TONI_CALM_PICK_UP_HOOKER_05,
+	SFX_TONI_CALM_PICK_UP_HOOKER_06,
+	SFX_TONI_CALM_PICK_UP_HOOKER_07,
+	SFX_TONI_CALM_PICK_UP_HOOKER_08,
+	SFX_TONI_CALM_PICK_UP_HOOKER_09,
+	SFX_TONI_CALM_PICK_UP_HOOKER_10,
+	SFX_TONI_CALM_PICK_UP_HOOKER_11,
+	SFX_TONI_CALM_PICK_UP_HOOKER_12,
+	SFX_TONI_CALM_PICK_UP_HOOKER_13,
+	SFX_TONI_CALM_PICK_UP_HOOKER_14,
+	SFX_TONI_CALM_PICK_UP_HOOKER_15,
+	SFX_TONI_CALM_PICK_UP_HOOKER_16,
+	SFX_TONI_CALM_PICK_UP_HOOKER_17,
+	SFX_TONI_CALM_PICK_UP_HOOKER_18,
+	SFX_TONI_CALM_PULL_GUN_01,
+	SFX_TONI_CALM_PULL_GUN_02,
+	SFX_TONI_CALM_PULL_GUN_03,
+	SFX_TONI_CALM_PULL_GUN_04,
+	SFX_TONI_CALM_PULL_GUN_05,
+	SFX_TONI_CALM_PULL_GUN_06,
+	SFX_TONI_CALM_PULL_GUN_07,
+	SFX_TONI_CALM_PULL_GUN_08,
+	SFX_TONI_CALM_PULL_GUN_09,
+	SFX_TONI_CALM_PULL_GUN_10,
+	SFX_TONI_CALM_PULL_GUN_11,
+	SFX_TONI_CALM_PULL_GUN_12,
+	SFX_TONI_CALM_PULL_GUN_13,
+	SFX_TONI_CALM_PULL_GUN_14,
+	SFX_TONI_CALM_PULL_GUN_15,
+	SFX_TONI_CALM_PULL_GUN_16,
+	SFX_TONI_CALM_PULL_GUN_17,
+	SFX_TONI_CALM_PULL_GUN_18,
+	SFX_TONI_CALM_PULL_GUN_19,
+	SFX_TONI_CALM_PULL_GUN_20,
+	SFX_TONI_CALM_PULL_GUN_21,
+	SFX_TONI_CALM_PULL_GUN_22,
+	SFX_TONI_CALM_PULL_GUN_23,
+	SFX_TONI_CALM_PULL_GUN_24,
+	SFX_TONI_CALM_PULL_GUN_25,
+	SFX_TONI_CALM_PULL_GUN_26,
+	SFX_TONI_CALM_PULL_GUN_27,
+	SFX_TONI_CALM_PULL_GUN_28,
+	SFX_TONI_CALM_PULL_GUN_29,
+	SFX_TONI_CALM_PULL_GUN_30,
+	SFX_TONI_CALM_PULL_GUN_31,
+	SFX_TONI_CALM_PULL_GUN_32,
+	SFX_TONI_CALM_PULL_GUN_33,
+	SFX_TONI_CALM_PULL_GUN_34,
+	SFX_TONI_CALM_PULL_GUN_35,
+	SFX_TONI_CALM_SEX_01,
+	SFX_TONI_CALM_SEX_02,
+	SFX_TONI_CALM_SEX_03,
+	SFX_TONI_CALM_SEX_04,
+	SFX_TONI_CALM_SEX_05,
+	SFX_TONI_CALM_SEX_06,
+	SFX_TONI_CALM_SEX_07,
+	SFX_TONI_CALM_SEX_08,
+	SFX_TONI_CALM_SEX_09,
+	SFX_TONI_CALM_SEX_10,
+	SFX_TONI_CALM_SEX_11,
+	SFX_TONI_CALM_SHOOT_01,
+	SFX_TONI_CALM_SHOOT_02,
+	SFX_TONI_CALM_SHOOT_03,
+	SFX_TONI_CALM_SHOOT_04,
+	SFX_TONI_CALM_SHOOT_05,
+	SFX_TONI_CALM_SHOOT_06,
+	SFX_TONI_CALM_SHOOT_07,
+	SFX_TONI_CALM_SHOOT_08,
+	SFX_TONI_CALM_SHOOT_09,
+	SFX_TONI_CALM_SHOOT_10,
+	SFX_TONI_CALM_SHOOT_11,
+	SFX_TONI_CALM_SHOOT_12,
+	SFX_TONI_CALM_SHOOT_13,
+	SFX_TONI_CALM_SHOOT_14,
+	SFX_TONI_CALM_SHOOT_15,
+	SFX_TONI_CALM_SHOOT_16,
+	SFX_TONI_CALM_SHOOT_17,
+	SFX_TONI_CALM_SHOOT_18,
+	SFX_TONI_CALM_SHOOT_19,
+	SFX_TONI_CALM_SHOOT_20,
+	SFX_TONI_CALM_SHOOT_21,
+	SFX_TONI_CALM_SHOOT_22,
+	SFX_TONI_CALM_SHOOT_23,
+	SFX_TONI_CALM_SHOOT_24,
+	SFX_TONI_CALM_SHOOT_25,
+	SFX_TONI_CALM_SHOOT_26,
+	SFX_TONI_CALM_SHOOT_27,
+	SFX_TONI_CALM_SHOOT_28,
+	SFX_TONI_CALM_SHOOT_29,
+	SFX_TONI_CALM_SHOOT_30,
+	SFX_TONI_GENERAL_AFTER_SEX_01,
+	SFX_TONI_GENERAL_AFTER_SEX_02,
+	SFX_TONI_GENERAL_AFTER_SEX_03,
+	SFX_TONI_GENERAL_AFTER_SEX_04,
+	SFX_TONI_GENERAL_AFTER_SEX_05,
+	SFX_TONI_GENERAL_AFTER_SEX_06,
+	SFX_TONI_GENERAL_AFTER_SEX_07,
+	SFX_TONI_GENERAL_AFTER_SEX_08,
+	SFX_TONI_GENERAL_AFTER_SEX_09,
+	SFX_TONI_GENERAL_AFTER_SEX_10,
+	SFX_TONI_GENERAL_AFTER_SEX_11,
+	SFX_TONI_GENERAL_AFTER_SEX_12,
+	SFX_TONI_GENERAL_AFTER_SEX_13,
+	SFX_TONI_GENERAL_AFTER_SEX_14,
+	SFX_TONI_GENERAL_HIT_GROUND_01,
+	SFX_TONI_GENERAL_HIT_GROUND_02,
+	SFX_TONI_GENERAL_HIT_GROUND_03,
+	SFX_TONI_GENERAL_HIT_GROUND_04,
+	SFX_TONI_GENERAL_HIT_GROUND_08,
+	SFX_TONI_GENERAL_HIT_GROUND_09,
+	SFX_TONI_GENERAL_HIT_GROUND_10,
+	SFX_TONI_GENERAL_HIT_GROUND_11,
+	SFX_TONI_GENERAL_HIT_GROUND_12,
+	SFX_TONI_GENERAL_HIT_GROUND_13,
+	SFX_TONI_GENERAL_HIT_GROUND_14,
+	SFX_TONI_GENERAL_HIT_GROUND_15,
+	SFX_TONI_GENERAL_IMP_HI_01,
+	SFX_TONI_GENERAL_IMP_HI_02,
+	SFX_TONI_GENERAL_IMP_HI_03,
+	SFX_TONI_GENERAL_IMP_HI_04,
+	SFX_TONI_GENERAL_IMP_HI_05,
+	SFX_TONI_GENERAL_IMP_HI_06,
+	SFX_TONI_GENERAL_IMP_HI_07,
+	SFX_TONI_GENERAL_IMP_HI_08,
+	SFX_TONI_GENERAL_IMP_HI_09,
+	SFX_TONI_GENERAL_IMP_HI_10,
+	SFX_TONI_GENERAL_IMP_HI_11,
+	SFX_TONI_GENERAL_IMP_HI_12,
+	SFX_TONI_GENERAL_IMP_HI_13,
+	SFX_TONI_GENERAL_IMP_HI_14,
+	SFX_TONI_GENERAL_IMP_HI_15,
+	SFX_TONI_GENERAL_IMP_HI_16,
+	SFX_TONI_GENERAL_IMP_LOW_01,
+	SFX_TONI_GENERAL_IMP_LOW_02,
+	SFX_TONI_GENERAL_IMP_LOW_03,
+	SFX_TONI_GENERAL_IMP_LOW_04,
+	SFX_TONI_GENERAL_IMP_LOW_05,
+	SFX_TONI_GENERAL_IMP_LOW_06,
+	SFX_TONI_GENERAL_IMP_LOW_07,
+	SFX_TONI_GENERAL_IMP_LOW_08,
+	SFX_TONI_GENERAL_IMP_LOW_09,
+	SFX_TONI_GENERAL_IMP_LOW_10,
+	SFX_TONI_GENERAL_IMP_LOW_11,
+	SFX_TONI_GENERAL_IMP_LOW_12,
+	SFX_TONI_GENERAL_IMP_LOW_13,
+	SFX_TONI_GENERAL_IMP_LOW_14,
+	SFX_TONI_GENERAL_IMP_LOW_15,
+	SFX_TONI_GENERAL_ON_FIRE_01,
+	SFX_TONI_GENERAL_ON_FIRE_02,
+	SFX_TONI_GENERAL_ON_FIRE_03,
+	SFX_TONI_GENERAL_ON_FIRE_04,
+	SFX_TONI_GENERAL_ON_FIRE_05,
+	SFX_TONI_GENERAL_ON_FIRE_06,
+	SFX_TONI_GENERAL_ON_FIRE_08,
+	SFX_TONI_PISSED_OFF_BUSTED_01,
+	SFX_TONI_PISSED_OFF_BUSTED_02,
+	SFX_TONI_PISSED_OFF_BUSTED_03,
+	SFX_TONI_PISSED_OFF_BUSTED_04,
+	SFX_TONI_PISSED_OFF_BUSTED_05,
+	SFX_TONI_PISSED_OFF_BUSTED_06,
+	SFX_TONI_PISSED_OFF_BUSTED_07,
+	SFX_TONI_PISSED_OFF_BUSTED_08,
+	SFX_TONI_PISSED_OFF_BUSTED_09,
+	SFX_TONI_PISSED_OFF_BUSTED_10,
+	SFX_TONI_PISSED_OFF_BUSTED_11,
+	SFX_TONI_PISSED_OFF_BUSTED_12,
+	SFX_TONI_PISSED_OFF_CHASED_01,
+	SFX_TONI_PISSED_OFF_CHASED_02,
+	SFX_TONI_PISSED_OFF_CHASED_03,
+	SFX_TONI_PISSED_OFF_CHASED_04,
+	SFX_TONI_PISSED_OFF_CHASED_05,
+	SFX_TONI_PISSED_OFF_CHASED_06,
+	SFX_TONI_PISSED_OFF_CHASED_07,
+	SFX_TONI_PISSED_OFF_CHASED_08,
+	SFX_TONI_PISSED_OFF_CHASED_09,
+	SFX_TONI_PISSED_OFF_CHASED_10,
+	SFX_TONI_PISSED_OFF_CHASED_11,
+	SFX_TONI_PISSED_OFF_CHASED_12,
+	SFX_TONI_PISSED_OFF_CHASED_13,
+	SFX_TONI_PISSED_OFF_CHASED_14,
+	SFX_TONI_PISSED_OFF_CHASED_15,
+	SFX_TONI_PISSED_OFF_CHASED_16,
+	SFX_TONI_PISSED_OFF_CHASED_17,
+	SFX_TONI_PISSED_OFF_CHASED_18,
+	SFX_TONI_PISSED_OFF_CHASED_19,
+	SFX_TONI_PISSED_OFF_CHASED_20,
+	SFX_TONI_PISSED_OFF_CHASED_21,
+	SFX_TONI_PISSED_OFF_CHASED_22,
+	SFX_TONI_PISSED_OFF_CHASED_23,
+	SFX_TONI_PISSED_OFF_CHASED_24,
+	SFX_TONI_PISSED_OFF_CHASED_25,
+	SFX_TONI_PISSED_OFF_CRASH_01,
+	SFX_TONI_PISSED_OFF_CRASH_02,
+	SFX_TONI_PISSED_OFF_CRASH_03,
+	SFX_TONI_PISSED_OFF_CRASH_04,
+	SFX_TONI_PISSED_OFF_CRASH_05,
+	SFX_TONI_PISSED_OFF_CRASH_06,
+	SFX_TONI_PISSED_OFF_CRASH_07,
+	SFX_TONI_PISSED_OFF_CRASH_08,
+	SFX_TONI_PISSED_OFF_CRASH_09,
+	SFX_TONI_PISSED_OFF_CRASH_10,
+	SFX_TONI_PISSED_OFF_CRASH_11,
+	SFX_TONI_PISSED_OFF_CRASH_12,
+	SFX_TONI_PISSED_OFF_CRASH_13,
+	SFX_TONI_PISSED_OFF_CRASH_14,
+	SFX_TONI_PISSED_OFF_CRASH_15,
+	SFX_TONI_PISSED_OFF_CRASH_16,
+	SFX_TONI_PISSED_OFF_CRASH_17,
+	SFX_TONI_PISSED_OFF_CRASH_18,
+	SFX_TONI_PISSED_OFF_CRASH_19,
+	SFX_TONI_PISSED_OFF_CRASH_20,
+	SFX_TONI_PISSED_OFF_CRASH_21,
+	SFX_TONI_PISSED_OFF_CRASH_22,
+	SFX_TONI_PISSED_OFF_CRASH_23,
+	SFX_TONI_PISSED_OFF_CRASH_24,
+	SFX_TONI_PISSED_OFF_CRASH_25,
+	SFX_TONI_PISSED_OFF_FIGHT_01,
+	SFX_TONI_PISSED_OFF_FIGHT_02,
+	SFX_TONI_PISSED_OFF_FIGHT_03,
+	SFX_TONI_PISSED_OFF_FIGHT_04,
+	SFX_TONI_PISSED_OFF_FIGHT_05,
+	SFX_TONI_PISSED_OFF_FIGHT_06,
+	SFX_TONI_PISSED_OFF_FIGHT_07,
+	SFX_TONI_PISSED_OFF_FIGHT_08,
+	SFX_TONI_PISSED_OFF_FIGHT_09,
+	SFX_TONI_PISSED_OFF_FIGHT_10,
+	SFX_TONI_PISSED_OFF_FIGHT_11,
+	SFX_TONI_PISSED_OFF_FIGHT_12,
+	SFX_TONI_PISSED_OFF_FIGHT_13,
+	SFX_TONI_PISSED_OFF_FIGHT_14,
+	SFX_TONI_PISSED_OFF_FIGHT_15,
+	SFX_TONI_PISSED_OFF_FIGHT_16,
+	SFX_TONI_PISSED_OFF_FIGHT_17,
+	SFX_TONI_PISSED_OFF_FIGHT_18,
+	SFX_TONI_PISSED_OFF_JACKED_01,
+	SFX_TONI_PISSED_OFF_JACKED_02,
+	SFX_TONI_PISSED_OFF_JACKED_03,
+	SFX_TONI_PISSED_OFF_JACKED_04,
+	SFX_TONI_PISSED_OFF_JACKED_05,
+	SFX_TONI_PISSED_OFF_JACKED_06,
+	SFX_TONI_PISSED_OFF_JACKED_07,
+	SFX_TONI_PISSED_OFF_JACKED_08,
+	SFX_TONI_PISSED_OFF_JACKED_09,
+	SFX_TONI_PISSED_OFF_JACKED_10,
+	SFX_TONI_PISSED_OFF_JACKED_11,
+	SFX_TONI_PISSED_OFF_JACKING_01,
+	SFX_TONI_PISSED_OFF_JACKING_02,
+	SFX_TONI_PISSED_OFF_JACKING_03,
+	SFX_TONI_PISSED_OFF_JACKING_04,
+	SFX_TONI_PISSED_OFF_JACKING_05,
+	SFX_TONI_PISSED_OFF_JACKING_06,
+	SFX_TONI_PISSED_OFF_JACKING_07,
+	SFX_TONI_PISSED_OFF_JACKING_08,
+	SFX_TONI_PISSED_OFF_JACKING_09,
+	SFX_TONI_PISSED_OFF_JACKING_10,
+	SFX_TONI_PISSED_OFF_JACKING_11,
+	SFX_TONI_PISSED_OFF_JACKING_12,
+	SFX_TONI_PISSED_OFF_JACKING_13,
+	SFX_TONI_PISSED_OFF_JACKING_14,
+	SFX_TONI_PISSED_OFF_JACKING_15,
+	SFX_TONI_PISSED_OFF_JACKING_16,
+	SFX_TONI_PISSED_OFF_JACKING_17,
+	SFX_TONI_PISSED_OFF_JACKING_18,
+	SFX_TONI_PISSED_OFF_JACKING_19,
+	SFX_TONI_PISSED_OFF_JACKING_20,
+	SFX_TONI_PISSED_OFF_JACKING_21,
+	SFX_TONI_PISSED_OFF_JACKING_22,
+	SFX_TONI_PISSED_OFF_JACKING_23,
+	SFX_TONI_PISSED_OFF_JACKING_24,
+	SFX_TONI_PISSED_OFF_JACKING_25,
+	SFX_TONI_PISSED_OFF_PICK_UP_CASH_01,
+	SFX_TONI_PISSED_OFF_PICK_UP_CASH_02,
+	SFX_TONI_PISSED_OFF_PICK_UP_CASH_03,
+	SFX_TONI_PISSED_OFF_PICK_UP_CASH_04,
+	SFX_TONI_PISSED_OFF_PICK_UP_CASH_05,
+	SFX_TONI_PISSED_OFF_PICK_UP_CASH_06,
+	SFX_TONI_PISSED_OFF_PICK_UP_CASH_07,
+	SFX_TONI_PISSED_OFF_PICK_UP_CASH_08,
+	SFX_TONI_PISSED_OFF_PICK_UP_CASH_09,
+	SFX_TONI_PISSED_OFF_PULL_GUN_01,
+	SFX_TONI_PISSED_OFF_PULL_GUN_02,
+	SFX_TONI_PISSED_OFF_PULL_GUN_03,
+	SFX_TONI_PISSED_OFF_PULL_GUN_04,
+	SFX_TONI_PISSED_OFF_PULL_GUN_05,
+	SFX_TONI_PISSED_OFF_PULL_GUN_06,
+	SFX_TONI_PISSED_OFF_PULL_GUN_07,
+	SFX_TONI_PISSED_OFF_PULL_GUN_08,
+	SFX_TONI_PISSED_OFF_PULL_GUN_09,
+	SFX_TONI_PISSED_OFF_PULL_GUN_10,
+	SFX_TONI_PISSED_OFF_PULL_GUN_11,
+	SFX_TONI_PISSED_OFF_PULL_GUN_12,
+	SFX_TONI_PISSED_OFF_PULL_GUN_13,
+	SFX_TONI_PISSED_OFF_PULL_GUN_14,
+	SFX_TONI_PISSED_OFF_PULL_GUN_15,
+	SFX_TONI_PISSED_OFF_PULL_GUN_16,
+	SFX_TONI_PISSED_OFF_PULL_GUN_17,
+	SFX_TONI_PISSED_OFF_PULL_GUN_18,
+	SFX_TONI_PISSED_OFF_SHOOT_01,
+	SFX_TONI_PISSED_OFF_SHOOT_02,
+	SFX_TONI_PISSED_OFF_SHOOT_03,
+	SFX_TONI_PISSED_OFF_SHOOT_04,
+	SFX_TONI_PISSED_OFF_SHOOT_05,
+	SFX_TONI_PISSED_OFF_SHOOT_06,
+	SFX_TONI_PISSED_OFF_SHOOT_07,
+	SFX_TONI_PISSED_OFF_SHOOT_08,
+	SFX_TONI_PISSED_OFF_SHOOT_09,
+	SFX_TONI_PISSED_OFF_SHOOT_10,
+	SFX_TONI_PISSED_OFF_SHOOT_11,
+	SFX_TONI_PISSED_OFF_SHOOT_12,
+	SFX_TONI_PISSED_OFF_SHOOT_13,
+	SFX_TONI_PISSED_OFF_SHOOT_14,
+	SFX_TONI_PISSED_OFF_SHOOT_15,
+	SFX_TONI_PISSED_OFF_SHOOT_16,
+	SFX_TONI_PISSED_OFF_SHOOT_17,
+	SFX_TONI_PISSED_OFF_SHOOT_18,
+	SFX_TONI_PISSED_OFF_SHOOT_19,
+	SFX_TONI_PISSED_OFF_SHOOT_20,
+	SFX_TONI_PISSED_OFF_SHOOT_21,
+	SFX_TONI_PISSED_OFF_SHOOT_22,
+	SFX_TONI_PISSED_OFF_SHOOT_23,
+	SFX_TONI_PISSED_OFF_SHOOT_24,
+	SFX_TONI_PISSED_OFF_SHOOT_25,
+	SFX_TONI_PISSED_OFF_SHOOT_26,
+	SFX_TONI_PISSED_OFF_SHOOT_27,
+	SFX_TONI_PISSED_OFF_SHOOT_28,
+	SFX_TONI_PISSED_OFF_SHOOT_29,
+	SFX_TONI_PISSED_OFF_SHOOT_30,
+	SFX_TONI_PISSED_OFF_SHOOT_31,
+	SFX_TONI_WISECRACKING_CRASH_01,
+	SFX_TONI_WISECRACKING_CRASH_02,
+	SFX_TONI_WISECRACKING_CRASH_03,
+	SFX_TONI_WISECRACKING_CRASH_04,
+	SFX_TONI_WISECRACKING_CRASH_05,
+	SFX_TONI_WISECRACKING_CRASH_06,
+	SFX_TONI_WISECRACKING_CRASH_07,
+	SFX_TONI_WISECRACKING_CRASH_08,
+	SFX_TONI_WISECRACKING_CRASH_09,
+	SFX_TONI_WISECRACKING_CRASH_10,
+	SFX_TONI_WISECRACKING_CRASH_11,
+	SFX_TONI_WISECRACKING_CRASH_12,
+	SFX_TONI_WISECRACKING_CRASH_13,
+	SFX_TONI_WISECRACKING_CRASH_14,
+	SFX_TONI_WISECRACKING_CRASH_15,
+	SFX_TONI_WISECRACKING_CRASH_16,
+	SFX_TONI_WISECRACKING_CRASH_17,
+	SFX_TONI_WISECRACKING_FIGHT_01,
+	SFX_TONI_WISECRACKING_FIGHT_02,
+	SFX_TONI_WISECRACKING_FIGHT_03,
+	SFX_TONI_WISECRACKING_FIGHT_04,
+	SFX_TONI_WISECRACKING_FIGHT_05,
+	SFX_TONI_WISECRACKING_FIGHT_06,
+	SFX_TONI_WISECRACKING_FIGHT_07,
+	SFX_TONI_WISECRACKING_FIGHT_08,
+	SFX_TONI_WISECRACKING_FIGHT_09,
+	SFX_TONI_WISECRACKING_FIGHT_10,
+	SFX_TONI_WISECRACKING_FIGHT_11,
+	SFX_TONI_WISECRACKING_FIGHT_12,
+	SFX_TONI_WISECRACKING_FIGHT_13,
+	SFX_TONI_WISECRACKING_FIGHT_14,
+	SFX_TONI_WISECRACKING_FIGHT_15,
+	SFX_TONI_WISECRACKING_FIGHT_16,
+	SFX_TONI_WISECRACKING_FIGHT_17,
+	SFX_TONI_WISECRACKING_FIGHT_18,
+	SFX_TONI_WISECRACKING_FIGHT_19,
+	SFX_TONI_WISECRACKING_FIGHT_20,
+	SFX_TONI_WISECRACKING_JACKED_01,
+	SFX_TONI_WISECRACKING_JACKED_02,
+	SFX_TONI_WISECRACKING_JACKED_03,
+	SFX_TONI_WISECRACKING_JACKED_04,
+	SFX_TONI_WISECRACKING_JACKED_05,
+	SFX_TONI_WISECRACKING_JACKED_06,
+	SFX_TONI_WISECRACKING_JACKED_07,
+	SFX_TONI_WISECRACKING_JACKED_08,
+	SFX_TONI_WISECRACKING_JACKED_09,
+	SFX_TONI_WISECRACKING_JACKED_10,
+	SFX_TONI_WISECRACKING_JACKED_11,
+	SFX_TONI_WISECRACKING_JACKED_12,
+	SFX_TONI_WISECRACKING_JACKED_13,
+	SFX_TONI_WISECRACKING_JACKED_14,
+	SFX_TONI_WISECRACKING_JACKED_15,
+	SFX_TONI_WISECRACKING_JACKED_16,
+	SFX_TONI_WISECRACKING_JACKED_17,
+	SFX_TONI_WISECRACKING_JACKING_01,
+	SFX_TONI_WISECRACKING_JACKING_02,
+	SFX_TONI_WISECRACKING_JACKING_03,
+	SFX_TONI_WISECRACKING_JACKING_04,
+	SFX_TONI_WISECRACKING_JACKING_05,
+	SFX_TONI_WISECRACKING_JACKING_06,
+	SFX_TONI_WISECRACKING_JACKING_07,
+	SFX_TONI_WISECRACKING_JACKING_08,
+	SFX_TONI_WISECRACKING_JACKING_09,
+	SFX_TONI_WISECRACKING_JACKING_10,
+	SFX_TONI_WISECRACKING_JACKING_11,
+	SFX_TONI_WISECRACKING_JACKING_12,
+	SFX_TONI_WISECRACKING_PICK_UP_CASH_01,
+	SFX_TONI_WISECRACKING_PICK_UP_CASH_02,
+	SFX_TONI_WISECRACKING_PICK_UP_CASH_03,
+	SFX_TONI_WISECRACKING_PICK_UP_CASH_04,
+	SFX_TONI_WISECRACKING_PICK_UP_CASH_05,
+	SFX_TONI_WISECRACKING_PICK_UP_CASH_06,
+	SFX_TONI_WISECRACKING_PICK_UP_CASH_07,
+	SFX_TONI_WISECRACKING_PICK_UP_CASH_08,
+	SFX_TONI_WISECRACKING_PICK_UP_CASH_09,
+	SFX_TONI_WISECRACKING_PICK_UP_CASH_10,
+	SFX_TONI_WISECRACKING_PICK_UP_CASH_11,
+	SFX_TONI_WISECRACKING_PICK_UP_CASH_12,
+	SFX_TONI_WISECRACKING_PICK_UP_CASH_13,
+	SFX_TONI_WISECRACKING_PICK_UP_CASH_14,
+	SFX_TONI_WISECRACKING_PICK_UP_CASH_15,
+	SFX_TONI_WISECRACKING_PICK_UP_HOOKER_01,
+	SFX_TONI_WISECRACKING_PICK_UP_HOOKER_02,
+	SFX_TONI_WISECRACKING_PICK_UP_HOOKER_03,
+	SFX_TONI_WISECRACKING_PICK_UP_HOOKER_04,
+	SFX_TONI_WISECRACKING_PICK_UP_HOOKER_05,
+	SFX_TONI_WISECRACKING_PICK_UP_HOOKER_06,
+	SFX_TONI_WISECRACKING_PICK_UP_HOOKER_07,
+	SFX_TONI_WISECRACKING_PICK_UP_HOOKER_08,
+	SFX_TONI_WISECRACKING_PICK_UP_HOOKER_09,
+	SFX_TONI_WISECRACKING_PICK_UP_HOOKER_10,
+	SFX_TONI_WISECRACKING_PICK_UP_HOOKER_11,
+	SFX_TONI_WISECRACKING_PULL_GUN_01,
+	SFX_TONI_WISECRACKING_PULL_GUN_02,
+	SFX_TONI_WISECRACKING_PULL_GUN_03,
+	SFX_TONI_WISECRACKING_PULL_GUN_04,
+	SFX_TONI_WISECRACKING_PULL_GUN_05,
+	SFX_TONI_WISECRACKING_PULL_GUN_06,
+	SFX_TONI_WISECRACKING_PULL_GUN_07,
+	SFX_TONI_WISECRACKING_PULL_GUN_08,
+	SFX_TONI_WISECRACKING_PULL_GUN_09,
+	SFX_TONI_WISECRACKING_PULL_GUN_10,
+	SFX_TONI_WISECRACKING_PULL_GUN_11,
+	SFX_TONI_WISECRACKING_PULL_GUN_12,
+	SFX_TONI_WISECRACKING_PULL_GUN_13,
+	SFX_TONI_WISECRACKING_PULL_GUN_14,
+	SFX_TONI_WISECRACKING_PULL_GUN_15,
+	SFX_TONI_WISECRACKING_PULL_GUN_16,
+	SFX_TONI_WISECRACKING_PULL_GUN_17,
+	SFX_TONI_WISECRACKING_PULL_GUN_18,
+	SFX_TONI_WISECRACKING_PULL_GUN_19,
+	SFX_TONI_WISECRACKING_SEX_01,
+	SFX_TONI_WISECRACKING_SEX_02,
+	SFX_TONI_WISECRACKING_SEX_03,
+	SFX_TONI_WISECRACKING_SEX_04,
+	SFX_TONI_WISECRACKING_SEX_05,
+	SFX_TONI_WISECRACKING_SEX_06,
+	SFX_TONI_WISECRACKING_SEX_07,
+	SFX_TONI_WISECRACKING_SEX_08,
+	SFX_TONI_WISECRACKING_SEX_09,
+	SFX_TONI_WISECRACKING_SEX_10,
+	SFX_TONI_WISECRACKING_SHOOT_01,
+	SFX_TONI_WISECRACKING_SHOOT_02,
+	SFX_TONI_WISECRACKING_SHOOT_03,
+	SFX_TONI_WISECRACKING_SHOOT_04,
+	SFX_TONI_WISECRACKING_SHOOT_05,
+	SFX_TONI_WISECRACKING_SHOOT_06,
+	SFX_TONI_WISECRACKING_SHOOT_07,
+	SFX_TONI_WISECRACKING_SHOOT_08,
+	SFX_TONI_WISECRACKING_SHOOT_09,
+	SFX_TONI_WISECRACKING_SHOOT_10,
+	SFX_TONI_WISECRACKING_SHOOT_11,
+	SFX_TONI_WISECRACKING_SHOOT_12,
+	SFX_TONI_WISECRACKING_SHOOT_13,
+	SFX_TONI_WISECRACKING_SHOOT_14,
+	SFX_TONI_WISECRACKING_SHOOT_15,
+	SFX_TONI_WISECRACKING_SHOOT_16,
+	SFX_TONI_WISECRACKING_SHOOT_17,
+	SFX_TONI_WISECRACKING_SHOOT_18,
+	SFX_TONI_WISECRACKING_SHOOT_19,
+	SFX_TONI_WISECRACKING_SHOOT_20,
+	SFX_TONI_WISECRACKING_SHOOT_21,
+	SFX_TONI_WISECRACKING_SHOOT_22,
+	SFX_TONI_WISECRACKING_SHOOT_23,
+	SFX_TONI_WISECRACKING_SHOOT_24,
+	SFX_TONI_WISECRACKING_SHOOT_25,
+	SFX_TONI_WISECRACKING_SHOOT_26,
+	SFX_TOSH1AA,
+	SFX_TOSH1AB,
+	SFX_TOSH1AC,
+	SFX_TOSH1AD,
+	SFX_TOSH1BA,
+	SFX_TOSH1BB,
+	SFX_TOSH1BC,
+	SFX_TOSH1BD,
+	SFX_TOSH2AA,
+	SFX_TOSH2AB,
+	SFX_TOSH2AC,
+	SFX_TOSH2AE,
+	SFX_TOSH2AF,
+	SFX_TOSH2AG,
+	SFX_TOSH2AH,
+	SFX_TOSH2AI,
+	SFX_TOSH2AJ,
+	SFX_TOSH2AK,
+	SFX_TOSH2AL,
+	SFX_TOSH2AM,
+	SFX_TOSH3AA,
+	SFX_TOSH3AB,
+	SFX_TOSH3AC,
+	SFX_TOSH3AD,
+	SFX_TOSH3AE,
+	SFX_TOSH3AF,
+	SFX_TOSH3AG,
+	SFX_TOSH3AH,
+	SFX_TOSH3AI,
+	SFX_TOSH3AJ,
+	SFX_TOSH3AK,
+	SFX_TOSH3BA,
+	SFX_TOSH3BB,
+	SFX_TOSH3CA,
+	SFX_TOSH3CB,
+	SFX_TOSH3CC,
+	SFX_TOSH3CD,
+	SFX_TOSH3CE,
+	SFX_TOSH3CF,
+	SFX_TOSH3CG,
+	SFX_TOSH3CH,
+	SFX_TOSH3CI,
+	SFX_TOSH3CJ,
+	SFX_TOSH3CK,
+	SFX_TOSH3DA,
+	SFX_TOSH3EA,
+	SFX_TOSH3FA,
+	SFX_TOSH3FB,
+	SFX_TOSH3FC,
+	SFX_TOSH3FD,
+	SFX_TOSH3FE,
+	SFX_TOSH3FF,
+	SFX_TOSH3GA,
+	SFX_TOSH3GB,
+	SFX_TOSH3HA,
+	SFX_TOSH3IA,
+	SFX_TOSH3IB,
+	SFX_TOSH4AA,
+	SFX_TOSH4AB,
+	SFX_TOSH4AC,
+	SFX_TOSH4AD,
+	SFX_TOSH4AE,
+	SFX_TOSH4AF,
+	SFX_TOSH4AG,
+	SFX_TOSH4AH,
+	SFX_TOSH4AI,
+	SFX_TOSH4AJ,
+	SFX_TOSH4BA,
+	SFX_TOSH4BB,
+	SFX_TOSH4BC,
+	SFX_TOSH4CA,
+	SFX_TOSH4CB,
+	SFX_TOSH4CC,
+	SFX_TOSH4CD,
+	SFX_TOSH4CE,
+	SFX_TOSH4DA,
+	SFX_TOSH4DB,
+	SFX_TOSH4DC,
+	SFX_TOSHIKO_CRASH_CAR_1,
+	SFX_TOSHIKO_CRASH_CAR_2,
+	SFX_TOSHIKO_CRASH_CAR_3,
+	SFX_TOSHIKO_CRASH_CAR_4,
+	SFX_TOSHIKO_DRIVER_BLOCKED_1,
+	SFX_TOSHIKO_DRIVER_BLOCKED_2,
+	SFX_TOSHIKO_DRIVER_BLOCKED_3,
+	SFX_TOSHIKO_DRIVER_BLOCKED_4,
+	SFX_TOSHIKO_JACKED_CAR_1,
+	SFX_TOSHIKO_JACKED_CAR_2,
+	SFX_TOSHIKO_JACKED_CAR_3,
+	SFX_TOSHIKO_JACKED_CAR_4,
+	SFX_TOSHIKO_JACKED_CAR_5,
+	SFX_TOSHIKO_SHOCKED_1,
+	SFX_TOSHIKO_SHOCKED_2,
+	SFX_TOSHIKO_SHOCKED_3,
+	SFX_VAL1_AA,
+	SFX_VAL1_AB,
+	SFX_VAL1_AC,
+	SFX_VAL1_AD,
+	SFX_VAL1_AE,
+	SFX_VAL1_AF,
+	SFX_VAL1_AG,
+	SFX_VAL1_AH,
+	SFX_VAL1_AI,
+	SFX_VAL2_AA,
+	SFX_VAL2_AB,
+	SFX_VAL2_AC,
+	SFX_VAL2_AD,
+	SFX_VAL2_AE,
+	SFX_VAL2_AF,
+	SFX_VAL2_AG,
+	SFX_VAL2_AH,
+	SFX_VAL2_AI,
+	SFX_VAL3_AA,
+	SFX_VAL3_AB,
+	SFX_VAL3_AC,
+	SFX_VAL3_AD,
+	SFX_VAL3_AE,
+	SFX_VAL3_AF,
+	SFX_VIC1_BA,
+	SFX_VIC1_BB,
+	SFX_VIC1_BC,
+	SFX_VIC1_BD,
+	SFX_VIC1_BE,
+	SFX_VIC1_BF,
+	SFX_VIC1_CA,
+	SFX_VIC1_CB,
+	SFX_VIC1_CC,
+	SFX_VIC1_CD,
+	SFX_VIC1_CE,
+	SFX_VIC1_DA,
+	SFX_VIC1_DB,
+	SFX_VIC1_DC,
+	SFX_VIC1_DD,
+	SFX_VIC1_DE,
+	SFX_VIC1_DF,
+	SFX_VIC1_DG,
+	SFX_VIC1_DH,
+	SFX_VIC2_AA,
+	SFX_VIC2_AB,
+	SFX_VIC2_AC,
+	SFX_VIC2_AD,
+	SFX_VIC2_AF,
+	SFX_VIC2_AG,
+	SFX_VIC2_AH,
+	SFX_VIC2_BA,
+	SFX_VIC2_BB,
+	SFX_VIC2_BC,
+	SFX_VIC2_BD,
+	SFX_VIC2_BE,
+	SFX_VIC2_BF,
+	SFX_VIC2_BH,
+	SFX_VIC2_BI,
+	SFX_VIC2_BJ,
+	SFX_VIC2_CA,
+	SFX_VIC2_DA,
+	SFX_VIC2_DB,
+	SFX_VIC2_DC,
+	SFX_VIC3_AA,
+	SFX_VIC3_AB,
+	SFX_VIC3_AD,
+	SFX_VIC3_AE,
+	SFX_VIC3_AF,
+	SFX_VIC3_AG,
+	SFX_VIC3_AH,
+	SFX_VIC3_AJ,
+	SFX_VIC3_AK,
+	SFX_VIC3_AL,
+	SFX_VIC3_AM,
+	SFX_VIC3_AN,
+	SFX_VIC3_AO,
+	SFX_VIC3_BA,
+	SFX_VIC3_BB,
+	SFX_VIC3_BC,
+	SFX_VIC4_AA,
+	SFX_VIC4_AB,
+	SFX_VIC4_AC,
+	SFX_VIC4_AD,
+	SFX_VIC4_AE,
+	SFX_VIC4_AF,
+	SFX_VIC4_AG,
+	SFX_VIC4_AH,
+	SFX_VIC4_AI,
+	SFX_VIC4_AJ,
+	SFX_VIC4_AK,
+	SFX_VIC4_AL,
+	SFX_VIC4_AM,
+	SFX_VIC4_AN,
+	SFX_VIC4_BA,
+	SFX_VIC4_BB,
+	SFX_VIC4_BC,
+	SFX_VIC4_BD,
+	SFX_VIC4_BE,
+	SFX_VIC4_BF,
+	SFX_VIC4_BG,
+	SFX_VIC4_BH,
+	SFX_VIC4_CA,
+	SFX_VIC4_CB,
+	SFX_VIC5_AA,
+	SFX_VIC5_AB,
+	SFX_VIC5_AC,
+	SFX_VIC5_AD,
+	SFX_VIC5_AE,
+	SFX_VIC5_AF,
+	SFX_VIC5_AG,
+	SFX_VIC5_AH,
+	SFX_VIC5_AI,
+	SFX_VIC5_AJ,
+	SFX_VIC5_AK,
+	SFX_VIC5_AL,
+	SFX_VIC5_DA,
+	SFX_VIC5_DB,
+	SFX_VIC5_DC,
+	SFX_VIC5_EA,
+	SFX_VIC5_EB,
+	SFX_VIC5_EC,
+	SFX_VIC5_FA,
+	SFX_VIC5_FB,
+	SFX_VIC5_FC,
+	SFX_VIC5_FD,
+	SFX_VIC5_FE,
+	SFX_VIC5_FF,
+	SFX_VIC5_FG,
+	SFX_VIC5_FH,
+	SFX_VIC5_FI,
+	SFX_VIC5_FJ,
+	SFX_VIC5_FK,
+	SFX_VIC6_AA,
+	SFX_VIC6_AB,
+	SFX_VIC6_AC,
+	SFX_VIC6_AD,
+	SFX_VIC6_AE,
+	SFX_VIC6_AF,
+	SFX_VIC6_AG,
+	SFX_VIC6_AH,
+	SFX_VIC6_AI,
+	SFX_VIC6_AJ,
+	SFX_VIC6_AK,
+	SFX_VIC6_AL,
+	SFX_VIC6_AM,
+	SFX_VIC6_AN,
+	SFX_VIC6_AO,
+	SFX_VIC6_BA,
+	SFX_VIC6_BB,
+	SFX_VIC7_AA,
+	SFX_VIC7_AB,
+	SFX_VIC7_AC,
+	SFX_VIC7_AD,
+	SFX_VIC7_AE,
+	SFX_VIC7_AG,
+	SFX_VIC7_AH,
+	SFX_VIC7_AJ,
+	SFX_VIC7_AL,
+	SFX_VIC7_AM,
+	SFX_VIC7_AN,
+	SFX_VIC7_AO,
+	SFX_VIC7_BA,
+	SFX_VIC7_BB,
+	SFX_VIC7_BC,
+	SFX_VIC7_BD,
+	SFX_VIC7_BE,
+	SFX_VIC7_BF,
+	SFX_VIC7_BG,
+	SFX_VIC7_BH,
+	SFX_VIC7_BI,
+	SFX_VIC7_CA,
+	SFX_VIC7_CB,
+	SFX_VIC7_CC,
+	SFX_WAC1_AA,
+	SFX_WAC1_AB,
+	SFX_WAC1_AC,
+	SFX_WAC1_AD,
+	SFX_WAC1_AE,
+	SFX_WAC1_AF,
+	SFX_WAC1_AG,
+	SFX_WAC1_AH,
+	SFX_WAC2_AA,
+	SFX_WAC2_AB,
+	SFX_WAC2_AC,
+	SFX_WAC2_AD,
+	SFX_WAC2_AE,
+	SFX_WAC2_AF,
+	SFX_WAC2_AG,
+	SFX_WED1_AA,
+	SFX_WED1_AB,
+	SFX_WED1_AC,
+	SFX_WED1_AD,
+	SFX_WED1_AE,
+	SFX_WED1_AF,
+	SFX_WED1_AG,
+	SFX_WED2_AA,
+	SFX_WED2_AB,
+	SFX_WED2_AC,
+	SFX_WED2_AD,
+	SFX_WED2_AE,
+	SFX_WED2_AF,
+	SFX_WED2_AG,
+	SFX_WED2_AH,
+	SFX_WED3_AA,
+	SFX_WED3_AB,
+	SFX_WED3_AC,
+	SFX_WED3_AD,
+	SFX_WED3_AE,
+	SFX_WED3_AF,
+	SFX_WED3_AG,
+	SFX_WED3_AH,
+	SFX_WED3_AI,
+	SFX_WED3_AJ,
+	SFX_WED3_AK,
+	SFX_WED3_AL,
+	SFX_WORKER1_BUMP_1,
+	SFX_WORKER1_BUMP_2,
+	SFX_WORKER1_BUMP_3,
+	SFX_WORKER1_CHAT_1,
+	SFX_WORKER1_CHAT_2,
+	SFX_WORKER1_CHAT_3,
+	SFX_WORKER1_CHAT_4,
+	SFX_WORKER1_CRASH_CAR_1,
+	SFX_WORKER1_CRASH_CAR_2,
+	SFX_WORKER1_DODGE_1,
+	SFX_WORKER1_DODGE_2,
+	SFX_WORKER1_DRIVER_BLOCKED_1,
+	SFX_WORKER1_DRIVER_BLOCKED_2,
+	SFX_WORKER1_FIGHT_1,
+	SFX_WORKER1_FIGHT_2,
+	SFX_WORKER1_FIGHT_3,
+	SFX_WORKER1_GUN_THREATENED_1,
+	SFX_WORKER1_GUN_THREATENED_2,
+	SFX_WORKER1_JACKED_CAR_1,
+	SFX_WORKER1_JACKED_CAR_2,
+	SFX_WORKER1_JACKED_CAR_3,
+	SFX_WORKER1_SHOCKED_1,
+	SFX_WORKER1_SPECIAL_CASE_1,
+	SFX_WORKER1_SPECIAL_CASE_2,
+	SFX_WORKER1_SPECIAL_CASE_3,
+	SFX_WORKER2_BUMP_1,
+	SFX_WORKER2_BUMP_2,
+	SFX_WORKER2_BUMP_3,
+	SFX_WORKER2_CHAT_1,
+	SFX_WORKER2_CHAT_2,
+	SFX_WORKER2_CHAT_3,
+	SFX_WORKER2_CHAT_4,
+	SFX_WORKER2_CRASH_CAR_1,
+	SFX_WORKER2_CRASH_CAR_2,
+	SFX_WORKER2_DODGE_1,
+	SFX_WORKER2_DODGE_2,
+	SFX_WORKER2_DRIVER_BLOCKED_1,
+	SFX_WORKER2_DRIVER_BLOCKED_2,
+	SFX_WORKER2_FIGHT_1,
+	SFX_WORKER2_FIGHT_2,
+	SFX_WORKER2_FIGHT_3,
+	SFX_WORKER2_GUN_THREATENED_1,
+	SFX_WORKER2_GUN_THREATENED_2,
+	SFX_WORKER2_JACKED_CAR_1,
+	SFX_WORKER2_JACKED_CAR_2,
+	SFX_WORKER2_JACKED_CAR_3,
+	SFX_WORKER2_SHOCKED_1,
+	SFX_WORKER2_SPECIAL_CASE_1,
+	SFX_WORKER2_SPECIAL_CASE_2,
+	SFX_WORKER2_SPECIAL_CASE_3,
+
+	TOTAL_AUDIO_SAMPLES,
 	NO_SAMPLE,
 
 	// shorthands
-	SAMPLEBANK_START = SFX_CAR_HORN_JEEP,
+	SAMPLEBANK_START = SFX_AIR_BRAKES,
 	SAMPLEBANK_END = SFX_FOOTSTEP_SAND_4,
 	SAMPLEBANK_MAX = SFX_FOOTSTEP_SAND_4 + 1,
 	SAMPLEBANK_PED_START = SFX_FOOTSTEP_SAND_4 + 1,
-	SAMPLEBANK_PED_END = 9940,
+	SAMPLEBANK_PED_END = SFX_WORKER2_SPECIAL_CASE_3,
 	SAMPLEBANK_PED_MAX = SAMPLEBANK_PED_END + 1,
 
 	// LCS: TODO
diff --git a/src/audio/AudioScriptObject.cpp b/src/audio/AudioScriptObject.cpp
index ac30f757..48c78c88 100644
--- a/src/audio/AudioScriptObject.cpp
+++ b/src/audio/AudioScriptObject.cpp
@@ -23,25 +23,25 @@ cAudioScriptObject::Reset()
 }
 
 void *
-cAudioScriptObject::operator new(size_t sz)
+cAudioScriptObject::operator new(size_t sz) throw()
 {
 	return CPools::GetAudioScriptObjectPool()->New();
 }
 
 void *
-cAudioScriptObject::operator new(size_t sz, int handle)
+cAudioScriptObject::operator new(size_t sz, int handle) throw()
 {
 	return CPools::GetAudioScriptObjectPool()->New(handle);
 }
 
 void
-cAudioScriptObject::operator delete(void *p, size_t sz)
+cAudioScriptObject::operator delete(void *p, size_t sz) throw()
 {
 	CPools::GetAudioScriptObjectPool()->Delete((cAudioScriptObject *)p);
 }
 
 void
-cAudioScriptObject::operator delete(void *p, int handle)
+cAudioScriptObject::operator delete(void *p, int handle) throw()
 {
 	CPools::GetAudioScriptObjectPool()->Delete((cAudioScriptObject *)p);
 }
@@ -90,6 +90,8 @@ cAudioScriptObject::SaveAllAudioScriptObjects(uint8 *buf, uint32 *size)
 void
 PlayOneShotScriptObject(uint8 id, CVector const &pos)
 {
+	if (!DMAudio.IsAudioInitialised()) return;
+
 	cAudioScriptObject *audioScriptObject = new cAudioScriptObject();
 	audioScriptObject->Posn = pos;
 	audioScriptObject->AudioId = id;
diff --git a/src/audio/AudioScriptObject.h b/src/audio/AudioScriptObject.h
index 8110b2bb..b9a7e61b 100644
--- a/src/audio/AudioScriptObject.h
+++ b/src/audio/AudioScriptObject.h
@@ -12,10 +12,10 @@ public:
 
 	void Reset(); /// ok
 
-	static void* operator new(size_t);
-	static void* operator new(size_t, int);
-	static void operator delete(void*, size_t);
-	static void operator delete(void*, int);
+	static void* operator new(size_t) throw();
+	static void* operator new(size_t, int) throw();
+	static void operator delete(void*, size_t) throw();
+	static void operator delete(void*, int) throw();
 
 	static void LoadAllAudioScriptObjects(uint8 *buf, uint32 size);
 	static void SaveAllAudioScriptObjects(uint8 *buf, uint32 *size);
diff --git a/src/audio/DMAudio.cpp b/src/audio/DMAudio.cpp
index 7c99e89f..bc77361f 100644
--- a/src/audio/DMAudio.cpp
+++ b/src/audio/DMAudio.cpp
@@ -39,7 +39,7 @@ cDMAudio::DestroyEntity(int32 audioEntity)
 }
 
 void
-cDMAudio::SetEntityStatus(int32 audioEntity, uint8 status)
+cDMAudio::SetEntityStatus(int32 audioEntity, bool8 status)
 {
 	AudioManager.SetEntityStatus(audioEntity, status);
 }
@@ -57,7 +57,7 @@ cDMAudio::DestroyAllGameCreatedEntities(void)
 }
 
 void
-cDMAudio::SetMonoMode(uint8 mono)
+cDMAudio::SetMonoMode(bool8 mono)
 {
 	AudioManager.SetMonoMode(mono);
 }
@@ -142,7 +142,7 @@ cDMAudio::SetSpeakerConfig(int32 config)
 	AudioManager.SetSpeakerConfig(config);
 }
 
-bool
+bool8
 cDMAudio::IsMP3RadioChannelAvailable(void)
 {
 	return AudioManager.IsMP3RadioChannelAvailable();
@@ -161,12 +161,12 @@ cDMAudio::ReacquireDigitalHandle(void)
 }
 
 void
-cDMAudio::SetDynamicAcousticModelingStatus(uint8 status)
+cDMAudio::SetDynamicAcousticModelingStatus(bool8 status)
 {
 	AudioManager.SetDynamicAcousticModelingStatus(status);
 }
 
-bool
+bool8
 cDMAudio::CheckForAnAudioFileOnCD(void)
 {
 	return AudioManager.CheckForAnAudioFileOnCD();
@@ -178,7 +178,7 @@ cDMAudio::GetCDAudioDriveLetter(void)
 	return AudioManager.GetCDAudioDriveLetter();
 }
 
-bool
+bool8
 cDMAudio::IsAudioInitialised(void)
 {
 	return AudioManager.IsAudioInitialised();
@@ -196,7 +196,7 @@ cDMAudio::CreateLoopingScriptObject(cAudioScriptObject *scriptObject)
 	int32 audioEntity = AudioManager.CreateEntity(AUDIOTYPE_SCRIPTOBJECT, scriptObject);
 
 	if ( AEHANDLE_IS_OK(audioEntity) )
-		AudioManager.SetEntityStatus(audioEntity, true);
+		AudioManager.SetEntityStatus(audioEntity, TRUE);
 	
 	return audioEntity;
 }
@@ -214,7 +214,7 @@ cDMAudio::CreateOneShotScriptObject(cAudioScriptObject *scriptObject)
 
 	if ( AEHANDLE_IS_OK(audioEntity) )
 	{
-		AudioManager.SetEntityStatus(audioEntity, true);
+		AudioManager.SetEntityStatus(audioEntity, TRUE);
 		AudioManager.PlayOneShot(audioEntity, scriptObject->AudioId, 0.0f);
 	}
 }
@@ -244,7 +244,7 @@ cDMAudio::PlayRadioAnnouncement(uint32 announcement)
 }
 
 void
-cDMAudio::PlayFrontEndTrack(uint32 track, uint8 frontendFlag)
+cDMAudio::PlayFrontEndTrack(uint32 track, bool8 frontendFlag)
 {
 	MusicManager.PlayFrontEndTrack(track, frontendFlag);
 }
@@ -309,7 +309,7 @@ cDMAudio::PlayLoadedMissionAudio(uint8 slot)
 	AudioManager.PlayLoadedMissionAudio(slot);
 }
 
-bool
+bool8
 cDMAudio::IsMissionAudioSampleFinished(uint8 slot)
 {
 	return AudioManager.IsMissionAudioSampleFinished(slot);
@@ -340,7 +340,7 @@ cDMAudio::SetRadioChannel(uint32 radio, int32 pos)
 }
 
 void
-cDMAudio::SetStartingTrackPositions(uint8 isStartGame)
+cDMAudio::SetStartingTrackPositions(bool8 isStartGame)
 {
 	MusicManager.SetStartingTrackPositions(isStartGame);
 }
@@ -364,7 +364,7 @@ cDMAudio::GetRadioPosition(uint32 station)
 }
 
 void
-cDMAudio::SetPedTalkingStatus(CPed *ped, uint8 status)
+cDMAudio::SetPedTalkingStatus(CPed *ped, bool8 status)
 {
 	return AudioManager.SetPedTalkingStatus(ped, status);
 }
@@ -376,7 +376,7 @@ cDMAudio::SetPlayersMood(uint8 mood, uint32 time)
 }
 
 void
-cDMAudio::ShutUpPlayerTalking(uint8 state)
+cDMAudio::ShutUpPlayerTalking(bool8 state)
 {
 	AudioManager.m_bIsPlayerShutUp = state;
 }
\ No newline at end of file
diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h
index 2c10043f..5b684fd3 100644
--- a/src/audio/DMAudio.h
+++ b/src/audio/DMAudio.h
@@ -25,11 +25,11 @@ public:
 	
 	int32 CreateEntity(eAudioType type, void *UID);
 	void DestroyEntity(int32 audioEntity);
-	void SetEntityStatus(int32 audioEntity, uint8 status);
+	void SetEntityStatus(int32 audioEntity, bool8 status);
 	void PlayOneShot(int32 audioEntity, uint16 oneShot, float volume);
 	void DestroyAllGameCreatedEntities(void);
 	
-	void SetMonoMode(uint8 mono);
+	void SetMonoMode(bool8 mono);
 	void SetMP3BoostVolume(uint8 volume);
 	void SetEffectsMasterVolume(uint8 volume);
 	void SetMusicMasterVolume(uint8 volume);
@@ -46,17 +46,17 @@ public:
 	
 	void SetSpeakerConfig(int32 config);
 	
-	bool IsMP3RadioChannelAvailable(void);
+	bool8 IsMP3RadioChannelAvailable(void);
 	
 	void ReleaseDigitalHandle(void);
 	void ReacquireDigitalHandle(void);
 	
-	void SetDynamicAcousticModelingStatus(uint8 status);
+	void SetDynamicAcousticModelingStatus(bool8 status);
 	
-	bool CheckForAnAudioFileOnCD(void);
+	bool8 CheckForAnAudioFileOnCD(void);
 	
 	char GetCDAudioDriveLetter(void);
-	bool IsAudioInitialised(void);
+	bool8 IsAudioInitialised(void);
 	
 	void ReportCrime(eCrimeType crime, CVector const &pos);
 	
@@ -70,7 +70,7 @@ public:
 	
 	void PlayFrontEndSound(uint16 frontend, uint32 volume);
 	void PlayRadioAnnouncement(uint32 announcement);
-	void PlayFrontEndTrack(uint32 track, uint8 frontendFlag);
+	void PlayFrontEndTrack(uint32 track, bool8 frontendFlag);
 	void StopFrontEndTrack(void);
 	
 	void ResetTimers(uint32 time);
@@ -85,19 +85,19 @@ public:
 	uint8 GetMissionAudioLoadingStatus(uint8 slot);
 	void SetMissionAudioLocation(uint8 slot, float x, float y, float z);
 	void PlayLoadedMissionAudio(uint8 slot);
-	bool IsMissionAudioSampleFinished(uint8 slot);
+	bool8 IsMissionAudioSampleFinished(uint8 slot);
 	void ClearMissionAudio(uint8 slot);
 
 	uint8 GetRadioInCar(void);
 	void SetRadioInCar(uint32 radio);
 	void SetRadioChannel(uint32 radio, int32 pos);
 
-	void SetStartingTrackPositions(uint8 isStartGame);
+	void SetStartingTrackPositions(bool8 isStartGame);
 	float *GetListenTimeArray();
 	uint32 GetFavouriteRadioStation();
 	int32 GetRadioPosition(uint32 station);
-	void SetPedTalkingStatus(class CPed *ped, uint8 status);
+	void SetPedTalkingStatus(class CPed *ped, bool8 status);
 	void SetPlayersMood(uint8 mood, uint32 time);
-	void ShutUpPlayerTalking(uint8 state);
+	void ShutUpPlayerTalking(bool8 state);
 };
 extern cDMAudio DMAudio;
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index 0a28421d..dad45371 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -21,10 +21,14 @@
 #include "DMAudio.h"
 #include "GenericGameStorage.h"
 
+#if !defined FIX_BUGS && (defined RADIO_SCROLL_TO_PREV_STATION || defined RADIO_OFF_TEXT)
+static_assert(false, "R*'s radio implementation is quite buggy, RADIO_SCROLL_TO_PREV_STATION and RADIO_OFF_TEXT won't work without FIX_BUGS");
+#endif
+
 cMusicManager MusicManager;
 int32 gNumRetunePresses;
 int32 gRetuneCounter;
-bool g_bAnnouncementReadPosAlready;
+bool8 g_bAnnouncementReadPosAlready;
 uint8 RadioStaticCounter = 5;
 uint32 RadioStaticTimer;
 
@@ -46,13 +50,13 @@ uint32 NewGameRadioTimers[10] =
 
 cMusicManager::cMusicManager()
 {
-	m_bIsInitialised = false;
-	m_bDisabled = false;
+	m_bIsInitialised = FALSE;
+	m_bDisabled = FALSE;
 	m_nFrontendTrack = NO_TRACK;
 	m_nPlayingTrack = NO_TRACK;
 	m_nUpcomingMusicMode = MUSICMODE_DISABLED;
 	m_nMusicMode = MUSICMODE_DISABLED;
-	field_2 = false;
+	m_bSetNextStation = FALSE;
 
 	for (int i = 0; i < NUM_RADIOS; i++)
 		aListenTimeArray[i] = 0.0f;
@@ -62,7 +66,7 @@ cMusicManager::cMusicManager()
 	m_nCurrentVolume = 0;
 	m_nMaxVolume = 0;
 	m_nAnnouncement = NO_TRACK;
-	m_bAnnouncementInProgress = false;
+	m_bAnnouncementInProgress = FALSE;
 }
 
 void
@@ -70,45 +74,45 @@ cMusicManager::ResetMusicAfterReload()
 {
 	float afRadioTime[NUM_RADIOS];
 
-	m_bRadioSetByScript = false;
-	m_nRadioStation = WILDSTYLE;
+	m_bRadioSetByScript = FALSE;
+	m_nRadioStationScript = WILDSTYLE;
 	m_nRadioPosition = -1;
 	m_nAnnouncement = NO_TRACK;
-	m_bAnnouncementInProgress = false;
-	field_2 = false;
+	m_bAnnouncementInProgress = FALSE;
+	m_bSetNextStation = FALSE;
 	RadioStaticTimer = 0;
 	gNumRetunePresses = 0;
 	gRetuneCounter = 0;
 	m_nFrontendTrack = NO_TRACK;
 	m_nPlayingTrack = NO_TRACK;
-	field_398E = false;
-	field_398F = false;
-	m_nStreamedTrack = NO_TRACK;
-	field_3994 = false;
-	field_3995 = false;
-	field_3996 = false;
-	field_3997 = false;
+	m_FrontendLoopFlag = FALSE;
+	m_bTrackChangeStarted = FALSE;
+	m_nNextTrack = NO_TRACK;
+	m_nNextLoopFlag = FALSE;
+	m_bVerifyNextTrackStartedToPlay = FALSE;
+	m_bGameplayAllowsRadio = FALSE;
+	m_bRadioStreamReady = FALSE;
 	nFramesSinceCutsceneEnded = -1;
-	field_3999 = false;
-	field_399A = false;
-	field_399C = false;
+	m_bUserResumedGame = FALSE;
+	m_bMusicModeChangeStarted = FALSE;
+	m_bEarlyFrontendTrack = FALSE;
 	m_nVolumeLatency = 0;
 	m_nCurrentVolume = 0;
 	m_nMaxVolume = 0;
 
-	bool bRadioWasEverListened = false;
+	bool8 bRadioWasEverListened = FALSE;
 
 	for (int i = 0; i < NUM_RADIOS; i++) {
 		afRadioTime[i] = CStats::GetFavoriteRadioStationList(i);
 		if (!bRadioWasEverListened && afRadioTime[i] != 0.0f)
-			bRadioWasEverListened = true;
+			bRadioWasEverListened = TRUE;
 	}
 
 	if (!bRadioWasEverListened) return;
 
 	for (int i = 0; i < NUM_RADIOS; i++) {
 		aListenTimeArray[i] = afRadioTime[i];
-		uint32 trackPos = GetSavedRadioStationPosition(i);
+		int32 trackPos = GetSavedRadioStationPosition(i);
 		if (trackPos != -1) {
 			if (trackPos > m_aTracks[i].m_nLength) {
 				debug("Radio Track %d saved position is %d, Length is only %d\n", i, trackPos, m_aTracks[i].m_nLength);
@@ -121,7 +125,7 @@ cMusicManager::ResetMusicAfterReload()
 }
 
 void
-cMusicManager::SetStartingTrackPositions(uint8 isNewGameTimer)
+cMusicManager::SetStartingTrackPositions(bool8 isNewGameTimer)
 {
 	int pos;
 
@@ -170,16 +174,16 @@ cMusicManager::SetStartingTrackPositions(uint8 isNewGameTimer)
 	}
 }
 
-bool
+bool8
 cMusicManager::Initialise()
 {
 	if (!IsInitialised()) {
-		m_bIsInitialised = true;
-		SetStartingTrackPositions(false);
-		m_bResetTimers = false;
+		m_bIsInitialised = TRUE;
+		SetStartingTrackPositions(FALSE);
+		m_bResetTimers = FALSE;
 		m_nResetTime = 0;
-		m_bRadioSetByScript = false;
-		m_nRadioStation = WILDSTYLE;
+		m_bRadioSetByScript = FALSE;
+		m_nRadioStationScript = WILDSTYLE;
 		m_nRadioPosition = -1;
 		m_nRadioInCar = NO_TRACK;
 		gRetuneCounter = 0;
@@ -188,18 +192,18 @@ cMusicManager::Initialise()
 		m_nPlayingTrack = NO_TRACK;
 		m_nUpcomingMusicMode = MUSICMODE_DISABLED;
 		m_nMusicMode = MUSICMODE_DISABLED;
-		field_398E = false;
-		field_398F = false;
-		m_nStreamedTrack = NO_TRACK;
-		field_3994 = false;
-		field_3995 = false;
-		field_3996 = false;
-		field_3997 = false;
+		m_FrontendLoopFlag = FALSE;
+		m_bTrackChangeStarted = FALSE;
+		m_nNextTrack = NO_TRACK;
+		m_nNextLoopFlag = FALSE;
+		m_bVerifyNextTrackStartedToPlay = FALSE;
+		m_bGameplayAllowsRadio = FALSE;
+		m_bRadioStreamReady = FALSE;
 		nFramesSinceCutsceneEnded = -1;
-		field_3999 = false;
-		field_399A = false;
+		m_bUserResumedGame = FALSE;
+		m_bMusicModeChangeStarted = FALSE;
 		m_nMusicModeToBeSet = MUSICMODE_DISABLED;
-		field_399C = false;
+		m_bEarlyFrontendTrack = FALSE;
 		m_nVolumeLatency = 0;
 		m_nCurrentVolume = 0;
 		m_nMaxVolume = 0;
@@ -212,11 +216,11 @@ cMusicManager::Terminate()
 {
 	if (!IsInitialised()) return;
 
-	if (SampleManager.IsStreamPlaying(0)) {
-		SampleManager.StopStreamedFile(0);
+	if (SampleManager.IsStreamPlaying()) {
+		SampleManager.StopStreamedFile();
 		m_nPlayingTrack = NO_TRACK;
 	}
-	m_bIsInitialised = false;
+	m_bIsInitialised = FALSE;
 }
 
 void
@@ -226,29 +230,29 @@ cMusicManager::SetRadioChannelByScript(uint32 station, int32 pos)
 		if (station == STREAMED_SOUND_RADIO_MP3_PLAYER)
 			station = STREAMED_SOUND_CITY_AMBIENT;
 		if (station <= STREAMED_SOUND_RADIO_POLICE) {
-			m_bRadioSetByScript = true;
-			m_nRadioStation = station;
+			m_bRadioSetByScript = TRUE;
+			m_nRadioStationScript = station;
 			m_nRadioPosition = pos == -1 ? -1 : pos % m_aTracks[station].m_nLength;
 		}
 	}
 }
 
-bool
+bool8
 cMusicManager::PlayerInCar()
 {
 	CVehicle *vehicle = AudioManager.FindVehicleOfPlayer();
 	if(!vehicle)
-		return false;
+		return FALSE;
 
 	int32 State = FindPlayerPed()->m_nPedState;
 
 	if(State == PED_DRAG_FROM_CAR || State == PED_EXIT_CAR || State == PED_ARRESTED)
-		return false;
+		return FALSE;
 
 	if (vehicle->GetStatus() == STATUS_WRECKED)
-		return false;
+		return FALSE;
 
-	return true;
+	return TRUE;
 }
 
 uint32
@@ -292,7 +296,7 @@ cMusicManager::SetRadioInCar(uint32 station)
 void
 cMusicManager::RecordRadioStats()
 {
-	if (m_nPlayingTrack < STREAMED_SOUND_CITY_AMBIENT) {
+	if (m_nPlayingTrack < NUM_RADIOS) {
 		double time /*Rusty*/ = CTimer::GetTimeInMillisecondsPauseMode();
 		if (time > m_nLastTrackServiceTime)
 			aListenTimeArray[m_nPlayingTrack] += time - m_nLastTrackServiceTime;
@@ -310,27 +314,27 @@ cMusicManager::ChangeMusicMode(uint8 mode)
 	case MUSICMODE_GAME: m_nUpcomingMusicMode = MUSICMODE_GAME; break;
 	case MUSICMODE_CUTSCENE:
 		m_nUpcomingMusicMode = MUSICMODE_CUTSCENE;
-		if (SampleManager.IsStreamPlaying(0)) {
+		if (SampleManager.IsStreamPlaying()) {
 			if (m_nPlayingTrack != NO_TRACK) {
 				RecordRadioStats();
-				m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition(0);
+				m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition();
 				m_aTracks[m_nPlayingTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode();
 			}
 		}
-		SampleManager.StopStreamedFile(0);
-		while (SampleManager.IsStreamPlaying(0))
-			SampleManager.StopStreamedFile(0);
+		SampleManager.StopStreamedFile();
+		while (SampleManager.IsStreamPlaying())
+			SampleManager.StopStreamedFile();
 		m_nMusicMode = m_nUpcomingMusicMode;
-		field_399A = false;
-		field_398F = false;
-		m_nStreamedTrack = NO_TRACK;
-		field_3994 = false;
-		field_3995 = false;
+		m_bMusicModeChangeStarted = FALSE;
+		m_bTrackChangeStarted = FALSE;
+		m_nNextTrack = NO_TRACK;
+		m_nNextLoopFlag = FALSE;
+		m_bVerifyNextTrackStartedToPlay = FALSE;
 		m_nPlayingTrack = NO_TRACK;
 		m_nFrontendTrack = NO_TRACK;
-		m_bAnnouncementInProgress = false;
+		m_bAnnouncementInProgress = FALSE;
 		m_nAnnouncement = NO_TRACK;
-		g_bAnnouncementReadPosAlready = false;
+		g_bAnnouncementReadPosAlready = FALSE;
 		break;
 	case MUSICMODE_DISABLE: m_nUpcomingMusicMode = MUSICMODE_DISABLED; break;
 	default: return;
@@ -340,7 +344,7 @@ cMusicManager::ChangeMusicMode(uint8 mode)
 void
 cMusicManager::ResetTimers(int32 time)
 {
-	m_bResetTimers = true;
+	m_bResetTimers = TRUE;
 	m_nResetTime = time;
 }
 
@@ -348,15 +352,15 @@ void
 cMusicManager::Service()
 {
 	if (m_bResetTimers) {
-		m_bResetTimers = false;
+		m_bResetTimers = FALSE;
 		m_nLastTrackServiceTime = m_nResetTime;
 	}
 
-	static bool bRadioStatsRecorded = false;
+	static bool8 bRadioStatsRecorded = FALSE;
 
 	if (!m_bIsInitialised || m_bDisabled) return;
 
-	if (!field_399A)
+	if (!m_bMusicModeChangeStarted)
 		m_nMusicModeToBeSet = m_nUpcomingMusicMode;
 	if (m_nMusicModeToBeSet == m_nMusicMode) {
 		if (!AudioManager.m_nUserPause || AudioManager.m_nPreviousUserPause || m_nMusicMode != MUSICMODE_FRONTEND)
@@ -365,39 +369,39 @@ cMusicManager::Service()
 			{
 			case MUSICMODE_FRONTEND: ServiceFrontEndMode(); break;
 			case MUSICMODE_GAME: ServiceGameMode(); break;
-			case MUSICMODE_CUTSCENE: SampleManager.SetStreamedVolumeAndPan(MAX_VOLUME, 63, 1, 0); break;
+			case MUSICMODE_CUTSCENE: SampleManager.SetStreamedVolumeAndPan(MAX_VOLUME, 63, TRUE); break;
 			}
 		}
 		else
 			m_nMusicMode = MUSICMODE_DISABLED;
 	} else {
-		field_399A = true;
-		if (!field_3999 && !AudioManager.m_nUserPause && AudioManager.m_nPreviousUserPause)
-			field_3999 = true;
+		m_bMusicModeChangeStarted = TRUE;
+		if (!m_bUserResumedGame && !AudioManager.m_nUserPause && AudioManager.m_nPreviousUserPause)
+			m_bUserResumedGame = TRUE;
 		if (AudioManager.m_FrameCounter % 4 == 0) {
 			gNumRetunePresses = 0;
 			gRetuneCounter = 0;
-			field_2 = false;
-			if (SampleManager.IsStreamPlaying(0)) {
+			m_bSetNextStation = FALSE;
+			if (SampleManager.IsStreamPlaying()) {
 				if (m_nPlayingTrack != NO_TRACK && !bRadioStatsRecorded)
 				{
 					RecordRadioStats();
-					m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition(0);
+					m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition();
 					m_aTracks[m_nPlayingTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode();
-					bRadioStatsRecorded = true;
+					bRadioStatsRecorded = TRUE;
 				}
-				SampleManager.StopStreamedFile(0);
+				SampleManager.StopStreamedFile();
 			} else {
-				bRadioStatsRecorded = false;
+				bRadioStatsRecorded = FALSE;
 				m_nMusicMode = m_nMusicModeToBeSet;
-				field_399A = false;
-				field_398F = false;
-				m_nStreamedTrack = NO_TRACK;
-				field_3994 = false;
-				field_3995 = false;
+				m_bMusicModeChangeStarted = FALSE;
+				m_bTrackChangeStarted = FALSE;
+				m_nNextTrack = NO_TRACK;
+				m_nNextLoopFlag = FALSE;
+				m_bVerifyNextTrackStartedToPlay = FALSE;
 				m_nPlayingTrack = NO_TRACK;
-				if (field_399C)
-					field_399C = false;
+				if (m_bEarlyFrontendTrack)
+					m_bEarlyFrontendTrack = FALSE;
 				else
 					m_nFrontendTrack = NO_TRACK;
 			}
@@ -408,72 +412,72 @@ cMusicManager::Service()
 void
 cMusicManager::ServiceFrontEndMode()
 {
-	static bool bRadioStatsRecorded = false;
+	static bool8 bRadioStatsRecorded = FALSE;
 
 	if (m_bAnnouncementInProgress) {
-		SampleManager.StopStreamedFile(0);
-		if (SampleManager.IsStreamPlaying(0))
+		SampleManager.StopStreamedFile();
+		if (SampleManager.IsStreamPlaying())
 			return;
-		g_bAnnouncementReadPosAlready = false;
+		g_bAnnouncementReadPosAlready = FALSE;
 		m_nAnnouncement = NO_TRACK;
-		m_bAnnouncementInProgress = false;
-		m_nStreamedTrack = NO_TRACK;
+		m_bAnnouncementInProgress = FALSE;
+		m_nNextTrack = NO_TRACK;
 		m_nFrontendTrack = NO_TRACK;
 		m_nPlayingTrack = NO_TRACK;
 	}
 
 	if (AudioManager.m_FrameCounter % 4 != 0) return;
 
-	if (!field_398F && !field_3995) {
-		m_nStreamedTrack = m_nFrontendTrack;
-		field_3994 = field_398E;
+	if (!m_bTrackChangeStarted && !m_bVerifyNextTrackStartedToPlay) {
+		m_nNextTrack = m_nFrontendTrack;
+		m_nNextLoopFlag = m_FrontendLoopFlag;
 	}
 
-	if (m_nStreamedTrack == m_nPlayingTrack) {
-		if (SampleManager.IsStreamPlaying(0)) {
+	if (m_nNextTrack == m_nPlayingTrack) {
+		if (SampleManager.IsStreamPlaying()) {
 			if (m_nVolumeLatency > 0) m_nVolumeLatency--;
 			else {
 				if (m_nCurrentVolume < m_nMaxVolume)
 					m_nCurrentVolume = Min(m_nMaxVolume, m_nCurrentVolume + 6);
-				SampleManager.SetStreamedVolumeAndPan(m_nCurrentVolume, 63, 0, 0);
+				SampleManager.SetStreamedVolumeAndPan(m_nCurrentVolume, 63, FALSE);
 			}
 		} else {
 			if (m_nPlayingTrack == STREAMED_SOUND_RADIO_MP3_PLAYER)
-				SampleManager.StartStreamedFile(STREAMED_SOUND_RADIO_MP3_PLAYER, 0, 0);
+				SampleManager.StartStreamedFile(STREAMED_SOUND_RADIO_MP3_PLAYER, 0);
 			else if (m_nPlayingTrack == STREAMED_SOUND_MISSION_COMPLETED && AudioManager.m_nUserPause == 0)
 				ChangeMusicMode(MUSICMODE_GAME);
 		}
 	} else {
-		field_398F = true;
-		if (field_3995 || !SampleManager.IsStreamPlaying(0)) {
-			bRadioStatsRecorded = false;
-			if (SampleManager.IsStreamPlaying(0) || m_nStreamedTrack == NO_TRACK) {
-				m_nPlayingTrack = m_nStreamedTrack;
-				field_3995 = false;
-				field_398F = false;
+		m_bTrackChangeStarted = TRUE;
+		if (m_bVerifyNextTrackStartedToPlay || !SampleManager.IsStreamPlaying()) {
+			bRadioStatsRecorded = FALSE;
+			if (SampleManager.IsStreamPlaying() || m_nNextTrack == NO_TRACK) {
+				m_nPlayingTrack = m_nNextTrack;
+				m_bVerifyNextTrackStartedToPlay = FALSE;
+				m_bTrackChangeStarted = FALSE;
 			} else {
-				uint32 trackStartPos = (m_nStreamedTrack > STREAMED_SOUND_RADIO_POLICE) ? 0 : GetTrackStartPos(m_nStreamedTrack);
-				if (m_nStreamedTrack != NO_TRACK) {
-					SampleManager.SetStreamedFileLoopFlag(field_3994, 0);
-					SampleManager.StartStreamedFile(m_nStreamedTrack, trackStartPos, 0);
+				uint32 trackStartPos = (m_nNextTrack > STREAMED_SOUND_RADIO_POLICE) ? 0 : GetTrackStartPos(m_nNextTrack);
+				if (m_nNextTrack != NO_TRACK) {
+					SampleManager.SetStreamedFileLoopFlag(m_nNextLoopFlag);
+					SampleManager.StartStreamedFile(m_nNextTrack, trackStartPos);
 					m_nVolumeLatency = 3;
 					m_nCurrentVolume = 0;
 					m_nMaxVolume = 100;
-					SampleManager.SetStreamedVolumeAndPan(m_nCurrentVolume, 63, 0, 0);
-					if (m_nStreamedTrack < STREAMED_SOUND_CITY_AMBIENT)
+					SampleManager.SetStreamedVolumeAndPan(m_nCurrentVolume, 63, FALSE);
+					if (m_nNextTrack < STREAMED_SOUND_CITY_AMBIENT)
 						m_nLastTrackServiceTime = CTimer::GetTimeInMillisecondsPauseMode();
-					field_3995 = true;
+					m_bVerifyNextTrackStartedToPlay = TRUE;
 				}
 			}
 		} else {
 			if (m_nPlayingTrack != NO_TRACK && !bRadioStatsRecorded) {
-				m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition(0);
+				m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition();
 				m_aTracks[m_nPlayingTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode();
 				RecordRadioStats();
-				bRadioStatsRecorded = true;
+				bRadioStatsRecorded = TRUE;
 			}
-			SampleManager.SetStreamedVolumeAndPan(0, 63, 0, 0);
-			SampleManager.StopStreamedFile(0);
+			SampleManager.SetStreamedVolumeAndPan(0, 63, FALSE);
+			SampleManager.StopStreamedFile();
 		}
 	}
 }
@@ -483,8 +487,8 @@ cMusicManager::ServiceGameMode()
 {
 	CPed *ped = FindPlayerPed();
 	CVehicle *vehicle = AudioManager.FindVehicleOfPlayer();
-	field_3997 = field_3996;
-	field_3996 = false;
+	m_bRadioStreamReady = m_bGameplayAllowsRadio;
+	m_bGameplayAllowsRadio = FALSE;
 
 	switch (CGame::currArea)
 	{
@@ -495,29 +499,28 @@ cMusicManager::ServiceGameMode()
 	case AREA_BLOOD:
 	case AREA_OVALRING:
 	case AREA_MALIBU_CLUB:
-		field_3996 = false;
+		m_bGameplayAllowsRadio = FALSE;
 		break;
 	default:
 		if (SampleManager.GetMusicVolume()) {
 			if (PlayerInCar())
-				field_3996 = true;
+				m_bGameplayAllowsRadio = TRUE;
 		} else
-			field_3996 = false;
+			m_bGameplayAllowsRadio = FALSE;
 		break;
 	}
 
-	if (!field_3996) {
+	if (!m_bGameplayAllowsRadio) {
 		nFramesSinceCutsceneEnded = -1;
 		gNumRetunePresses = 0;
 		gRetuneCounter = 0;
-		field_2 = false;
+		m_bSetNextStation = FALSE;
 	} else if (ped) {
-		if(!ped->DyingOrDead()) {
+		if(!ped->DyingOrDead() && vehicle) {
 #ifdef GTA_PC
 			if (SampleManager.IsMP3RadioChannelAvailable()
 				&& vehicle->m_nRadioStation < USERTRACK
-				&& ControlsManager.GetIsKeyboardKeyJustDown(rsF9)
-				&& vehicle)
+				&& ControlsManager.GetIsKeyboardKeyJustDown(rsF9))
 			{
 				if (!UsesPoliceRadio(vehicle) && !UsesTaxiRadio(vehicle)) {
 					gNumRetunePresses = 0;
@@ -532,7 +535,7 @@ cMusicManager::ServiceGameMode()
 				}
 			}
 #endif
-			if (CPad::GetPad(0)->ChangeStationJustDown() && vehicle)
+			if (CPad::GetPad(0)->ChangeStationJustDown())
 			{
 				if (!UsesPoliceRadio(vehicle) && !UsesTaxiRadio(vehicle)) {
 					gNumRetunePresses++;
@@ -540,159 +543,195 @@ cMusicManager::ServiceGameMode()
 					RadioStaticCounter = 0;
 				}
 			}
-
+#ifdef RADIO_SCROLL_TO_PREV_STATION
+			else if(CPad::GetPad(0)->GetMouseWheelDownJustDown() || CPad::GetPad(0)->GetMouseWheelUpJustDown()) {
+				if(!UsesPoliceRadio(vehicle) && !UsesTaxiRadio(vehicle)) {
+					int scrollNext = ControlsManager.GetControllerKeyAssociatedWithAction(VEHICLE_CHANGE_RADIO_STATION, MOUSE);
+					int scrollPrev = scrollNext == rsMOUSEWHEELUPBUTTON ? rsMOUSEWHEELDOWNBUTTON
+																		: scrollNext == rsMOUSEWHEELDOWNBUTTON ? rsMOUSEWHEELUPBUTTON : -1;
+
+					if(scrollPrev != -1 && !ControlsManager.IsAnyVehicleActionAssignedToMouseKey(scrollPrev)) {
+						gNumRetunePresses--;
+						gRetuneCounter = 20;
+						RadioStaticCounter = 0;
+						int track = gNumRetunePresses + vehicle->m_nRadioStation;
+						while(track < 0) track += NUM_RADIOS + 1;
+						while(track >= NUM_RADIOS + 1) track -= NUM_RADIOS + 1;
+						if(!DMAudio.IsMP3RadioChannelAvailable() && track == USERTRACK) gNumRetunePresses--;
+					}
+				}
+			}
+#endif
 		}
 	}
 
-	if (field_3999)
+	if (m_bUserResumedGame)
 	{
-		field_3997 = false;
-		field_3999 = false;
+		m_bRadioStreamReady = FALSE;
+		m_bUserResumedGame = FALSE;
 	}
 	if (m_nPlayingTrack == NO_TRACK && m_nFrontendTrack == NO_TRACK)
-		field_3997 = false;
+		m_bRadioStreamReady = FALSE;
 
-	if (field_3996)
+	if (m_bGameplayAllowsRadio)
 	{
-		if (field_3997)
+		if (!m_bRadioStreamReady)
 		{
-			if (m_nAnnouncement < NO_TRACK) {
-				if ((m_bAnnouncementInProgress || m_nFrontendTrack == m_nPlayingTrack) && ServiceAnnouncement()) {
-					if (m_bAnnouncementInProgress) {
-						field_2 = false;
-						gNumRetunePresses = 0;
-						gRetuneCounter = 0;
-						return;
-					}
-					if(m_nAnnouncement == NO_TRACK) {
-						m_nStreamedTrack = NO_TRACK;
-						m_nFrontendTrack = GetCarTuning();
-						field_2 = false;
-						gRetuneCounter = 0;
-						gNumRetunePresses = 0;
-					}
+			if(vehicle == nil) {
+				m_nFrontendTrack = STREAMED_SOUND_RADIO_LCFR; // huh?
+				return;
+			}
+			if(m_bRadioSetByScript) {
+				if(UsesPoliceRadio(vehicle))
+					m_nFrontendTrack = STREAMED_SOUND_RADIO_POLICE;
+				else if(UsesTaxiRadio(vehicle))
+					m_nFrontendTrack = STREAMED_SOUND_RADIO_TAXI;
+				else {
+					m_nFrontendTrack = m_nRadioStationScript;
+					vehicle->m_nRadioStation = m_nRadioStationScript;
+				}
+				if(m_nRadioPosition != -1) {
+					m_aTracks[m_nFrontendTrack].m_nPosition = m_nRadioPosition;
+					m_aTracks[m_nFrontendTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode();
 				}
+				m_bRadioSetByScript = FALSE;
+				return;
 			}
-			if (!m_bAnnouncementInProgress
-				&& m_nAnnouncement == NO_TRACK
-				&& m_nPlayingTrack == STREAMED_SOUND_RADIO_MP3_PLAYER
-				&& !SampleManager.IsStreamPlaying(0))
-			{
-				SampleManager.StartStreamedFile(STREAMED_SOUND_RADIO_MP3_PLAYER, 0, 0);
+
+			// This starts the radio when you enter the car.
+			m_nFrontendTrack = GetCarTuning();
+			return;
+		}
+		if (m_nAnnouncement < NO_TRACK) {
+			if ((m_bAnnouncementInProgress || m_nFrontendTrack == m_nPlayingTrack) && ServiceAnnouncement()) {
+				if (m_bAnnouncementInProgress) {
+					m_bSetNextStation = FALSE;
+					gNumRetunePresses = 0;
+					gRetuneCounter = 0;
+					return;
+				}
+				if(m_nAnnouncement == NO_TRACK) {
+					m_nNextTrack = NO_TRACK;
+					m_nFrontendTrack = GetCarTuning();
+					m_bSetNextStation = FALSE;
+					gRetuneCounter = 0;
+					gNumRetunePresses = 0;
+				}
 			}
+		}
+		if (!m_bAnnouncementInProgress
+			&& m_nAnnouncement == NO_TRACK
+			&& m_nPlayingTrack == STREAMED_SOUND_RADIO_MP3_PLAYER
+			&& !SampleManager.IsStreamPlaying())
+		{
+			SampleManager.StartStreamedFile(STREAMED_SOUND_RADIO_MP3_PLAYER, 0);
+		}
 
-			if (!m_bRadioSetByScript)
+		if (!m_bRadioSetByScript)
+		{
+			// Because when you switch radio back and forth, gNumRetunePresses will be 0 but gRetuneCounter won't.
+#ifdef RADIO_SCROLL_TO_PREV_STATION
+			if(gRetuneCounter != 0) {
+				if(gRetuneCounter > 1)
+					gRetuneCounter--;
+				else if(gRetuneCounter == 1) {
+					m_bSetNextStation = TRUE;
+					gRetuneCounter = 0;
+				}
+			}
+#else
+			if (gNumRetunePresses != 0)
 			{
-				if (gNumRetunePresses != 0)
+				if (--gRetuneCounter == 0)
 				{
-					if (--gRetuneCounter == 0)
-					{
-						field_2 = true;
-						gRetuneCounter = 0;
-					}
+					m_bSetNextStation = TRUE;
+					gRetuneCounter = 0;
 				}
-				if (gRetuneCounter)
-				{
-					int32 station = gNumRetunePresses + vehicle->m_nRadioStation;
-					while (station >= RADIO_OFF) station -= RADIO_OFF;
+			}
+#endif
+			if (gRetuneCounter)
+			{
+				int32 station = gNumRetunePresses + vehicle->m_nRadioStation;
+#ifdef RADIO_SCROLL_TO_PREV_STATION
+				while (station < 0) station += NUM_RADIOS + 1;
+#endif
+				while (station >= NUM_RADIOS + 1) station -= NUM_RADIOS + 1;
 
-					if (!DMAudio.IsMP3RadioChannelAvailable() && station == USERTRACK)
-					{
-						++gNumRetunePresses;
-						station = NUM_RADIOS;
-					}
-					if (station == NUM_RADIOS)
-					{
-						if (gRetuneCounter == NUM_RADIOS + 9)
-						{
-							AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_FRONTEND_NO_RADIO, 0.0f);
-							RadioStaticCounter = 5;
-						}
-					}
-					else
+				// Scrolling back won't hit here, so increasing isn't problem
+				if (!DMAudio.IsMP3RadioChannelAvailable() && station == USERTRACK)
+				{
+					++gNumRetunePresses;
+					station = RADIO_OFF;
+				}
+				if (station == RADIO_OFF)
+				{
+					if (gRetuneCounter == 19) // One less then what switching radio sets, so runs right after turning off radio
 					{
-						if (station == WILDSTYLE && gRetuneCounter == NUM_RADIOS + 9)
-							AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_FRONTEND_RADIO_CHANGE, 0.0f);
-						AudioManager.DoPoliceRadioCrackle();
+						AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_FRONTEND_RADIO_TURN_OFF, 0.0f);
+						RadioStaticCounter = 5;
 					}
 				}
-				if (RadioStaticCounter < 2 && CTimer::GetTimeInMilliseconds() > RadioStaticTimer + 800)
+				else
 				{
-					AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_RADIO_CHANGE, 0.0f);
-					RadioStaticCounter++;
-					RadioStaticTimer = CTimer::GetTimeInMilliseconds();
+#ifdef RADIO_SCROLL_TO_PREV_STATION
+					if (vehicle->m_nRadioStation == RADIO_OFF && gRetuneCounter == 19) // Right after turning on the radio
+#else
+					if (station == 0 && gRetuneCounter == 19) // Right after turning on the radio
+#endif
+						AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_FRONTEND_RADIO_TURN_ON, 0.0f);
+					AudioManager.DoPoliceRadioCrackle();
 				}
-				if (field_2)
-					m_nFrontendTrack = GetNextCarTuning();
-				if (m_nFrontendTrack >= STREAMED_SOUND_CITY_AMBIENT && m_nFrontendTrack <= STREAMED_SOUND_AMBSIL_AMBIENT)
-					SetUpCorrectAmbienceTrack();
-				ServiceTrack(vehicle, ped);
-				if (field_2)
-					field_2 = false;
-				return;
-			}
-			if (UsesPoliceRadio(vehicle))
-				m_nFrontendTrack = STREAMED_SOUND_RADIO_POLICE;
-			else if (UsesTaxiRadio(vehicle))
-				m_nFrontendTrack = STREAMED_SOUND_RADIO_TAXI;
-			else {
-				m_nFrontendTrack = m_nRadioStation;
-				vehicle->m_nRadioStation = m_nRadioStation;
 			}
-
-			if (m_nRadioPosition != -1) {
-				m_aTracks[m_nFrontendTrack].m_nPosition = m_nRadioPosition;
-				m_aTracks[m_nFrontendTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode();
+			if (RadioStaticCounter < 2 && CTimer::GetTimeInMilliseconds() > RadioStaticTimer + 800)
+			{
+				AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_RADIO_CHANGE, 0.0f);
+				RadioStaticCounter++;
+				RadioStaticTimer = CTimer::GetTimeInMilliseconds();
 			}
-
-			gRetuneCounter = 0;
-			gNumRetunePresses = 0;
-			field_2 = false;
-			m_bRadioSetByScript = false;
+			if (m_bSetNextStation)
+				m_nFrontendTrack = GetNextCarTuning();
 			if (m_nFrontendTrack >= STREAMED_SOUND_CITY_AMBIENT && m_nFrontendTrack <= STREAMED_SOUND_AMBSIL_AMBIENT)
 				SetUpCorrectAmbienceTrack();
 			ServiceTrack(vehicle, ped);
-			if (field_2)
-				field_2 = false;
+			if (m_bSetNextStation)
+				m_bSetNextStation = FALSE;
 			return;
 		}
-		if (vehicle == nil)
-		{
-			m_nFrontendTrack = STREAMED_SOUND_RADIO_LCFR; // huh?
-			return;
+		if (UsesPoliceRadio(vehicle))
+			m_nFrontendTrack = STREAMED_SOUND_RADIO_POLICE;
+		else if (UsesTaxiRadio(vehicle))
+			m_nFrontendTrack = STREAMED_SOUND_RADIO_TAXI;
+		else {
+			m_nFrontendTrack = m_nRadioStationScript;
+			vehicle->m_nRadioStation = m_nRadioStationScript;
 		}
-		if (m_bRadioSetByScript)
-		{
-			if (UsesPoliceRadio(vehicle))
-				m_nFrontendTrack = STREAMED_SOUND_RADIO_POLICE;
-			else if (UsesTaxiRadio(vehicle))
-				m_nFrontendTrack = STREAMED_SOUND_RADIO_TAXI;
-			else {
-				m_nFrontendTrack = m_nRadioStation;
-				vehicle->m_nRadioStation = m_nRadioStation;
-			}
-			if (m_nRadioPosition != -1)
-			{
-				m_aTracks[m_nFrontendTrack].m_nPosition = m_nRadioPosition;
-				m_aTracks[m_nFrontendTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode();
-			}
-			m_bRadioSetByScript = false;
-			return;
+
+		if (m_nRadioPosition != -1) {
+			m_aTracks[m_nFrontendTrack].m_nPosition = m_nRadioPosition;
+			m_aTracks[m_nFrontendTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode();
 		}
 
-		m_nFrontendTrack = GetCarTuning();
+		gRetuneCounter = 0;
+		gNumRetunePresses = 0;
+		m_bSetNextStation = FALSE;
+		m_bRadioSetByScript = FALSE;
+		if (m_nFrontendTrack >= STREAMED_SOUND_CITY_AMBIENT && m_nFrontendTrack <= STREAMED_SOUND_AMBSIL_AMBIENT)
+			SetUpCorrectAmbienceTrack();
+		ServiceTrack(vehicle, ped);
+		if (m_bSetNextStation)
+			m_bSetNextStation = FALSE;
 		return;
 	}
 
 	if (m_bAnnouncementInProgress)
 	{
-		SampleManager.StopStreamedFile(0);
-		if (SampleManager.IsStreamPlaying(0))
+		SampleManager.StopStreamedFile();
+		if (SampleManager.IsStreamPlaying())
 			return;
-		g_bAnnouncementReadPosAlready = false;
+		g_bAnnouncementReadPosAlready = FALSE;
 		m_nAnnouncement = NO_TRACK;
-		m_bAnnouncementInProgress = false;
-		m_nStreamedTrack = NO_TRACK;
+		m_bAnnouncementInProgress = FALSE;
+		m_nNextTrack = NO_TRACK;
 		m_nFrontendTrack = NO_TRACK;
 		m_nPlayingTrack = NO_TRACK;
 	}
@@ -769,7 +808,7 @@ GetHeightScale()
 }
 
 void
-cMusicManager::ComputeAmbienceVol(uint8 reset, uint8& outVolume)
+cMusicManager::ComputeAmbienceVol(bool8 reset, uint8& outVolume)
 {
 	static float fVol = 0.0f;
 
@@ -829,103 +868,110 @@ cMusicManager::ComputeAmbienceVol(uint8 reset, uint8& outVolume)
 	outVolume = (90.0f - fHeightScale) / 50.0f * fVol;
 }
 
-bool
+bool8
 cMusicManager::ServiceAnnouncement()
 {
 	if (m_bAnnouncementInProgress) {
-		if (SampleManager.IsStreamPlaying(0))
-			m_nPlayingTrack = m_nStreamedTrack;
+		if (SampleManager.IsStreamPlaying())
+			m_nPlayingTrack = m_nNextTrack;
 		else if (m_nPlayingTrack != NO_TRACK) {
 			m_nAnnouncement = NO_TRACK;
-			m_bAnnouncementInProgress = false;
+			m_bAnnouncementInProgress = FALSE;
 			m_nPlayingTrack = NO_TRACK;
 		}
-		return true;
-	} else if (SampleManager.IsStreamPlaying(0)) {
+		return TRUE;
+	} else if (SampleManager.IsStreamPlaying()) {
 		if (m_nPlayingTrack != NO_TRACK && !g_bAnnouncementReadPosAlready) {
 			RecordRadioStats();
-			m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition(0);
-			g_bAnnouncementReadPosAlready = true;
+			m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition();
+			g_bAnnouncementReadPosAlready = TRUE;
 			m_aTracks[m_nPlayingTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode();
 		}
-		SampleManager.StopStreamedFile(0);
+		SampleManager.StopStreamedFile();
 	} else {
-		g_bAnnouncementReadPosAlready = false;
+		g_bAnnouncementReadPosAlready = FALSE;
 		m_nPlayingTrack = NO_TRACK;
-		m_nStreamedTrack = m_nAnnouncement;
-		SampleManager.SetStreamedFileLoopFlag(0, false);
-		SampleManager.StartStreamedFile(m_nStreamedTrack, 0, 0);
-		SampleManager.SetStreamedVolumeAndPan(MAX_VOLUME, 63, 0, 0);
-		m_bAnnouncementInProgress = true;
+		m_nNextTrack = m_nAnnouncement;
+		SampleManager.SetStreamedFileLoopFlag(FALSE);
+		SampleManager.StartStreamedFile(m_nNextTrack, 0);
+		SampleManager.SetStreamedVolumeAndPan(MAX_VOLUME, 63, FALSE);
+		m_bAnnouncementInProgress = TRUE;
 	}
 
-	return true;
+	return TRUE;
 }
 
 void
 cMusicManager::ServiceTrack(CVehicle *veh, CPed *ped)
 {
-	static bool bRadioStatsRecorded = false;
-	static bool bRadioStatsRecorded2 = false;
+	static bool8 bRadioStatsRecorded = FALSE;
+	static bool8 bRadioStatsRecorded2 = FALSE;
 	uint8 volume;
-	if (!field_398F)
-		m_nStreamedTrack = m_nFrontendTrack;
-	if (gRetuneCounter != 0 || field_2) {
-		if (SampleManager.IsStreamPlaying(0)) {
+	if (!m_bTrackChangeStarted)
+		m_nNextTrack = m_nFrontendTrack;
+	if (gRetuneCounter != 0 || m_bSetNextStation) {
+		if (SampleManager.IsStreamPlaying()) {
 			if (m_nPlayingTrack != NO_TRACK && !bRadioStatsRecorded) {
-				m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition(0);
+				m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition();
 				m_aTracks[m_nPlayingTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode();
 				RecordRadioStats();
-				bRadioStatsRecorded = true;
+				bRadioStatsRecorded = TRUE;
 			}
-			SampleManager.SetStreamedVolumeAndPan(0, 63, 0, 0);
-			SampleManager.StopStreamedFile(0);
+			SampleManager.SetStreamedVolumeAndPan(0, 63, FALSE);
+			SampleManager.StopStreamedFile();
 		}
 		return;
 	}
 
 	if (bRadioStatsRecorded) {
-		bRadioStatsRecorded = false;
+		bRadioStatsRecorded = FALSE;
 		m_nPlayingTrack = NO_TRACK;
 	}
 
-	if (m_nStreamedTrack != m_nPlayingTrack)
+	if (m_nNextTrack != m_nPlayingTrack)
 	{
-		field_398F = true;
-		SampleManager.SetStreamedVolumeAndPan(0, 63, 0, 0);
+		m_bTrackChangeStarted = TRUE;
+		SampleManager.SetStreamedVolumeAndPan(0, 63, FALSE);
 		if (!(AudioManager.m_FrameCounter & 1)) {
-			if (field_3995 || !SampleManager.IsStreamPlaying(0)) {
-				bRadioStatsRecorded2 = false;
-				if (SampleManager.IsStreamPlaying(0)) {
-					m_nPlayingTrack = m_nStreamedTrack;
-					field_3995 = false;
-					field_398F = false;
+			if (m_bVerifyNextTrackStartedToPlay || !SampleManager.IsStreamPlaying()) {
+				bRadioStatsRecorded2 = FALSE;
+				if (SampleManager.IsStreamPlaying()) {
+					m_nPlayingTrack = m_nNextTrack;
+					m_bVerifyNextTrackStartedToPlay = FALSE;
+					m_bTrackChangeStarted = FALSE;
 					if (veh) {
-						if (veh->m_nRadioStation < STREAMED_SOUND_CITY_AMBIENT || veh->m_nRadioStation > STREAMED_SOUND_AMBSIL_AMBIENT)
+#ifdef FIX_BUGS
+						if (m_nPlayingTrack >= STREAMED_SOUND_CITY_AMBIENT && m_nPlayingTrack <= STREAMED_SOUND_AMBSIL_AMBIENT)
+							veh->m_nRadioStation = RADIO_OFF;
+						else if (m_nPlayingTrack < STREAMED_SOUND_CITY_AMBIENT)
 							veh->m_nRadioStation = m_nPlayingTrack;
+#else
+						if (veh->m_nRadioStation >= STREAMED_SOUND_CITY_AMBIENT && veh->m_nRadioStation <= STREAMED_SOUND_AMBSIL_AMBIENT)
+							veh->m_nRadioStation = RADIO_OFF;
 						else
-							veh->m_nRadioStation = STREAMED_SOUND_CITY_AMBIENT;
+							veh->m_nRadioStation = m_nPlayingTrack;
+#endif
 					}
 				} else {
-					uint32 pos = GetTrackStartPos(m_nStreamedTrack);
-					if (m_nStreamedTrack != NO_TRACK) {
-						SampleManager.SetStreamedFileLoopFlag(1, 0);
-						SampleManager.StartStreamedFile(m_nStreamedTrack, pos, 0);
+					uint32 pos = GetTrackStartPos(m_nNextTrack);
+					if (m_nNextTrack != NO_TRACK) {
+						SampleManager.SetStreamedFileLoopFlag(TRUE);
+						SampleManager.StartStreamedFile(m_nNextTrack, pos);
 						if (m_nFrontendTrack < STREAMED_SOUND_CITY_AMBIENT || m_nFrontendTrack > STREAMED_SOUND_AMBSIL_AMBIENT)
 						{
 							m_nVolumeLatency = 10;
 							m_nCurrentVolume = 0;
 							m_nMaxVolume = 100;
-							SampleManager.SetStreamedVolumeAndPan(m_nCurrentVolume, 63, 0, 0);
+							SampleManager.SetStreamedVolumeAndPan(m_nCurrentVolume, 63, FALSE);
 						}
 						else
 						{
-							ComputeAmbienceVol(true, volume);
-							SampleManager.SetStreamedVolumeAndPan(volume, 63, 1, 0);
+							ComputeAmbienceVol(TRUE, volume);
+							SampleManager.SetStreamedVolumeAndPan(volume, 63, TRUE);
 						}
-						if (m_nStreamedTrack < STREAMED_SOUND_CITY_AMBIENT)
+						if (m_nNextTrack < STREAMED_SOUND_CITY_AMBIENT)
 							m_nLastTrackServiceTime = CTimer::GetTimeInMillisecondsPauseMode();
-						field_3995 = true;
+						m_bVerifyNextTrackStartedToPlay = TRUE;
 					}
 				}
 			} else {
@@ -933,18 +979,18 @@ cMusicManager::ServiceTrack(CVehicle *veh, CPed *ped)
 					debug("m_nPlayingTrack == NO_TRACK, yet track playing - tidying up\n");
 				else if (!bRadioStatsRecorded2)
 				{
-					m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition(0);
+					m_aTracks[m_nPlayingTrack].m_nPosition = SampleManager.GetStreamedFilePosition();
 					m_aTracks[m_nPlayingTrack].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode();
-					bRadioStatsRecorded2 = true;
+					bRadioStatsRecorded2 = TRUE;
 					RecordRadioStats();
 					if (m_nPlayingTrack >= STREAMED_SOUND_HAVANA_CITY_AMBIENT && m_nPlayingTrack <= STREAMED_SOUND_HAVANA_BEACH_AMBIENT)
 					{
-						if (m_nStreamedTrack >= STREAMED_SOUND_HAVANA_CITY_AMBIENT && m_nStreamedTrack <= STREAMED_SOUND_HAVANA_BEACH_AMBIENT)
-							AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_FRONTEND_RADIO_CHANGE_2, 0.0);
+						if (m_nNextTrack >= STREAMED_SOUND_HAVANA_CITY_AMBIENT && m_nNextTrack <= STREAMED_SOUND_HAVANA_BEACH_AMBIENT)
+							AudioManager.PlayOneShot(AudioManager.m_nFrontEndEntity, SOUND_FRONTEND_HURRICANE, 0.0);
 					}
 				}
-				SampleManager.SetStreamedVolumeAndPan(0, 63, 0, 0);
-				SampleManager.StopStreamedFile(0);
+				SampleManager.SetStreamedVolumeAndPan(0, 63, FALSE);
+				SampleManager.StopStreamedFile();
 			}
 		}
 		return;
@@ -952,8 +998,8 @@ cMusicManager::ServiceTrack(CVehicle *veh, CPed *ped)
 
 	if (m_nPlayingTrack >= STREAMED_SOUND_CITY_AMBIENT && m_nPlayingTrack <= STREAMED_SOUND_AMBSIL_AMBIENT)
 	{
-		ComputeAmbienceVol(false, volume);
-		SampleManager.SetStreamedVolumeAndPan(volume, 63, 1, 0);
+		ComputeAmbienceVol(FALSE, volume);
+		SampleManager.SetStreamedVolumeAndPan(volume, 63, TRUE);
 		return;
 	}
 	if (CTimer::GetIsSlowMotionActive())
@@ -963,7 +1009,7 @@ cMusicManager::ServiceTrack(CVehicle *veh, CPed *ped)
 			float DistToTargetSq = (TheCamera.pTargetEntity->GetPosition() - TheCamera.GetPosition()).MagnitudeSqr();
 			if (DistToTargetSq >= SQR(55.0f))
 			{
-				SampleManager.SetStreamedVolumeAndPan(0, 63, 0, 0);
+				SampleManager.SetStreamedVolumeAndPan(0, 63, FALSE);
 			}
 			else if (DistToTargetSq >= SQR(10.0f))
 			{
@@ -980,17 +1026,17 @@ cMusicManager::ServiceTrack(CVehicle *veh, CPed *ped)
 				}
 				if (gRetuneCounter != 0)
 					volume = 0;
-				SampleManager.SetStreamedVolumeAndPan(volume, pan, 0, 0);
+				SampleManager.SetStreamedVolumeAndPan(volume, pan, FALSE);
 			}
 			else if (AudioManager.ShouldDuckMissionAudio(0) || AudioManager.ShouldDuckMissionAudio(1))
-				SampleManager.SetStreamedVolumeAndPan(m_nCurrentVolume, 63, 0, 0);
+				SampleManager.SetStreamedVolumeAndPan(m_nCurrentVolume, 63, FALSE);
 			else if (gRetuneCounter != 0)
-				SampleManager.SetStreamedVolumeAndPan(0, 63, 0, 0);
+				SampleManager.SetStreamedVolumeAndPan(0, 63, FALSE);
 			else
-				SampleManager.SetStreamedVolumeAndPan(m_nCurrentVolume, 63, 0, 0);
+				SampleManager.SetStreamedVolumeAndPan(m_nCurrentVolume, 63, FALSE);
 		}
 	} else if (AudioManager.ShouldDuckMissionAudio(0) || AudioManager.ShouldDuckMissionAudio(1)) {
-		SampleManager.SetStreamedVolumeAndPan(Min(m_nCurrentVolume, 25), 63, 0, 0);
+		SampleManager.SetStreamedVolumeAndPan(Min(m_nCurrentVolume, 25), 63, FALSE);
 		nFramesSinceCutsceneEnded = 0;
 	} else {
 		if (nFramesSinceCutsceneEnded == -1)
@@ -1012,7 +1058,7 @@ cMusicManager::ServiceTrack(CVehicle *veh, CPed *ped)
 		}
 		if (gRetuneCounter != 0)
 			volume = 0;
-		SampleManager.SetStreamedVolumeAndPan(volume, 63, 0, 0);
+		SampleManager.SetStreamedVolumeAndPan(volume, 63, FALSE);
 	}
 	if (m_nVolumeLatency > 0)
 		m_nVolumeLatency--;
@@ -1025,10 +1071,10 @@ cMusicManager::PreloadCutSceneMusic(uint32 track)
 {
 	if (IsInitialised() && !m_bDisabled && track < TOTAL_STREAMED_SOUNDS && m_nMusicMode == MUSICMODE_CUTSCENE) {
 		AudioManager.ResetPoliceRadio();
-		while (SampleManager.IsStreamPlaying(0))
-			SampleManager.StopStreamedFile(0);
-		SampleManager.PreloadStreamedFile(track, 0);
-		SampleManager.SetStreamedVolumeAndPan(MAX_VOLUME, 63, 1, 0);
+		while (SampleManager.IsStreamPlaying())
+			SampleManager.StopStreamedFile();
+		SampleManager.PreloadStreamedFile(track);
+		SampleManager.SetStreamedVolumeAndPan(MAX_VOLUME, 63, TRUE);
 		m_nPlayingTrack = track;
 	}
 }
@@ -1037,27 +1083,27 @@ void
 cMusicManager::PlayPreloadedCutSceneMusic(void)
 {
 	if (IsInitialised() && !m_bDisabled && m_nMusicMode == MUSICMODE_CUTSCENE)
-		SampleManager.StartPreloadedStreamedFile(0);
+		SampleManager.StartPreloadedStreamedFile();
 }
 
 void
 cMusicManager::StopCutSceneMusic(void)
 {
 	if (IsInitialised() && !m_bDisabled && m_nMusicMode == MUSICMODE_CUTSCENE) {
-		SampleManager.StopStreamedFile(0);
+		SampleManager.StopStreamedFile();
 		m_nPlayingTrack = NO_TRACK;
 	}
 }
 
 void
-cMusicManager::PlayFrontEndTrack(uint32 track, uint8 bPlayInFrontend)
+cMusicManager::PlayFrontEndTrack(uint32 track, bool8 loopFlag)
 {
 	if (IsInitialised() && !m_bDisabled && track < TOTAL_STREAMED_SOUNDS && (m_nUpcomingMusicMode == MUSICMODE_FRONTEND || m_nMusicMode == MUSICMODE_FRONTEND))
 	{
 		m_nFrontendTrack = track;
-		field_398E = bPlayInFrontend;
+		m_FrontendLoopFlag = loopFlag;
 		if (m_nMusicMode != MUSICMODE_FRONTEND)
-			field_399C = true;
+			m_bEarlyFrontendTrack = TRUE;
 	}
 }
 
@@ -1083,10 +1129,18 @@ cMusicManager::GetNextCarTuning()
 	if (UsesPoliceRadio(veh)) return STREAMED_SOUND_RADIO_POLICE;
 	if (UsesTaxiRadio(veh)) return STREAMED_SOUND_RADIO_TAXI;
 	if (gNumRetunePresses != 0) {
+#ifdef RADIO_SCROLL_TO_PREV_STATION
+		// m_nRadioStation is unsigned, so...
+		int station = veh->m_nRadioStation + gNumRetunePresses;
+		while(station < 0) station += NUM_RADIOS + 1;
+		while(station >= NUM_RADIOS + 1) station -= NUM_RADIOS + 1;
+		veh->m_nRadioStation = station;
+#else
 		veh->m_nRadioStation += gNumRetunePresses;
-		while (veh->m_nRadioStation >= RADIO_OFF)
-			veh->m_nRadioStation -= RADIO_OFF;
-		DMAudio.IsMP3RadioChannelAvailable(); // woof, just call and do nothing =P
+		while(veh->m_nRadioStation >= NUM_RADIOS + 1)
+			veh->m_nRadioStation -= NUM_RADIOS + 1;
+#endif
+		DMAudio.IsMP3RadioChannelAvailable(); // woof, just call and do nothing =P they manipulate gNumRetunePresses on DisplayRadioStationName in this case
 		gNumRetunePresses = 0;
 	}
 	return veh->m_nRadioStation;
@@ -1129,7 +1183,7 @@ cMusicManager::GetTrackStartPos(uint32 track)
 uint32
 cMusicManager::GetRadioPosition(uint32 station)
 {
-	if (station < STREAMED_SOUND_CITY_AMBIENT)
+	if (station < NUM_RADIOS)
 		return GetTrackStartPos(station);
 	return 0;
 }
@@ -1147,7 +1201,7 @@ cMusicManager::GetFavouriteRadioStation()
 	return favstation;
 }
 
-bool
+bool8
 cMusicManager::CheckForMusicInterruptions()
 {
 	return (m_nPlayingTrack == STREAMED_SOUND_MISSION_COMPLETED) || (m_nPlayingTrack == STREAMED_SOUND_CUTSCENE_FINALE);
@@ -1158,7 +1212,7 @@ cMusicManager::SetMalibuClubTrackPos(uint8 scriptObject)
 {
 	if (!IsInitialised())
 		m_aTracks[STREAMED_SOUND_MALIBU_AMBIENT].m_nPosition = 8640;
-	if (m_nStreamedTrack != STREAMED_SOUND_MALIBU_AMBIENT && m_nPlayingTrack != STREAMED_SOUND_MALIBU_AMBIENT) {
+	if (m_nNextTrack != STREAMED_SOUND_MALIBU_AMBIENT && m_nPlayingTrack != STREAMED_SOUND_MALIBU_AMBIENT) {
 		switch (scriptObject)
 		{
 		case SCRIPT_SOUND_NEW_BUILDING_MALIBU_1:
@@ -1180,7 +1234,7 @@ cMusicManager::SetStripClubTrackPos(uint8 scriptObject)
 {
 	if (!IsInitialised())
 		m_aTracks[STREAMED_SOUND_STRIPCLUB_AMBIENT].m_nPosition = 0;
-	if (m_nStreamedTrack != STREAMED_SOUND_STRIPCLUB_AMBIENT && m_nPlayingTrack != STREAMED_SOUND_STRIPCLUB_AMBIENT)
+	if (m_nNextTrack != STREAMED_SOUND_STRIPCLUB_AMBIENT && m_nPlayingTrack != STREAMED_SOUND_STRIPCLUB_AMBIENT)
 	{
 		switch (scriptObject)
 		{
@@ -1201,7 +1255,7 @@ cMusicManager::SetStripClubTrackPos(uint8 scriptObject)
 void
 cMusicManager::DisplayRadioStationName()
 {
-	int8 gStreamedSound;
+	uint8 gStreamedSound;
 	static wchar *pCurrentStation = nil;
 	static uint8 cDisplay = 0;
 
@@ -1211,21 +1265,33 @@ cMusicManager::DisplayRadioStationName()
 
 		if (vehicle)
 		{
+			// Prev scroll needs it to be signed, and m_nFrontendTrack can be NO_TRACK thus FIX_BUGS
+#if defined RADIO_SCROLL_TO_PREV_STATION || defined FIX_BUGS
+			int track;
+#else
 			uint8 track;
+#endif
 			gStreamedSound = vehicle->m_nRadioStation;
 			if (gStreamedSound >= STREAMED_SOUND_CITY_AMBIENT && gStreamedSound <= STREAMED_SOUND_AMBSIL_AMBIENT)
-				gStreamedSound = STREAMED_SOUND_CITY_AMBIENT;
+				gStreamedSound = RADIO_OFF;
 			if (gNumRetunePresses != 0)
 			{
 				track = gNumRetunePresses + gStreamedSound;
-				while (track >= RADIO_OFF) track -= RADIO_OFF;
+#ifdef RADIO_SCROLL_TO_PREV_STATION
+				while (track < 0) track += NUM_RADIOS + 1;
+#endif
+				while (track >= NUM_RADIOS + 1) track -= NUM_RADIOS + 1;
+
+				// On scrolling back we handle this condition on key press. No need to change this.
 				if (!DMAudio.IsMP3RadioChannelAvailable() && track == USERTRACK)
 					gNumRetunePresses++;
 			}
 			else
+#ifdef RADIO_OFF_TEXT
+				track = GetCarTuning(); // gStreamedSound or veh->m_nRadioStation would also work, but these don't cover police/taxi radios
+#else
 				track = m_nFrontendTrack;
-
-
+#endif
 			wchar* string = nil;
 			switch (track) {
 			case WILDSTYLE: string = TheText.Get("FEA_FM0"); break;
@@ -1251,7 +1317,11 @@ cMusicManager::DisplayRadioStationName()
 			}
 			else {
 				if (cDisplay == 0) return;
+#ifdef FIX_BUGS
+				cDisplay -= CTimer::GetLogicalFramesPassed();
+#else
 				cDisplay--;
+#endif
 			}
 
 			CFont::SetJustifyOff();
@@ -1274,9 +1344,14 @@ cMusicManager::DisplayRadioStationName()
 			CFont::SetCentreSize(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
 		}
 	}
+	// Always show station text after entering car. Same behaviour as III and SA.
+#ifdef FIX_BUGS
+	else
+		pCurrentStation = nil;
+#endif
 }
 
-bool
+bool8
 cMusicManager::UsesPoliceRadio(CVehicle *veh)
 {
 	switch (veh->GetModelIndex())
@@ -1286,18 +1361,18 @@ cMusicManager::UsesPoliceRadio(CVehicle *veh)
 	case MI_COASTG:
 	case MI_RHINO:
 	case MI_BARRACKS:
-		return true;
+		return TRUE;
 	case MI_MRWHOOP:
 	case MI_HUNTER:
-		return false;
+		return FALSE;
 	}
 	return veh->UsesSiren();
 }
 
-bool
+bool8
 cMusicManager::UsesTaxiRadio(CVehicle *veh)
 {
-	if (veh->GetModelIndex() != MI_CABBIE) return false;
+	if (veh->GetModelIndex() != MI_CABBIE) return FALSE;
 	return CTheScripts::bPlayerHasMetDebbieHarry;
 }
 
@@ -1306,10 +1381,10 @@ cMusicManager::ServiceAmbience()
 {
 }
 
-bool
+bool8
 cMusicManager::ChangeRadioChannel()
 {
-	return true;
+	return TRUE;
 }
 
 // these two are empty
diff --git a/src/audio/MusicManager.h b/src/audio/MusicManager.h
index f103e84e..3d2b7cee 100644
--- a/src/audio/MusicManager.h
+++ b/src/audio/MusicManager.h
@@ -16,59 +16,59 @@ class CPed;
 class cMusicManager
 {
 public:
-	bool m_bIsInitialised;
-	bool m_bDisabled;
-	bool field_2;
+	bool8 m_bIsInitialised;
+	bool8 m_bDisabled;
+	bool8 m_bSetNextStation;
 	uint8 m_nVolumeLatency;
 	uint8 m_nCurrentVolume;
 	uint8 m_nMaxVolume;
 	uint32 m_nAnnouncement;
-	bool m_bAnnouncementInProgress;
+	bool8 m_bAnnouncementInProgress;
 	tStreamedSample m_aTracks[TOTAL_STREAMED_SOUNDS];
-	bool m_bResetTimers;
+	bool8 m_bResetTimers;
 	uint32 m_nResetTime;
-	bool m_bRadioSetByScript;
-	uint8 m_nRadioStation;
-	uint32 m_nRadioPosition;
+	bool8 m_bRadioSetByScript;
+	uint8 m_nRadioStationScript;
+	int32 m_nRadioPosition;
 	uint32 m_nRadioInCar;
 	uint32 m_nFrontendTrack;
 	uint32 m_nPlayingTrack;
 	uint8 m_nUpcomingMusicMode;
 	uint8 m_nMusicMode;
-	bool field_398E;
-	bool field_398F;
-	uint32 m_nStreamedTrack;
-	bool field_3994;
-	bool field_3995;
-	bool field_3996;
-	bool field_3997;
+	bool8 m_FrontendLoopFlag;
+	bool8 m_bTrackChangeStarted;
+	uint32 m_nNextTrack;
+	bool8 m_nNextLoopFlag;
+	bool8 m_bVerifyNextTrackStartedToPlay;
+	bool8 m_bGameplayAllowsRadio;
+	bool8 m_bRadioStreamReady;
 	int8 nFramesSinceCutsceneEnded;
-	bool field_3999;
-	bool field_399A;
+	bool8 m_bUserResumedGame;
+	bool8 m_bMusicModeChangeStarted;
 	uint8 m_nMusicModeToBeSet;
-	bool field_399C;
+	bool8 m_bEarlyFrontendTrack;
 	float aListenTimeArray[NUM_RADIOS];
 	float m_nLastTrackServiceTime;
 
 public:
 	cMusicManager();
-	bool IsInitialised() { return m_bIsInitialised; }
+	bool8 IsInitialised() { return m_bIsInitialised; }
 	uint8 GetMusicMode() { return m_nMusicMode; }
 	uint32 GetCurrentTrack() { return m_nPlayingTrack; }
 
 	void ResetMusicAfterReload();
-	void SetStartingTrackPositions(uint8 isNewGameTimer);
-	bool Initialise();
+	void SetStartingTrackPositions(bool8 isNewGameTimer);
+	bool8 Initialise();
 	void Terminate();
 
 	void ChangeMusicMode(uint8 mode);
 	void StopFrontEndTrack();
 
-	bool PlayerInCar();
+	bool8 PlayerInCar();
 	void DisplayRadioStationName();
 
 	void PlayAnnouncement(uint32);
-	void PlayFrontEndTrack(uint32, uint8);
+	void PlayFrontEndTrack(uint32, bool8);
 	void PreloadCutSceneMusic(uint32);
 	void PlayPreloadedCutSceneMusic(void);
 	void StopCutSceneMusic(void);
@@ -83,16 +83,16 @@ public:
 	void ServiceAmbience();
 	void ServiceTrack(CVehicle *veh, CPed *ped);
 
-	bool UsesPoliceRadio(CVehicle *veh);
-	bool UsesTaxiRadio(CVehicle *veh);
+	bool8 UsesPoliceRadio(CVehicle *veh);
+	bool8 UsesTaxiRadio(CVehicle *veh);
 	uint32 GetTrackStartPos(uint32 track);
 
-	void ComputeAmbienceVol(uint8 reset, uint8& outVolume);
-	bool ServiceAnnouncement();
+	void ComputeAmbienceVol(bool8 reset, uint8& outVolume);
+	bool8 ServiceAnnouncement();
 
 	uint32 GetCarTuning();
 	uint32 GetNextCarTuning();
-	bool ChangeRadioChannel();
+	bool8 ChangeRadioChannel();
 	void RecordRadioStats();
 	void SetUpCorrectAmbienceTrack();
 	float *GetListenTimeArray();
@@ -100,7 +100,7 @@ public:
 	uint32 GetFavouriteRadioStation();
 	void SetMalibuClubTrackPos(uint8 pos);
 	void SetStripClubTrackPos(uint8 pos);
-	bool CheckForMusicInterruptions();
+	bool8 CheckForMusicInterruptions();
 
 	void Enable();
 	void Disable();
@@ -109,5 +109,5 @@ public:
 VALIDATE_SIZE(cMusicManager, 0x95C);
 
 extern cMusicManager MusicManager;
-extern bool g_bAnnouncementReadPosAlready; // we have a symbol of this so it was declared in .h
+extern bool8 g_bAnnouncementReadPosAlready; // we have a symbol of this so it was declared in .h
 float GetHeightScale();
diff --git a/src/audio/PoliceRadio.cpp b/src/audio/PolRadio.cpp
index b8f44f60..fb2b06b4 100644
--- a/src/audio/PoliceRadio.cpp
+++ b/src/audio/PolRadio.cpp
@@ -7,7 +7,7 @@
 #include "AudioSamples.h"
 #include "MusicManager.h"
 #include "PlayerPed.h"
-#include "PoliceRadio.h"
+#include "PolRadio.h"
 #include "Replay.h"
 #include "Vehicle.h"
 #include "World.h"
@@ -15,9 +15,6 @@
 #include "sampman.h"
 #include "Wanted.h"
 
-const int channels = ARRAY_SIZE(AudioManager.m_asActiveSamples);
-const int policeChannel = channels + 1;
-
 struct tPoliceRadioZone {
 	char m_aName[8];
 	uint32 m_nSampleIndex;
@@ -41,20 +38,20 @@ cAudioManager::InitialisePoliceRadioZones()
 	strcpy(ZoneSfx[i].m_aName, name); \
 	ZoneSfx[i].m_nSampleIndex = sample;
 
-	SETZONESFX(0, "VICE_C", SFX_POLICE_RADIO_VICE_CITY);
-	SETZONESFX(1, "IND_ZON", SFX_POLICE_RADIO_VICE_CITY_BEACH);
-	SETZONESFX(2, "COM_ZON", SFX_POLICE_RADIO_VICE_CITY_MAINLAND);
-	SETZONESFX(3, "BEACH1", SFX_POLICE_RADIO_OCEAN_BEACH);
-	SETZONESFX(4, "BEACH2", SFX_POLICE_RADIO_WASHINGTON_BEACH);
-	SETZONESFX(5, "BEACH3", SFX_POLICE_RADIO_VICE_POINT);
-	SETZONESFX(6, "GOLFC", SFX_POLICE_RADIO_LEAF_LINKS);
-	SETZONESFX(7, "STARI", SFX_POLICE_RADIO_STRAFISH_ISLAND);
-	SETZONESFX(8, "DOCKS", SFX_POLICE_RADIO_VICE_PORT);
-	SETZONESFX(9, "HAVANA", SFX_POLICE_RADIO_LITTLE_HAVANA);
-	SETZONESFX(10, "HAITI", SFX_POLICE_RADIO_LITTLE_HAITI);
-	SETZONESFX(11, "PORNI", SFX_POLICE_RADIO_PRAWN_ISLAND);
-	SETZONESFX(12, "DTOWN", SFX_POLICE_RADIO_DOWNTOWN);
-	SETZONESFX(13, "A_PORT", SFX_POLICE_RADIO_ESCOBAR_INTERNATIONAL);
+	SETZONESFX(0, "VICE_C", SFX_SFX_POLICE_RADIO_VICE_CITY);
+	SETZONESFX(1, "IND_ZON", SFX_SFX_POLICE_RADIO_VICE_CITY_BEACH);
+	SETZONESFX(2, "COM_ZON", SFX_SFX_POLICE_RADIO_VICE_CITY_MAINLAND);
+	SETZONESFX(3, "BEACH1", SFX_SFX_POLICE_RADIO_OCEAN_BEACH);
+	SETZONESFX(4, "BEACH2", SFX_SFX_POLICE_RADIO_WASHINGTON_BEACH);
+	SETZONESFX(5, "BEACH3", SFX_SFX_POLICE_RADIO_VICE_POINT);
+	SETZONESFX(6, "GOLFC", SFX_SFX_POLICE_RADIO_LEAF_LINKS);
+	SETZONESFX(7, "STARI", SFX_SFX_POLICE_RADIO_STARFISH_ISLAND);
+	SETZONESFX(8, "DOCKS", SFX_SFX_POLICE_RADIO_VICEPORT);
+	SETZONESFX(9, "HAVANA", SFX_SFX_POLICE_RADIO_LITTLE_HAVANA);
+	SETZONESFX(10, "HAITI", SFX_SFX_POLICE_RADIO_LITTLE_HAITI);
+	SETZONESFX(11, "PORNI", SFX_SFX_POLICE_RADIO_PRAWN_ISLAND);
+	SETZONESFX(12, "DTOWN", SFX_SFX_POLICE_RADIO_DOWNTOWN);
+	SETZONESFX(13, "A_PORT", SFX_SFX_POLICE_RADIO_ESCOBAR_INTERNATIONAL);
 
 #undef SETZONESFX
 }
@@ -68,8 +65,8 @@ cAudioManager::InitialisePoliceRadio()
 	for (int32 i = 0; i < ARRAY_SIZE(m_sPoliceRadioQueue.crimes); i++)
 		m_sPoliceRadioQueue.crimes[i].type = CRIME_NONE;
 
-	SampleManager.SetChannelReverbFlag(policeChannel, false);
-	gSpecialSuspectLastSeenReport = false;
+	SampleManager.SetChannelReverbFlag(CHANNEL_POLICE_RADIO, FALSE);
+	gSpecialSuspectLastSeenReport = FALSE;
 	for (int32 i = 0; i < ARRAY_SIZE(gMinTimeToNextReport); i++)
 		gMinTimeToNextReport[i] = m_FrameCounter;
 }
@@ -78,7 +75,7 @@ void
 cAudioManager::ResetPoliceRadio()
 {
 	if (!m_bIsInitialised) return;
-	if (SampleManager.GetChannelUsedFlag(policeChannel)) SampleManager.StopChannel(policeChannel);
+	if (SampleManager.GetChannelUsedFlag(CHANNEL_POLICE_RADIO)) SampleManager.StopChannel(CHANNEL_POLICE_RADIO);
 	InitialisePoliceRadio();
 }
 
@@ -105,19 +102,18 @@ cAudioManager::DoPoliceRadioCrackle()
 	m_sQueueSample.m_nCounter = 0;
 	m_sQueueSample.m_nSampleIndex = SFX_POLICE_RADIO_CRACKLE;
 	m_sQueueSample.m_nBankIndex = SFX_BANK_0;
-	m_sQueueSample.m_bIs2D = true;
+	m_sQueueSample.m_bIs2D = TRUE;
 	m_sQueueSample.m_nReleasingVolumeModificator = 10;
 	m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_POLICE_RADIO_CRACKLE);
 	m_sQueueSample.m_nVolume = m_anRandomTable[2] % 20 + 15;
 	m_sQueueSample.m_nLoopCount = 0;
 	m_sQueueSample.m_nEmittingVolume = m_sQueueSample.m_nVolume;
-	m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(SFX_POLICE_RADIO_CRACKLE);
-	m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(SFX_POLICE_RADIO_CRACKLE);
-	m_sQueueSample.m_bReleasingSoundFlag = false;
-	m_sQueueSample.m_bReverbFlag = false;
+	SET_LOOP_OFFSETS(SFX_POLICE_RADIO_CRACKLE)
+	m_sQueueSample.m_bReleasingSoundFlag = FALSE;
+	m_sQueueSample.m_bReverbFlag = FALSE;
 	m_sQueueSample.m_nOffset = 63;
 	m_sQueueSample.m_nReleasingVolumeDivider = 3;
-	m_sQueueSample.m_bRequireReflection = false;
+	m_sQueueSample.m_bRequireReflection = FALSE;
 	AddSampleToRequestedQueue();
 }
 
@@ -130,7 +126,7 @@ cAudioManager::ServicePoliceRadio()
 	if(!m_bIsInitialised) return;
 
 	if(m_nUserPause == 0) {
-		bool crimeReport = SetupCrimeReport();
+		bool8 crimeReport = SetupCrimeReport();
 #ifdef FIX_BUGS // Crash at 0x5fe6ef
 		if(CReplay::IsPlayingBack() || !FindPlayerPed() || !FindPlayerPed()->m_pWanted)
 			return;
@@ -141,7 +137,11 @@ cAudioManager::ServicePoliceRadio()
 			if (!crimeReport) {
 				if (wantedLevel != 0) {
 					if (nLastSeen != 0)
+#ifdef FIX_BUGS
+						nLastSeen -= CTimer::GetLogicalFramesPassed();
+#else
 						--nLastSeen;
+#endif
 					else {
 						nLastSeen = m_anRandomTable[1] % 1000 + 2000;
 						SetupSuspectLastSeenReport();
@@ -156,31 +156,35 @@ cAudioManager::ServicePoliceRadio()
 void
 cAudioManager::ServicePoliceRadioChannel(uint8 wantedLevel)
 {
-	bool processed = false;
+	bool8 processed = FALSE;
 	uint32 sample;
 	int32 freq;
 
 	static int cWait = 0;
-	static bool bChannelOpen = false;
+	static bool8 bChannelOpen = FALSE;
 	static uint8 bMissionAudioPhysicalPlayingStatus = 0;
 	static int32 PoliceChannelFreq = 22050;
 
 	if (!m_bIsInitialised) return;
 
 	if (m_nUserPause != 0) {
-		if (SampleManager.GetChannelUsedFlag(policeChannel)) SampleManager.StopChannel(policeChannel);
+		if (SampleManager.GetChannelUsedFlag(CHANNEL_POLICE_RADIO)) SampleManager.StopChannel(CHANNEL_POLICE_RADIO);
 		if (g_nMissionAudioSfx != NO_SAMPLE && bMissionAudioPhysicalPlayingStatus == 1 &&
 			SampleManager.IsStreamPlaying(1)) {
-			SampleManager.PauseStream(1, 1);
+			SampleManager.PauseStream(TRUE, 1);
 		}
 	} else {
 		if (m_nPreviousUserPause && g_nMissionAudioSfx != NO_SAMPLE &&
 			bMissionAudioPhysicalPlayingStatus == 1) {
-			SampleManager.PauseStream(0, 1);
+			SampleManager.PauseStream(FALSE, 1);
 		}
-		if (m_sPoliceRadioQueue.policeChannelTimer == 0) bChannelOpen = false;
+		if (m_sPoliceRadioQueue.policeChannelTimer == 0) bChannelOpen = FALSE;
 		if (cWait) {
+#ifdef FIX_BUGS
+			cWait -= CTimer::GetLogicalFramesPassed();
+#else
 			--cWait;
+#endif
 			return;
 		}
 		if (g_nMissionAudioSfx != NO_SAMPLE && !bChannelOpen) {
@@ -200,9 +204,9 @@ cAudioManager::ServicePoliceRadioChannel(uint8 wantedLevel)
 					}
 					return;
 				}
-			} else if (!SampleManager.GetChannelUsedFlag(policeChannel)) {
+			} else if (!SampleManager.GetChannelUsedFlag(CHANNEL_POLICE_RADIO)) {
 				SampleManager.PreloadStreamedFile(g_nMissionAudioSfx, 1);
-				SampleManager.SetStreamedVolumeAndPan(MAX_VOLUME, 63, 1, 1);
+				SampleManager.SetStreamedVolumeAndPan(MAX_VOLUME, 63, TRUE, 1);
 				SampleManager.StartPreloadedStreamedFile(1);
 				g_nMissionAudioPlayingStatus = 1;
 				bMissionAudioPhysicalPlayingStatus = 0;
@@ -211,7 +215,7 @@ cAudioManager::ServicePoliceRadioChannel(uint8 wantedLevel)
 		}
 		if (bChannelOpen) DoPoliceRadioCrackle();
 		if ((g_nMissionAudioSfx == NO_SAMPLE || g_nMissionAudioPlayingStatus != 1) &&
-			!SampleManager.GetChannelUsedFlag(policeChannel) && m_sPoliceRadioQueue.policeChannelTimer) {
+			!SampleManager.GetChannelUsedFlag(CHANNEL_POLICE_RADIO) && m_sPoliceRadioQueue.policeChannelTimer) {
 			if (m_sPoliceRadioQueue.policeChannelTimer) {
 				sample = m_sPoliceRadioQueue.crimesSamples[m_sPoliceRadioQueue.policeChannelCounterSeconds];
 				m_sPoliceRadioQueue.policeChannelTimer--;
@@ -223,35 +227,35 @@ cAudioManager::ServicePoliceRadioChannel(uint8 wantedLevel)
 				if (gSpecialSuspectLastSeenReport) {
 					gSpecialSuspectLastSeenReport = 0;
 				} else if (sample == SFX_POLICE_RADIO_MESSAGE_NOISE_1) {
-					bChannelOpen = false;
-					processed = true;
+					bChannelOpen = FALSE;
+					processed = TRUE;
 				}
 			}
 			if (sample == NO_SAMPLE) {
 				if (!processed) cWait = 30;
 			} else {
-				SampleManager.InitialiseChannel(policeChannel, sample, 0);
+				SampleManager.InitialiseChannel(CHANNEL_POLICE_RADIO, sample, SFX_BANK_0);
 				switch (sample) {
 				case SFX_POLICE_RADIO_MESSAGE_NOISE_1:
 					freq = m_anRandomTable[4] % 2000 + 10025;
-					bChannelOpen = bChannelOpen == false;
+					bChannelOpen = bChannelOpen == FALSE;
 					break;
 				default: freq = SampleManager.GetSampleBaseFrequency(sample); break;
 				}
 				PoliceChannelFreq = freq;
-				SampleManager.SetChannelFrequency(policeChannel, freq);
-				SampleManager.SetChannelVolume(policeChannel, 100);
-				SampleManager.SetChannelPan(policeChannel, 63);
-				SampleManager.SetChannelLoopCount(policeChannel, 1);
-				SampleManager.SetChannelLoopPoints(policeChannel, 0, -1);
-				SampleManager.StartChannel(policeChannel);
+				SampleManager.SetChannelFrequency(CHANNEL_POLICE_RADIO, freq);
+				SampleManager.SetChannelVolume(CHANNEL_POLICE_RADIO, 100);
+				SampleManager.SetChannelPan(CHANNEL_POLICE_RADIO, 63);
+				SampleManager.SetChannelLoopCount(CHANNEL_POLICE_RADIO, 1);
+				SampleManager.SetChannelLoopPoints(CHANNEL_POLICE_RADIO, 0, -1);
+				SampleManager.StartChannel(CHANNEL_POLICE_RADIO);
 			}
 			if (processed) ResetPoliceRadio();
 		}
 	}
 }
 
-bool
+bool8
 cAudioManager::SetupCrimeReport()
 {
 	int16 audioZoneId;
@@ -264,13 +268,13 @@ cAudioManager::SetupCrimeReport()
 	float quarterY;
 	int i;
 	int32 sampleIndex;
-	bool processed = false;
+	bool8 processed = FALSE;
 
-	if (MusicManager.m_nMusicMode == MUSICMODE_CUTSCENE) return false;
+	if (MusicManager.m_nMusicMode == MUSICMODE_CUTSCENE) return FALSE;
 
 	if (60 - m_sPoliceRadioQueue.policeChannelTimer <= 9) {
 		AgeCrimes();
-		return true;
+		return TRUE;
 	}
 
 	for (i = 0; i < ARRAY_SIZE(m_sPoliceRadioQueue.crimes); i++) {
@@ -278,7 +282,7 @@ cAudioManager::SetupCrimeReport()
 			break;
 	}
 
-	if (i == ARRAY_SIZE(m_sPoliceRadioQueue.crimes)) return false;
+	if (i == ARRAY_SIZE(m_sPoliceRadioQueue.crimes)) return FALSE;
 	audioZoneId = CTheZones::FindAudioZone(&m_sPoliceRadioQueue.crimes[i].position);
 	if (audioZoneId >= 0 && audioZoneId < NUMAUDIOZONES) {
 		zone = CTheZones::GetAudioZone(audioZoneId);
@@ -303,9 +307,9 @@ cAudioManager::SetupCrimeReport()
 				default: break;
 				}
 #ifdef FIX_BUGS
-				m_sPoliceRadioQueue.Add(m_sPoliceRadioQueue.crimes[i].type + SFX_CRIME_1 - 1);
+				m_sPoliceRadioQueue.Add(m_sPoliceRadioQueue.crimes[i].type + SFX_SFX_CRIME_1 - 1);
 #else
-				m_sPoliceRadioQueue.Add(m_sPoliceRadioQueue.crimes[i].type + SFX_CRIME_1);
+				m_sPoliceRadioQueue.Add(m_sPoliceRadioQueue.crimes[i].type + SFX_SFX_CRIME_1);
 #endif
 				m_sPoliceRadioQueue.Add(SFX_IN);
 				rangeX = zone->maxx - zone->minx;
@@ -317,10 +321,10 @@ cAudioManager::SetupCrimeReport()
 
 				if (m_sPoliceRadioQueue.crimes[i].position.y > halfY + quarterY) {
 					m_sPoliceRadioQueue.Add(SFX_NORTH);
-					processed = true;
+					processed = TRUE;
 				} else if (m_sPoliceRadioQueue.crimes[i].position.y < halfY - quarterY) {
 					m_sPoliceRadioQueue.Add(SFX_SOUTH);
-					processed = true;
+					processed = TRUE;
 				}
 
 				if (m_sPoliceRadioQueue.crimes[i].position.x > halfX + quarterX)
@@ -339,7 +343,7 @@ cAudioManager::SetupCrimeReport()
 	}
 	m_sPoliceRadioQueue.crimes[i].type = CRIME_NONE;
 	AgeCrimes();
-	return true;
+	return TRUE;
 }
 
 void
@@ -354,85 +358,85 @@ cAudioManager::SetupSuspectLastSeenReport()
 	int32 color_post_modifier;
 
 	const int32 gCarColourTable[][3] = {
-		{NO_SAMPLE, SFX_POLICE_RADIO_BLACK, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_WHITE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_RED, NO_SAMPLE},
-		{SFX_POLICE_RADIO_DARK, SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_PURPLE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_YELLOW, NO_SAMPLE},
-		{SFX_POLICE_RADIO_BRIGHT, SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
-		{SFX_POLICE_RADIO_LIGHT, SFX_POLICE_RADIO_BLUE, SFX_POLICE_RADIO_GREY},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_BLACK, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_WHITE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_RED, NO_SAMPLE},
+		{SFX_POLICE_RADIO_DARK, SFX_SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_PURPLE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_YELLOW, NO_SAMPLE},
+		{SFX_POLICE_RADIO_BRIGHT, SFX_SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
+		{SFX_POLICE_RADIO_LIGHT, SFX_SFX_POLICE_RADIO_BLUE, SFX_SFX_POLICE_RADIO_GREY},
 		{SFX_POLICE_RADIO_LIGHT, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
-		{SFX_POLICE_RADIO_DARK, SFX_POLICE_RADIO_RED, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_RED, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_RED, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_RED, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_RED, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_RED, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_RED, NO_SAMPLE},
+		{SFX_POLICE_RADIO_DARK, SFX_SFX_POLICE_RADIO_RED, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_RED, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_RED, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_RED, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_RED, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_RED, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_RED, NO_SAMPLE},
 		{SFX_POLICE_RADIO_LIGHT, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_ORANGE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_ORANGE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_ORANGE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_ORANGE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_ORANGE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_ORANGE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_ORANGE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_ORANGE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_ORANGE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_ORANGE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_ORANGE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_ORANGE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_LIGHT, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_YELLOW, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_YELLOW, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_YELLOW, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_YELLOW, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_YELLOW, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_YELLOW, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_YELLOW, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_YELLOW, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_YELLOW, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_YELLOW, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_YELLOW, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_YELLOW, NO_SAMPLE},
 		{SFX_POLICE_RADIO_LIGHT, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_GREEN, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_GREEN, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_GREEN, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_GREEN, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_GREEN, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_GREEN, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_GREEN, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_GREEN, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_GREEN, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_GREEN, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_GREEN, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_GREEN, NO_SAMPLE},
 		{SFX_POLICE_RADIO_LIGHT, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_BLUE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_LIGHT, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_PURPLE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_PURPLE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_PURPLE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_PURPLE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_PURPLE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_PURPLE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_PURPLE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_PURPLE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_PURPLE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_PURPLE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_PURPLE, NO_SAMPLE},
+		{NO_SAMPLE, SFX_SFX_POLICE_RADIO_PURPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_LIGHT, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_DARK, NO_SAMPLE, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_SILVER, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_SILVER, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_SILVER, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_SILVER, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_SILVER, NO_SAMPLE},
-		{NO_SAMPLE, SFX_POLICE_RADIO_SILVER, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_SILVER, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_SILVER, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_SILVER, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_SILVER, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_SILVER, NO_SAMPLE},
+	    {NO_SAMPLE, SFX_SFX_POLICE_RADIO_SILVER, NO_SAMPLE},
 		{SFX_POLICE_RADIO_LIGHT, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_LIGHT, NO_SAMPLE, NO_SAMPLE},
 		{SFX_POLICE_RADIO_LIGHT, NO_SAMPLE, NO_SAMPLE},
@@ -468,7 +472,7 @@ cAudioManager::SetupSuspectLastSeenReport()
 					case MI_RANCHER:
 					case MI_FBIRANCH:
 					case MI_SANDKING:
-						sample = SFX_POLICE_RADIO_OFFROAD;
+						sample = SFX_SFX_POLICE_RADIO_OFFROAD;
 						break;
 					case MI_IDAHO:
 					case MI_MANANA:
@@ -479,7 +483,7 @@ cAudioManager::SetupSuspectLastSeenReport()
 					case MI_SABRETUR:
 					case MI_VIRGO:
 					case MI_BLISTAC:
-							sample = SFX_POLICE_RADIO_2_DOOR;
+							sample = SFX_SFX_POLICE_RADIO_TUDOOR;
 							break;
 					case MI_STINGER:
 					case MI_INFERNUS:
@@ -489,14 +493,14 @@ cAudioManager::SetupSuspectLastSeenReport()
 					case MI_COMET:
 					case MI_DELUXO:
 					case MI_HOTRING:
-						sample = SFX_POLICE_RADIO_SPORTS_CAR;
+						sample = SFX_SFX_POLICE_RADIO_SPORTS_CAR;
 						break;
 					case MI_LINERUN:
-						sample = SFX_POLICE_RADIO_RIG;
+						sample = SFX_SFX_POLICE_RADIO_RIG;
 						break;
 					case MI_PEREN:
 					case MI_REGINA:
-						sample = SFX_POLICE_RADIO_STATION_WAGON;
+						sample = SFX_SFX_POLICE_RADIO_STATION_WAGON;
 						break;
 					case MI_SENTINEL:
 					case MI_FBICAR:
@@ -507,23 +511,23 @@ cAudioManager::SetupSuspectLastSeenReport()
 					case MI_OCEANIC:
 					case MI_HERMES:
 					case MI_GREENWOO:
-						sample = SFX_POLICE_RADIO_SEDAN;
+						sample = SFX_SFX_POLICE_RADIO_SEDAN;
 						break;
 					case MI_RIO:
-						sample = SFX_POLICE_RADIO_CRUISER;
+						sample = SFX_SFX_POLICE_RADIO_CRUISER;
 						break;
 					case MI_FIRETRUCK:
-						sample = SFX_POLICE_RADIO_FIRE_TRUCK;
+						sample = SFX_SFX_POLICE_RADIO_FIRE_TRUCK;
 						break;
 					case MI_TRASH:
-						sample = SFX_POLICE_RADIO_GARBAGE_TRUCK;
+						sample = SFX_SFX_POLICE_RADIO_GARBAGE_TRUCK;
 						break;
 					case MI_STRETCH:
 					case MI_LOVEFIST:
-						sample = SFX_POLICE_RADIO_STRETCH;
+						sample = SFX_SFX_POLICE_RADIO_STRETCH;
 						break;
 					case MI_VOODOO:
-						sample = SFX_POLICE_RADIO_LOWRIDER;
+						sample = SFX_SFX_POLICE_RADIO_LOWRIDER;
 						break;
 					case MI_PONY:
 					case MI_MOONBEAM:
@@ -534,31 +538,31 @@ cAudioManager::SetupSuspectLastSeenReport()
 					case MI_TOPFUN:
 					case MI_BURRITO:
 					case MI_SPAND:
-						sample = SFX_POLICE_RADIO_VAN;
+						sample = SFX_SFX_POLICE_RADIO_VAN;
 						break;
 					case MI_MULE:
 					case MI_BARRACKS:
 					case MI_PACKER:
 					case MI_FLATBED:
-						sample = SFX_POLICE_RADIO_TRUCK;
+						sample = SFX_SFX_POLICE_RADIO_TRUCK;
 						break;
 					case MI_AMBULAN:
-						sample = SFX_POLICE_RADIO_AMBULANCE;
+						sample = SFX_SFX_POLICE_RADIO_AMBULANCE;
 						break;
 					case MI_TAXI:
 					case MI_CABBIE:
 					case MI_BORGNINE:
-						sample = SFX_POLICE_RADIO_TAXI;
+						sample = SFX_SFX_POLICE_RADIO_TAXI;
 						break;
 					case MI_BOBCAT:
 					case MI_WALTON:
-						sample = SFX_POLICE_RADIO_PICKUP;
+						sample = SFX_SFX_POLICE_RADIO_PICKUP;
 						break;
 					case MI_MRWHOOP:
-						sample = SFX_POLICE_RADIO_ICE_CREAM_VAN;
+						sample = SFX_SFX_POLICE_RADIO_ICE_CREAM_VAN;
 						break;
 					case MI_BFINJECT:
-						sample = SFX_POLICE_RADIO_BUGGY;
+						sample = SFX_SFX_POLICE_RADIO_BUGGY;
 						break;
 					case MI_HUNTER:
 					case MI_CHOPPER:
@@ -567,57 +571,57 @@ cAudioManager::SetupSuspectLastSeenReport()
 					case MI_MAVERICK:
 					case MI_VCNMAV:
 					case MI_POLMAV:
-						sample = SFX_POLICE_RADIO_HELICOPTER;
+						sample = SFX_SFX_POLICE_RADIO_HELICOPTER;
 						break;
 					case MI_POLICE:
-						sample = SFX_POLICE_RADIO_POLICE_CAR;
+						sample = SFX_SFX_POLICE_RADIO_POLICE_CAR;
 						break;
 					case MI_ENFORCER:
-						sample = SFX_POLICE_RADIO_SWAT_VAN;
+						sample = SFX_SFX_POLICE_RADIO_SWAT_VAN;
 						break;
 					case MI_PREDATOR:
 					case MI_SQUALO:
 					case MI_SPEEDER:
-						sample = SFX_POLICE_RADIO_SPEEDBOAT;
+						sample = SFX_SFX_POLICE_RADIO_SPEEDBOAT;
 						break;
 					case MI_BUS:
-						sample = SFX_POLICE_RADIO_BUS;
+						sample = SFX_SFX_POLICE_RADIO_BUS;
 						break;
 					case MI_RHINO:
-						sample = SFX_POLICE_RADIO_TANK;
+						sample = SFX_SFX_POLICE_RADIO_TANK;
 						break;
 					case MI_ANGEL:
 					case MI_PCJ600:
 					case MI_FREEWAY:
 					case MI_SANCHEZ:
-						sample = SFX_POLICE_RADIO_MOTOBIKE;
+						sample = SFX_SFX_POLICE_RADIO_MOTOBIKE;
 						break;
 					case MI_COACH:
-						sample = SFX_POLICE_RADIO_COACH;
+						sample = SFX_SFX_POLICE_RADIO_COACH;
 						break;
 					case MI_ROMERO:
-						sample = SFX_POLICE_RADIO_HEARSE;
+						sample = SFX_SFX_POLICE_RADIO_HEARSE;
 						break;
 					case MI_PIZZABOY:
 					case MI_FAGGIO:
-						sample = SFX_POLICE_RADIO_MOPED;
+						sample = SFX_SFX_POLICE_RADIO_MOPED;
 						break;
 					case MI_DEADDODO:
 					case MI_SKIMMER:
-						sample = SFX_POLICE_RADIO_PLANE;
+						sample = SFX_SFX_POLICE_RADIO_PLANE;
 						break;
 					case MI_REEFER:
 					case MI_TROPIC:
 					case MI_COASTG:
 					case MI_MARQUIS:
 					case MI_JETMAX:
-						sample = SFX_POLICE_RADIO_BOAT;
+						sample = SFX_SFX_POLICE_RADIO_BOAT;
 						break;
 					case MI_CADDY:
-						sample = SFX_POLICE_RADIO_GOLF_CART;
+						sample = SFX_SFX_POLICE_RADIO_GOLF_CART;
 						break;
 					case MI_DINGHY:
-						sample = SFX_POLICE_RADIO_DINGHY;
+						sample = SFX_SFX_POLICE_RADIO_DINGHY;
 						break;
 					default:
 						//debug("\n *** UNKNOWN CAR MODEL INDEX %d *** ", veh->GetModelIndex());
@@ -687,7 +691,7 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 	float quarterX;
 	float quarterY;
 	int32 sample;
-	bool processed = false;
+	bool8 processed = FALSE;
 	CVector vec = CVector(x, y, z);
 
 	if (!m_bIsInitialised) return;
@@ -712,10 +716,10 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 
 					if (vec.y > halfY + quarterY) {
 						m_sPoliceRadioQueue.Add(SFX_NORTH);
-						processed = true;
+						processed = TRUE;
 					} else if (vec.y < halfY - quarterY) {
 						m_sPoliceRadioQueue.Add(SFX_SOUTH);
-						processed = true;
+						processed = TRUE;
 					}
 
 					if (vec.x > halfX + quarterX)
@@ -727,7 +731,7 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 					m_sPoliceRadioQueue.Add(sample);
 					m_sPoliceRadioQueue.Add(SFX_POLICE_RADIO_MESSAGE_NOISE_1);
 					m_sPoliceRadioQueue.Add(NO_SAMPLE);
-					gSpecialSuspectLastSeenReport = true;
+					gSpecialSuspectLastSeenReport = TRUE;
 					break;
 				}
 			}
diff --git a/src/audio/PoliceRadio.h b/src/audio/PolRadio.h
index d7c928e2..d7c928e2 100644
--- a/src/audio/PoliceRadio.h
+++ b/src/audio/PolRadio.h
diff --git a/src/audio/audio_enums.h b/src/audio/audio_enums.h
index b2fb627c..192eafac 100644
--- a/src/audio/audio_enums.h
+++ b/src/audio/audio_enums.h
@@ -14,8 +14,8 @@ enum eRadioStation
 	USERTRACK,
 	NUM_RADIOS = 11,
 	POLICE_RADIO = 11,
+	RADIO_OFF = 10,
 	//TAXI_RADIO,
-	RADIO_OFF,
 };
 
 enum eMusicMode
@@ -137,3 +137,28 @@ enum eAudioType
 	AUDIOTYPE_POLICERADIO,
 	TOTAL_AUDIO_TYPES,
 };
+
+#ifdef GTA_PS2
+enum
+{
+	NUM_CHANNELS_GENERIC = 40,
+	CHANNEL_POLICE_RADIO = NUM_CHANNELS_GENERIC,
+	CHANNEL_MISSION_AUDIO_1,
+	CHANNEL_MISSION_AUDIO_2,
+	CHANNEL_PLAYER_VEHICLE_ENGINE,
+	NUM_CHANNELS
+};
+#else
+enum
+{
+#ifdef PS2_AUDIO_CHANNELS
+	NUM_CHANNELS_GENERIC = 40,
+#else
+	NUM_CHANNELS_GENERIC = 20,
+#endif
+	CHANNEL_POLICE_RADIO,
+	CHANNEL_MISSION_AUDIO_1,
+	CHANNEL_MISSION_AUDIO_2,
+	NUM_CHANNELS
+};
+#endif
diff --git a/src/audio/oal/aldlist.cpp b/src/audio/oal/aldlist.cpp
index 881418c1..6024adf2 100644
--- a/src/audio/oal/aldlist.cpp
+++ b/src/audio/oal/aldlist.cpp
@@ -24,12 +24,6 @@
 
 #include "aldlist.h"
 
-#ifndef _WIN32
-#define _stricmp strcasecmp
-#define _strnicmp strncasecmp
-#define _strdup strdup
-#endif
-
 #ifdef AUDIO_OAL
 /* 
  * Init call
@@ -47,8 +41,8 @@ ALDeviceList::ALDeviceList()
 	defaultDeviceIndex = 0;
 
 	if (alcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT")) {
-		devices = (char *)alcGetString(NULL, ALC_DEVICE_SPECIFIER);
-		defaultDeviceName = (char *)alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
+		devices = (char *)alcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER);
+		defaultDeviceName = (char *)alcGetString(NULL, ALC_DEFAULT_ALL_DEVICES_SPECIFIER);
 		
 		index = 0;
 		// go through device list (each device terminated with a single NULL, list terminated with double NULL)
@@ -62,17 +56,11 @@ ALDeviceList::ALDeviceList()
 				if (context) {
 					alcMakeContextCurrent(context);
 					// if new actual device name isn't already in the list, then add it...
-					actualDeviceName = alcGetString(device, ALC_DEVICE_SPECIFIER);
-					bool bNewName = true;
-					for (unsigned int i = 0; i < GetNumDevices(); i++) {
-						if (strcmp(GetDeviceName(i), actualDeviceName) == 0) {
-							bNewName = false;
-						}
-					}
-					if ((bNewName) && (actualDeviceName != NULL) && (strlen(actualDeviceName) > 0)) {
-						ALDEVICEINFO ALDeviceInfo;
+					actualDeviceName = alcGetString(device, ALC_ALL_DEVICES_SPECIFIER);
+					if ((actualDeviceName != NULL) && (strlen(actualDeviceName) > 0)) {
+						ALDEVICEINFO &ALDeviceInfo = aDeviceInfo[nNumOfDevices++];
 						ALDeviceInfo.bSelected = true;
-						ALDeviceInfo.strDeviceName = _strdup(actualDeviceName);
+						ALDeviceInfo.SetName(actualDeviceName);
 						alcGetIntegerv(device, ALC_MAJOR_VERSION, sizeof(int), &ALDeviceInfo.iMajorVersion);
 						alcGetIntegerv(device, ALC_MINOR_VERSION, sizeof(int), &ALDeviceInfo.iMinorVersion);
 
@@ -105,8 +93,6 @@ ALDeviceList::ALDeviceList()
 
 						// Get Source Count
 						ALDeviceInfo.uiSourceCount = GetMaxNumSources();
-
-						aDeviceInfo[nNumOfDevices++] = ALDeviceInfo;
 					}
 					alcMakeContextCurrent(NULL);
 					alcDestroyContext(context);
diff --git a/src/audio/oal/aldlist.h b/src/audio/oal/aldlist.h
index 417bd314..bebb6791 100644
--- a/src/audio/oal/aldlist.h
+++ b/src/audio/oal/aldlist.h
@@ -21,7 +21,7 @@ enum
 };
 
 struct ALDEVICEINFO {
-	const char		*strDeviceName;
+	char		   *strDeviceName;
 	int				iMajorVersion;
 	int				iMinorVersion;
 	unsigned int	uiSourceCount;
@@ -33,6 +33,19 @@ struct ALDEVICEINFO {
 		strDeviceName = NULL;
 		Extensions = 0;
 	}
+
+	~ALDEVICEINFO()
+	{
+		delete[] strDeviceName;
+		strDeviceName = NULL;
+	} 
+
+	void SetName(const char *name)
+	{
+		if(strDeviceName) delete[] strDeviceName;
+		strDeviceName = new char[strlen(name) + 1];
+		strcpy(strDeviceName, name);
+	}
 };
 
 typedef ALDEVICEINFO *LPALDEVICEINFO;
diff --git a/src/audio/oal/channel.cpp b/src/audio/oal/channel.cpp
index 673a4aed..04e7e529 100644
--- a/src/audio/oal/channel.cpp
+++ b/src/audio/oal/channel.cpp
@@ -10,18 +10,22 @@
 
 extern bool IsFXSupported();
 
-ALuint alSources[MAXCHANNELS+MAX2DCHANNELS];
-ALuint alFilters[MAXCHANNELS+MAX2DCHANNELS];
-ALuint alBuffers[MAXCHANNELS+MAX2DCHANNELS];
+ALuint alSources[NUM_CHANNELS];
+ALuint alFilters[NUM_CHANNELS];
+ALuint alBuffers[NUM_CHANNELS];
 bool bChannelsCreated = false;
 
+int32 CChannel::channelsThatNeedService = 0;
+
+uint8 tempStereoBuffer[PED_BLOCKSIZE * 2];
+
 void
 CChannel::InitChannels()
 {
-	alGenSources(MAXCHANNELS+MAX2DCHANNELS, alSources);
-	alGenBuffers(MAXCHANNELS+MAX2DCHANNELS, alBuffers);
+	alGenSources(NUM_CHANNELS, alSources);
+	alGenBuffers(NUM_CHANNELS, alBuffers);
 	if (IsFXSupported())
-		alGenFilters(MAXCHANNELS + MAX2DCHANNELS, alFilters);
+		alGenFilters(NUM_CHANNELS, alFilters);
 	bChannelsCreated = true;
 }
 
@@ -30,13 +34,13 @@ CChannel::DestroyChannels()
 {
 	if (bChannelsCreated) 
 	{
-		alDeleteSources(MAXCHANNELS + MAX2DCHANNELS, alSources);
+		alDeleteSources(NUM_CHANNELS, alSources);
 		memset(alSources, 0, sizeof(alSources));
-		alDeleteBuffers(MAXCHANNELS + MAX2DCHANNELS, alBuffers);
+		alDeleteBuffers(NUM_CHANNELS, alBuffers);
 		memset(alBuffers, 0, sizeof(alBuffers));
 		if (IsFXSupported())
 		{
-			alDeleteFilters(MAXCHANNELS + MAX2DCHANNELS, alFilters);
+			alDeleteFilters(NUM_CHANNELS, alFilters);
 			memset(alFilters, 0, sizeof(alFilters));
 		}
 		bChannelsCreated = false;
@@ -48,6 +52,7 @@ CChannel::CChannel()
 {
 	Data = nil;
 	DataSize = 0;
+	bIs2D = false;
 	SetDefault();
 }
 
@@ -59,7 +64,9 @@ void CChannel::SetDefault()
 		
 	Position[0] = 0.0f; Position[1] = 0.0f; Position[2] = 0.0f;
 	Distances[0] = 0.0f; Distances[1] = FLT_MAX;
-	LoopCount  = 1;
+
+	LoopCount = 1;
+	LastProcessedOffset = UINT32_MAX;
 	LoopPoints[0] = 0; LoopPoints[1] = -1;
 	
 	Frequency = MAX_FREQ;
@@ -67,6 +74,10 @@ void CChannel::SetDefault()
 
 void CChannel::Reset()
 {
+	// Here is safe because ctor don't call this
+	if (LoopCount > 1)
+		channelsThatNeedService--;
+
 	ClearBuffer();
 	SetDefault();
 }
@@ -82,6 +93,7 @@ void CChannel::Init(uint32 _id, bool Is2D)
 		
 		if ( Is2D )
 		{
+			bIs2D = true;
 			alSource3f(alSources[id], AL_POSITION, 0.0f, 0.0f, 0.0f);
 			alSourcef(alSources[id], AL_GAIN, 1.0f);
 		}
@@ -105,7 +117,20 @@ void CChannel::Start()
 	if ( !HasSource() ) return;
 	if ( !Data ) return;
 
-	alBufferData(alBuffers[id], AL_FORMAT_MONO16, Data, DataSize, Frequency);
+	if ( bIs2D )
+	{
+		// convert mono data to stereo
+		int16 *monoData = (int16*)Data;
+		int16 *stereoData = (int16*)tempStereoBuffer;
+		for (size_t i = 0; i < DataSize / 2; i++)
+		{
+			*(stereoData++) = *monoData;
+			*(stereoData++) = *(monoData++);
+		}
+		alBufferData(alBuffers[id], AL_FORMAT_STEREO16, tempStereoBuffer, DataSize * 2, Frequency);
+	}
+	else
+		alBufferData(alBuffers[id], AL_FORMAT_MONO16, Data, DataSize, Frequency);
 	if ( LoopPoints[0] != 0 && LoopPoints[0] != -1 )
 		alBufferiv(alBuffers[id], AL_LOOP_POINTS_SOFT, LoopPoints);
 	alSourcei(alSources[id], AL_BUFFER, alBuffers[id]);
@@ -165,10 +190,51 @@ void CChannel::SetCurrentFreq(uint32 freq)
 	SetPitch(ALfloat(freq) / Frequency);
 }
 
-void CChannel::SetLoopCount(int32 loopCount) // fake. TODO:
+void CChannel::SetLoopCount(int32 count)
 {
 	if ( !HasSource() ) return;
-	alSourcei(alSources[id], AL_LOOPING, loopCount == 1 ? AL_FALSE : AL_TRUE);
+
+	// 0: loop indefinitely, 1: play one time, 2: play two times etc...
+	// only > 1 needs manual processing
+
+	if (LoopCount > 1 && count < 2)
+		channelsThatNeedService--;
+	else if (LoopCount < 2 && count > 1)
+		channelsThatNeedService++;
+
+	alSourcei(alSources[id], AL_LOOPING, count == 1 ? AL_FALSE : AL_TRUE);
+	LoopCount = count;
+}
+
+bool CChannel::Update()
+{
+	if (!HasSource()) return false;
+	if (LoopCount < 2) return false;
+
+	ALint state;
+	alGetSourcei(alSources[id], AL_SOURCE_STATE, &state);
+	if (state == AL_STOPPED) {
+		debug("Looping channels(%d in this case) shouldn't report AL_STOPPED, but nvm\n", id);
+		SetLoopCount(1);
+		return true;
+	}
+
+	assert(channelsThatNeedService > 0 && "Ref counting is broken");
+
+	ALint offset;
+	alGetSourcei(alSources[id], AL_SAMPLE_OFFSET, &offset);
+
+	// Rewound
+	if (offset < LastProcessedOffset) {
+		LoopCount--;
+		if (LoopCount == 1) {
+			// Playing last tune...
+			channelsThatNeedService--;
+			alSourcei(alSources[id], AL_LOOPING, AL_FALSE);
+		}
+	}
+	LastProcessedOffset = offset;
+	return true;
 }
 
 void CChannel::SetLoopPoints(ALint start, ALint end)
@@ -200,6 +266,7 @@ void CChannel::SetPan(int32 pan)
 void CChannel::ClearBuffer()
 {
 	if ( !HasSource() ) return;
+	alSourcei(alSources[id], AL_LOOPING, AL_FALSE);
 	alSourcei(alSources[id], AL_BUFFER, AL_NONE);
 	Data = nil;
 	DataSize = 0;
diff --git a/src/audio/oal/channel.h b/src/audio/oal/channel.h
index 81817a32..872646c8 100644
--- a/src/audio/oal/channel.h
+++ b/src/audio/oal/channel.h
@@ -19,7 +19,11 @@ class CChannel
 	float  Distances[2];
 	int32  LoopCount;
 	ALint  LoopPoints[2];
+	ALint  LastProcessedOffset;
+	bool   bIs2D;
 public:
+	static int32 channelsThatNeedService;
+
 	static void InitChannels();
 	static void DestroyChannels();
 
@@ -37,7 +41,7 @@ public:
 	void SetVolume(int32 vol);
 	void SetSampleData(void *_data, size_t _DataSize, int32 freq);
 	void SetCurrentFreq(uint32 freq);
-	void SetLoopCount(int32 loopCount); // fake
+	void SetLoopCount(int32 count);
 	void SetLoopPoints(ALint start, ALint end);
 	void SetPosition(float x, float y, float z);
 	void SetDistances(float max, float min);
@@ -45,6 +49,7 @@ public:
 	void ClearBuffer();
 	void SetReverbMix(ALuint slot, float mix);
 	void UpdateReverb(ALuint slot);
+	bool Update();
 };
 
 #endif
\ No newline at end of file
diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp
index 19fa4ec4..ed73e940 100644
--- a/src/audio/oal/stream.cpp
+++ b/src/audio/oal/stream.cpp
@@ -464,8 +464,8 @@ public:
 #endif
 
 #ifdef AUDIO_OAL_USE_MPG123
-// fuzzy seek eliminates stutter when playing ADF but spams errors a lot (nothing breaks though)
-#define MP3_USE_FUZZY_SEEK
+// fuzzy seek eliminates stutter when playing ADF but spams errors a lot (and breaks radio sometimes)
+//#define MP3_USE_FUZZY_SEEK
 
 class CMP3File : public IDecoder
 {
@@ -492,6 +492,8 @@ public:
 		{
 #ifdef MP3_USE_FUZZY_SEEK
 			mpg123_param(m_pMH, MPG123_FLAGS, MPG123_FUZZY | MPG123_SEEKBUFFER | MPG123_GAPLESS | MPG123_QUIET, 0.0);
+#else
+			mpg123_param(m_pMH, MPG123_FLAGS, MPG123_SEEKBUFFER | MPG123_GAPLESS, 0.0);
 #endif
 			long rate = 0;
 			int channels = 0;
@@ -499,6 +501,7 @@ public:
 			
 			m_bOpened = mpg123_open(m_pMH, path) == MPG123_OK
 				&& mpg123_getformat(m_pMH, &rate, &channels, &encoding) == MPG123_OK;
+
 			m_nRate = rate;
 			m_nChannels = channels;
 			
@@ -601,6 +604,8 @@ public:
 		{
 #ifdef MP3_USE_FUZZY_SEEK
 			mpg123_param(m_pMH, MPG123_FLAGS, MPG123_FUZZY | MPG123_SEEKBUFFER | MPG123_GAPLESS | MPG123_QUIET, 0.0);
+#else
+			mpg123_param(m_pMH, MPG123_FLAGS, MPG123_SEEKBUFFER | MPG123_GAPLESS, 0.0);
 #endif
 			long rate = 0;
 			int channels = 0;
@@ -980,7 +985,8 @@ CStream::CStream(char *filename, ALuint *sources, ALuint (&buffers)[NUM_STREAMBU
 	m_bReset(false),
 	m_nVolume(0),
 	m_nPan(0),
-	m_nPosBeforeReset(0)
+	m_nPosBeforeReset(0),
+	m_nLoopCount(1)
 	
 {
 // Be case-insensitive on linux (from https://github.com/OneSadCookie/fcaseopen/)
@@ -1078,7 +1084,7 @@ bool CStream::IsPlaying()
 		ALint sourceState[2];
 		alGetSourcei(m_pAlSources[0], AL_SOURCE_STATE, &sourceState[0]);
 		alGetSourcei(m_pAlSources[1], AL_SOURCE_STATE, &sourceState[1]);
-		if ( m_bActive || sourceState[0] == AL_PLAYING || sourceState[1] == AL_PLAYING)
+		if (sourceState[0] == AL_PLAYING || sourceState[1] == AL_PLAYING)
 			return true;
 	}
 	
@@ -1150,6 +1156,7 @@ void CStream::SetPan(uint8 nPan)
 	m_nPan = nPan;
 }
 
+// Should only be called if source is stopped
 void CStream::SetPosMS(uint32 nPos)
 {
 	if ( !IsOpened() ) return;
@@ -1232,10 +1239,16 @@ void CStream::ClearBuffers()
 		alSourceUnqueueBuffers(m_pAlSources[1], 1, &value);
 }
 
-bool CStream::Setup()
+bool CStream::Setup(bool imSureQueueIsEmpty)
 {
 	if ( IsOpened() )
 	{
+		alSourcei(m_pAlSources[0], AL_LOOPING, AL_FALSE);
+		alSourcei(m_pAlSources[1], AL_LOOPING, AL_FALSE);
+		if (!imSureQueueIsEmpty) {
+			SetPlay(false);
+			ClearBuffers();
+		}
 		m_pSoundFile->Seek(0);
 		//SetPosition(0.0f, 0.0f, 0.0f);
 		SetPitch(1.0f);
@@ -1246,6 +1259,13 @@ bool CStream::Setup()
 	return IsOpened();
 }
 
+void CStream::SetLoopCount(int32 count)
+{
+	if ( !HasSource() ) return;
+
+	m_nLoopCount = count;
+}
+
 void CStream::SetPlay(bool state)
 {
 	if ( !HasSource() ) return;
@@ -1305,7 +1325,7 @@ void CStream::Update()
 	
 	if ( !m_bPaused )
 	{
-		ALint sourceState[2];
+		ALint totalBuffers[2] = { 0, 0 };
 		ALint buffersProcessed[2] = { 0, 0 };
 		
 		// Relying a lot on left buffer states in here
@@ -1313,44 +1333,51 @@ void CStream::Update()
 		do
 		{
 			//alSourcef(m_pAlSources[0], AL_ROLLOFF_FACTOR, 0.0f);
-			alGetSourcei(m_pAlSources[0], AL_SOURCE_STATE, &sourceState[0]);
+			alGetSourcei(m_pAlSources[0], AL_BUFFERS_QUEUED, &totalBuffers[0]);
 			alGetSourcei(m_pAlSources[0], AL_BUFFERS_PROCESSED, &buffersProcessed[0]);
 			//alSourcef(m_pAlSources[1], AL_ROLLOFF_FACTOR, 0.0f);
-			alGetSourcei(m_pAlSources[1], AL_SOURCE_STATE, &sourceState[1]);
+			alGetSourcei(m_pAlSources[1], AL_BUFFERS_QUEUED, &totalBuffers[1]);
 			alGetSourcei(m_pAlSources[1], AL_BUFFERS_PROCESSED, &buffersProcessed[1]);
 		} while (buffersProcessed[0] != buffersProcessed[1]);
 		
-		ALint looping = AL_FALSE;
-		alGetSourcei(m_pAlSources[0], AL_LOOPING, &looping);
-		
-		if ( looping == AL_TRUE )
-		{
-			TRACE("stream set looping");
-			alSourcei(m_pAlSources[0], AL_LOOPING, AL_TRUE);
-			alSourcei(m_pAlSources[1], AL_LOOPING, AL_TRUE);
-		}
-		
 		assert(buffersProcessed[0] == buffersProcessed[1]);
 
-		while( buffersProcessed[0]-- )
+		// Correcting OpenAL concepts here:
+		// AL_BUFFERS_QUEUED = Number of *all* buffers in queue, including processed, processing and pending
+		// AL_BUFFERS_PROCESSED = Index of the buffer being processing right now. Buffers coming after that(have greater index) are pending buffers.
+		// which means: totalBuffers[0] - buffersProcessed[0] = pending buffers
+
+		bool buffersRefilled = false;
+
+		// We should wait queue to be cleared to loop track, because position calculation relies on queue.
+		if (m_nLoopCount != 1 && m_bActive && totalBuffers[0] == 0)
 		{
-			ALuint buffer[2];
-			
-			alSourceUnqueueBuffers(m_pAlSources[0], 1, &buffer[0]);
-			alSourceUnqueueBuffers(m_pAlSources[1], 1, &buffer[1]);
-			
-			if (m_bActive && FillBuffer(buffer))
-			{
-				alSourceQueueBuffers(m_pAlSources[0], 1, &buffer[0]);
-				alSourceQueueBuffers(m_pAlSources[1], 1, &buffer[1]);
-			}
+			Setup(true);
+			buffersRefilled = FillBuffers() != 0;
+			if (m_nLoopCount != 0)
+				m_nLoopCount--;
 		}
-		
-		if ( sourceState[0] != AL_PLAYING )
+		else
 		{
-			alGetSourcei(m_pAlSources[0], AL_BUFFERS_PROCESSED, &buffersProcessed[0]);
-			SetPlay(buffersProcessed[0]!=0);
+			while( buffersProcessed[0]-- )
+			{
+				ALuint buffer[2];
+				
+				alSourceUnqueueBuffers(m_pAlSources[0], 1, &buffer[0]);
+				alSourceUnqueueBuffers(m_pAlSources[1], 1, &buffer[1]);
+				
+				if (m_bActive && FillBuffer(buffer))
+				{
+					buffersRefilled = true;
+					alSourceQueueBuffers(m_pAlSources[0], 1, &buffer[0]);
+					alSourceQueueBuffers(m_pAlSources[1], 1, &buffer[1]);
+				}
+			}
 		}
+
+		// Two reasons: 1-Source may be starved to audio and stopped itself, 2- We're already waiting it to starve and die for looping track!
+		if (m_bActive && (buffersRefilled || (totalBuffers[1] - buffersProcessed[1] != 0)))
+			SetPlay(true);
 	}
 }
 
@@ -1358,10 +1385,11 @@ void CStream::ProviderInit()
 {
 	if ( m_bReset )
 	{
-		if ( Setup() )
+		if ( Setup(true) )
 		{
 			SetPan(m_nPan);
 			SetVolume(m_nVolume);
+			SetLoopCount(m_nLoopCount);
 			SetPosMS(m_nPosBeforeReset);
 			if (m_bActive)
 				FillBuffers();
diff --git a/src/audio/oal/stream.h b/src/audio/oal/stream.h
index bcbc5e54..9a2a2fbe 100644
--- a/src/audio/oal/stream.h
+++ b/src/audio/oal/stream.h
@@ -69,6 +69,7 @@ class CStream
 	uint32   m_nVolume;
 	uint8    m_nPan;
 	uint32   m_nPosBeforeReset;
+	int32   m_nLoopCount;
 	
 	IDecoder *m_pSoundFile;
 	
@@ -99,10 +100,12 @@ public:
 	uint32 GetPosMS();
 	uint32 GetLengthMS();
 	
-	bool Setup();
+	bool Setup(bool imSureQueueIsEmpty = false);
 	void Start();
 	void Stop();
 	void Update(void);
+	void SetLoopCount(int32);
+
 	
 	void ProviderInit();
 	void ProviderTerm();
diff --git a/src/audio/sampman.h b/src/audio/sampman.h
index 697a7aa8..cc73e5c2 100644
--- a/src/audio/sampman.h
+++ b/src/audio/sampman.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "AudioSamples.h"
+#include "audio_enums.h"
 
 #define MAX_VOLUME 127
 #define MAX_FREQ DIGITALRATE
@@ -111,22 +112,29 @@ enum
 #endif
 };
 #define MAX_PEDSFX                 7
-#define PED_BLOCKSIZE              79000
+#define PED_BLOCKSIZE              160000
 
 #define MAXPROVIDERS               64
 
-#define MAXCHANNELS                28
-#define MAXCHANNELS_SURROUND       24
-#define MAX2DCHANNELS              1
-#define CHANNEL2D                  MAXCHANNELS
+#define MAXCHANNELS                (NUM_CHANNELS_GENERIC+1)
+#define MAXCHANNELS_SURROUND       (MAXCHANNELS-4)
+#define MAX2DCHANNELS              3
 
-#define MAX_STREAMS                3
+#define MAX_STREAMS                1
 
 #define DIGITALRATE                32000
 #define DIGITALBITS                16
 #define DIGITALCHANNELS            2
 
-#define MAX_DIGITAL_MIXER_CHANNELS 32
+#ifdef FIX_BUGS
+#define MAX_DIGITAL_MIXER_CHANNELS (MAXCHANNELS+MAX_STREAMS*2+MAX2DCHANNELS)
+#else
+#define MAX_DIGITAL_MIXER_CHANNELS (MAXCHANNELS+MAX_STREAMS*2)
+#endif 
+
+static_assert( NUM_CHANNELS == MAXCHANNELS + MAX2DCHANNELS, "The number of channels doesn't match with an enum" );
+
+extern int gBankStartOffset[67];
 
 class cSampleManager
 {
@@ -135,9 +143,9 @@ class cSampleManager
 	uint8   m_nMP3BoostVolume;
 	uint8   m_nEffectsFadeVolume;
 	uint8   m_nMusicFadeVolume;
-	uint8   m_nMonoMode;
+	bool8   m_nMonoMode;
 	char    m_szCDRomRootPath[80];
-	bool    m_bInitialised;
+	bool8   m_bInitialised;
 	uint8   m_nNumberOfProviders;
 	char   *m_aAudioProviders[MAXPROVIDERS];
 	tSample m_aSamples[TOTAL_AUDIO_SAMPLES];
@@ -167,16 +175,16 @@ public:
 
 	int8 AutoDetect3DProviders();
 	
-	bool IsMP3RadioChannelAvailable(void);
+	bool8 IsMP3RadioChannelAvailable(void);
 	
 	void ReleaseDigitalHandle  (void);
 	void ReacquireDigitalHandle(void);
 	
-	bool Initialise(void);
-	void Terminate (void);
+	bool8 Initialise(void);
+	void  Terminate (void);
 		
-	bool CheckForAnAudioFileOnCD(void);
-	char GetCDAudioDriveLetter  (void);
+	bool8 CheckForAnAudioFileOnCD(void);
+	char  GetCDAudioDriveLetter  (void);
 	
 	void UpdateEffectsVolume(void);
 
@@ -185,14 +193,14 @@ public:
 	void SetMP3BoostVolume     (uint8 nVolume);
 	void SetEffectsFadeVolume  (uint8 nVolume);
 	void SetMusicFadeVolume    (uint8 nVolume);
-	void SetMonoMode           (uint8 nMode);
+	void SetMonoMode           (bool8 nMode);
 	
-	bool LoadSampleBank    (uint8 nBank);
-	void UnloadSampleBank  (uint8 nBank);
-	bool IsSampleBankLoaded(uint8 nBank);
+	bool8 LoadSampleBank    (uint8 nBank);
+	void  UnloadSampleBank  (uint8 nBank);
+	bool8 IsSampleBankLoaded(uint8 nBank);
 	
-	bool IsPedCommentLoaded(uint32 nComment);
-	bool LoadPedComment    (uint32 nComment);
+	bool8 IsPedCommentLoaded(uint32 nComment);
+	bool8 LoadPedComment    (uint32 nComment);
 	int32 GetBankContainingSound(uint32 offset);
 
 	int32 _GetPedCommentSlot(uint32 nComment);
@@ -202,10 +210,10 @@ public:
 	int32  GetSampleLoopEndOffset  (uint32 nSample);
 	uint32 GetSampleLength         (uint32 nSample);
 	
-	bool  UpdateReverb(void);
+	bool8  UpdateReverb(void);
 	
-	void  SetChannelReverbFlag    (uint32 nChannel, uint8 nReverbFlag);
-	bool  InitialiseChannel       (uint32 nChannel, uint32 nSfx, uint8 nBank);
+	void  SetChannelReverbFlag    (uint32 nChannel, bool8 nReverbFlag);
+	bool8 InitialiseChannel       (uint32 nChannel, uint32 nSfx, uint8 nBank);
 	void  SetChannelEmittingVolume(uint32 nChannel, uint32 nVolume);
 	void  SetChannel3DPosition    (uint32 nChannel, float fX, float fY, float fZ);
 	void  SetChannel3DDistances   (uint32 nChannel, float fMax, float fMin);
@@ -214,241 +222,96 @@ public:
 	void  SetChannelFrequency     (uint32 nChannel, uint32 nFreq);
 	void  SetChannelLoopPoints    (uint32 nChannel, uint32 nLoopStart, int32 nLoopEnd);
 	void  SetChannelLoopCount     (uint32 nChannel, uint32 nLoopCount);
-	bool  GetChannelUsedFlag      (uint32 nChannel);
+	bool8 GetChannelUsedFlag      (uint32 nChannel);
 	void  StartChannel            (uint32 nChannel);
 	void  StopChannel             (uint32 nChannel);
 	
-	void  PreloadStreamedFile                                    (uint32 nFile, uint8 nStream);
-	void  PauseStream                                        (uint8 nPauseFlag, uint8 nStream);
-	void  StartPreloadedStreamedFile                                           (uint8 nStream);
-	bool  StartStreamedFile                         (uint32 nFile, uint32 nPos, uint8 nStream);
-	void  StopStreamedFile                                                     (uint8 nStream);
-	int32 GetStreamedFilePosition                                              (uint8 nStream);
-	void  SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, uint8 nEffectFlag, uint8 nStream);
-	int32 GetStreamedFileLength                                                (uint8 nStream);
-	bool  IsStreamPlaying                                                      (uint8 nStream);
+	void  PreloadStreamedFile                                    (uint32 nFile, uint8 nStream = 0);
+	void  PauseStream                                        (bool8 nPauseFlag, uint8 nStream = 0);
+	void  StartPreloadedStreamedFile                                           (uint8 nStream = 0);
+	bool8 StartStreamedFile                         (uint32 nFile, uint32 nPos, uint8 nStream = 0);
+	void  StopStreamedFile                                                     (uint8 nStream = 0);
+	int32 GetStreamedFilePosition                                              (uint8 nStream = 0);
+	void  SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, bool8 nEffectFlag, uint8 nStream = 0);
+	int32 GetStreamedFileLength                                                (uint8 nStream = 0);
+	bool8 IsStreamPlaying                                                      (uint8 nStream = 0);
+	void  SetStreamedFileLoopFlag                             (bool8 nLoopFlag, uint8 nStream = 0);
 #ifdef AUDIO_OAL
 	void  Service(void);
 #endif
-	bool  InitialiseSampleBanks(void);
+	bool8 InitialiseSampleBanks(void);
 
 	uint8 GetMusicVolume() const { return m_nMusicVolume;  }
-	void SetStreamedFileLoopFlag(uint8 nLoopFlag, uint8 nStream);
 };
 
 extern cSampleManager SampleManager;
 extern uint32 BankStartOffset[MAX_SFX_BANKS];
 
-#if defined(OPUS_AUDIO_PATHS)
-static char StreamedNameTable[][25] = {
-    "AUDIO\\HEAD.OPUS",    "AUDIO\\CLASS.OPUS",   "AUDIO\\KJAH.OPUS",    "AUDIO\\RISE.OPUS",    "AUDIO\\LIPS.OPUS",    "AUDIO\\GAME.OPUS",
-    "AUDIO\\MSX.OPUS",     "AUDIO\\FLASH.OPUS",   "AUDIO\\CHAT.OPUS",    "AUDIO\\HEAD.OPUS",    "AUDIO\\POLICE.OPUS",  "AUDIO\\CITY.OPUS",
-    "AUDIO\\WATER.OPUS",   "AUDIO\\COMOPEN.OPUS", "AUDIO\\SUBOPEN.OPUS", "AUDIO\\JB.OPUS",      "AUDIO\\BET.OPUS",     "AUDIO\\L1_LG.OPUS",
-    "AUDIO\\L2_DSB.OPUS",  "AUDIO\\L3_DM.OPUS",   "AUDIO\\L4_PAP.OPUS",  "AUDIO\\L5_TFB.OPUS",  "AUDIO\\J0_DM2.OPUS",  "AUDIO\\J1_LFL.OPUS",
-    "AUDIO\\J2_KCL.OPUS",  "AUDIO\\J3_VH.OPUS",   "AUDIO\\J4_ETH.OPUS",  "AUDIO\\J5_DST.OPUS",  "AUDIO\\J6_TBJ.OPUS",  "AUDIO\\T1_TOL.OPUS",
-    "AUDIO\\T2_TPU.OPUS",  "AUDIO\\T3_MAS.OPUS",  "AUDIO\\T4_TAT.OPUS",  "AUDIO\\T5_BF.OPUS",   "AUDIO\\S0_MAS.OPUS",  "AUDIO\\S1_PF.OPUS",
-    "AUDIO\\S2_CTG.OPUS",  "AUDIO\\S3_RTC.OPUS",  "AUDIO\\S5_LRQ.OPUS",  "AUDIO\\S4_BDBA.OPUS", "AUDIO\\S4_BDBB.OPUS", "AUDIO\\S2_CTG2.OPUS",
-    "AUDIO\\S4_BDBD.OPUS", "AUDIO\\S5_LRQB.OPUS", "AUDIO\\S5_LRQC.OPUS", "AUDIO\\A1_SSO.OPUS",  "AUDIO\\A2_PP.OPUS",   "AUDIO\\A3_SS.OPUS",
-    "AUDIO\\A4_PDR.OPUS",  "AUDIO\\A5_K2FT.OPUS", "AUDIO\\K1_KBO.OPUS",  "AUDIO\\K2_GIS.OPUS",  "AUDIO\\K3_DS.OPUS",   "AUDIO\\K4_SHI.OPUS",
-    "AUDIO\\K5_SD.OPUS",   "AUDIO\\R0_PDR2.OPUS", "AUDIO\\R1_SW.OPUS",   "AUDIO\\R2_AP.OPUS",   "AUDIO\\R3_ED.OPUS",   "AUDIO\\R4_GF.OPUS",
-    "AUDIO\\R5_PB.OPUS",   "AUDIO\\R6_MM.OPUS",   "AUDIO\\D1_STOG.OPUS", "AUDIO\\D2_KK.OPUS",   "AUDIO\\D3_ADO.OPUS",  "AUDIO\\D5_ES.OPUS",
-    "AUDIO\\D7_MLD.OPUS",  "AUDIO\\D4_GTA.OPUS",  "AUDIO\\D4_GTA2.OPUS", "AUDIO\\D6_STS.OPUS",  "AUDIO\\A6_BAIT.OPUS", "AUDIO\\A7_ETG.OPUS",
-    "AUDIO\\A8_PS.OPUS",   "AUDIO\\A9_ASD.OPUS",  "AUDIO\\K4_SHI2.OPUS", "AUDIO\\C1_TEX.OPUS",  "AUDIO\\EL_PH1.OPUS",  "AUDIO\\EL_PH2.OPUS",
-    "AUDIO\\EL_PH3.OPUS",  "AUDIO\\EL_PH4.OPUS",  "AUDIO\\YD_PH1.OPUS",  "AUDIO\\YD_PH2.OPUS",  "AUDIO\\YD_PH3.OPUS",  "AUDIO\\YD_PH4.OPUS",
-    "AUDIO\\HD_PH1.OPUS",  "AUDIO\\HD_PH2.OPUS",  "AUDIO\\HD_PH3.OPUS",  "AUDIO\\HD_PH4.OPUS",  "AUDIO\\HD_PH5.OPUS",  "AUDIO\\MT_PH1.OPUS",
-    "AUDIO\\MT_PH2.OPUS",  "AUDIO\\MT_PH3.OPUS",  "AUDIO\\MT_PH4.OPUS",  "AUDIO\\MISCOM.OPUS",  "AUDIO\\END.OPUS",     "AUDIO\\lib_a1.OPUS",
-    "AUDIO\\lib_a2.OPUS",  "AUDIO\\lib_a.OPUS",   "AUDIO\\lib_b.OPUS",   "AUDIO\\lib_c.OPUS",   "AUDIO\\lib_d.OPUS",   "AUDIO\\l2_a.OPUS",
-    "AUDIO\\j4t_1.OPUS",   "AUDIO\\j4t_2.OPUS",   "AUDIO\\j4t_3.OPUS",   "AUDIO\\j4t_4.OPUS",   "AUDIO\\j4_a.OPUS",    "AUDIO\\j4_b.OPUS",
-    "AUDIO\\j4_c.OPUS",    "AUDIO\\j4_d.OPUS",    "AUDIO\\j4_e.OPUS",    "AUDIO\\j4_f.OPUS",    "AUDIO\\j6_1.OPUS",    "AUDIO\\j6_a.OPUS",
-    "AUDIO\\j6_b.OPUS",    "AUDIO\\j6_c.OPUS",    "AUDIO\\j6_d.OPUS",    "AUDIO\\t4_a.OPUS",    "AUDIO\\s1_a.OPUS",    "AUDIO\\s1_a1.OPUS",
-    "AUDIO\\s1_b.OPUS",    "AUDIO\\s1_c.OPUS",    "AUDIO\\s1_c1.OPUS",   "AUDIO\\s1_d.OPUS",    "AUDIO\\s1_e.OPUS",    "AUDIO\\s1_f.OPUS",
-    "AUDIO\\s1_g.OPUS",    "AUDIO\\s1_h.OPUS",    "AUDIO\\s1_i.OPUS",    "AUDIO\\s1_j.OPUS",    "AUDIO\\s1_k.OPUS",    "AUDIO\\s1_l.OPUS",
-    "AUDIO\\s3_a.OPUS",    "AUDIO\\s3_b.OPUS",    "AUDIO\\el3_a.OPUS",   "AUDIO\\mf1_a.OPUS",   "AUDIO\\mf2_a.OPUS",   "AUDIO\\mf3_a.OPUS",
-    "AUDIO\\mf3_b.OPUS",   "AUDIO\\mf3_b1.OPUS",  "AUDIO\\mf3_c.OPUS",   "AUDIO\\mf4_a.OPUS",   "AUDIO\\mf4_b.OPUS",   "AUDIO\\mf4_c.OPUS",
-    "AUDIO\\a1_a.OPUS",    "AUDIO\\a3_a.OPUS",    "AUDIO\\a5_a.OPUS",    "AUDIO\\a4_a.OPUS",    "AUDIO\\a4_b.OPUS",    "AUDIO\\a4_c.OPUS",
-    "AUDIO\\a4_d.OPUS",    "AUDIO\\k1_a.OPUS",    "AUDIO\\k3_a.OPUS",    "AUDIO\\r1_a.OPUS",    "AUDIO\\r2_a.OPUS",    "AUDIO\\r2_b.OPUS",
-    "AUDIO\\r2_c.OPUS",    "AUDIO\\r2_d.OPUS",    "AUDIO\\r2_e.OPUS",    "AUDIO\\r2_f.OPUS",    "AUDIO\\r2_g.OPUS",    "AUDIO\\r2_h.OPUS",
-    "AUDIO\\r5_a.OPUS",    "AUDIO\\r6_a.OPUS",    "AUDIO\\r6_a1.OPUS",   "AUDIO\\r6_b.OPUS",    "AUDIO\\lo2_a.OPUS",   "AUDIO\\lo6_a.OPUS",
-    "AUDIO\\yd2_a.OPUS",   "AUDIO\\yd2_b.OPUS",   "AUDIO\\yd2_c.OPUS",   "AUDIO\\yd2_c1.OPUS",  "AUDIO\\yd2_d.OPUS",   "AUDIO\\yd2_e.OPUS",
-    "AUDIO\\yd2_f.OPUS",   "AUDIO\\yd2_g.OPUS",   "AUDIO\\yd2_h.OPUS",   "AUDIO\\yd2_ass.OPUS", "AUDIO\\yd2_ok.OPUS",  "AUDIO\\h5_a.OPUS",
-    "AUDIO\\h5_b.OPUS",    "AUDIO\\h5_c.OPUS",    "AUDIO\\ammu_a.OPUS",  "AUDIO\\ammu_b.OPUS",  "AUDIO\\ammu_c.OPUS",  "AUDIO\\door_1.OPUS",
-    "AUDIO\\door_2.OPUS",  "AUDIO\\door_3.OPUS",  "AUDIO\\door_4.OPUS",  "AUDIO\\door_5.OPUS",  "AUDIO\\door_6.OPUS",  "AUDIO\\t3_a.OPUS",
-    "AUDIO\\t3_b.OPUS",    "AUDIO\\t3_c.OPUS",    "AUDIO\\k1_b.OPUS",    "AUDIO\\cat1.OPUS"};
-#elif defined(PS2_AUDIO_PATHS)
-static char StreamedNameTable[][40] =
-{
-	"AUDIO\\MUSIC\\HEAD.VB",
-	"AUDIO\\MUSIC\\DOUBLE.VB",
-	"AUDIO\\MUSIC\\KJAH.VB",
-	"AUDIO\\MUSIC\\RISE.VB",
-	"AUDIO\\MUSIC\\LIPS.VB",
-	"AUDIO\\MUSIC\\MUNDO.VB",
-	"AUDIO\\MUSIC\\MSX.VB",
-	"AUDIO\\MUSIC\\FLASH.VB",
-	"AUDIO\\MUSIC\\LCJ.VB",
-	"AUDIO\\MUSIC\\LCFR.VB",
-	"AUDIO\\MUSIC\\MISCOM2.VB",
-	"AUDIO\\MUSIC\\CITY.VB",
-	"AUDIO\\MUSIC\\WATER.VB",
-	"AUDIO\\MUSIC\\SAWMILL.VB",
-	"AUDIO\\MUSIC\\CITY.VB",
-	"AUDIO\\MUSIC\\WATER.VB",
-	"AUDIO\\MUSIC\\WATER.VB",
-	"AUDIO\\MUSIC\\CITY.VB",
-	"AUDIO\\MUSIC\\CITY.VB",
-	"AUDIO\\MUSIC\\CITY.VB",
-	"AUDIO\\MUSIC\\CITY.VB",
-	"AUDIO\\MUSIC\\CITY.VB",
-	"AUDIO\\MUSIC\\CITY.VB",
-	"AUDIO\\MUSIC\\CITY.VB",
-	"AUDIO\\MUSIC\\POLICE.VB",
-	"AUDIO\\MUSIC\\TAXI.VB",
-	"AUDIO\\NEWS\\NEWS_A.VB",
-	"AUDIO\\NEWS\\NEWS_B.VB",
-	"AUDIO\\NEWS\\NEWS_C.VB",
-	"AUDIO\\NEWS\\NEWS_D.VB",
-	"AUDIO\\NEWS\\NEWS_E.VB",
-	"AUDIO\\NEWS\\NEWS_F.VB",
-	"AUDIO\\NEWS\\NEWS_G.VB",
-	"AUDIO\\NEWS\\NEWS_H.VB",
-	"AUDIO\\NEWS\\NEWS_I.VB",
-	"AUDIO\\NEWS\\NEWS_J.VB",
-	"AUDIO\\NEWS\\NEWS_K.VB",
-	"AUDIO\\NEWS\\NEWS_L.VB",
-	"AUDIO\\NEWS\\NEWS_M.VB",
-	"AUDIO\\NEWS\\NEWS_N.VB",
-	"AUDIO\\CUTSCENE\\BIKER.VB",
-	"AUDIO\\CUTSCENE\\BONEVOY.VB",
-	"AUDIO\\CUTSCENE\\CAMPAIN.VB",
-	"AUDIO\\CUTSCENE\\CASHCHP.VB",
-	"AUDIO\\CUTSCENE\\CONTBAN.VB",
-	"AUDIO\\CUTSCENE\\CRAZY69.VB",
-	"AUDIO\\CUTSCENE\\CRAZY69.VB",
-	"AUDIO\\CUTSCENE\\DEADLY.VB",
-	"AUDIO\\CUTSCENE\\DONPROB.VB",
-	"AUDIO\\CUTSCENE\\DRIVNMR.VB",
-	"AUDIO\\CUTSCENE\\ELECTON.VB",
-	"AUDIO\\CUTSCENE\\FINAL.VB",
-	"AUDIO\\CUTSCENE\\FINAL_2.VB",
-	"AUDIO\\CUTSCENE\\HOMSWET.VB",
-	"AUDIO\\CUTSCENE\\HOTWHEL.VB",
-	"AUDIO\\CUTSCENE\\KIDNAPP.VB",
-	"AUDIO\\CUTSCENE\\LANDGRB.VB",
-	"AUDIO\\CUTSCENE\\MORGUE.VB",
-	"AUDIO\\CUTSCENE\\OVERDOS.VB",
-	"AUDIO\\CUTSCENE\\RUFJUST.VB",
-	"AUDIO\\CUTSCENE\\SAYONAR.VB",
-	"AUDIO\\CUTSCENE\\SICILAN.VB",
-	"AUDIO\\CUTSCENE\\THEOFER.VB",
-	"AUDIO\\CUTSCENE\\INTRO.VB",
-	"AUDIO\\MUSIC\\FINALE.VB",
-	"AUDIO\\MUSIC\\MISCOM2.VB"
-#else
-static char StreamedNameTable[][25] =
-{
-	"AUDIO\\WILD.ADF",
-	"AUDIO\\FLASH.ADF",
-	"AUDIO\\KCHAT.ADF",
-	"AUDIO\\FEVER.ADF",
-	"AUDIO\\VROCK.ADF",
-	"AUDIO\\VCPR.ADF",
-	"AUDIO\\ESPANT.ADF",
-	"AUDIO\\EMOTION.ADF",
-	"AUDIO\\WAVE.ADF",
-	"AUDIO\\MISCOM.MP3",
-	"AUDIO\\CITY.MP3",
-	"AUDIO\\WATER.MP3",
-	"AUDIO\\BEACHAMB.MP3",
-	"AUDIO\\HCITY.MP3",
-	"AUDIO\\HWATER.MP3",
-	"AUDIO\\HBEACH.MP3",
-	"AUDIO\\MALLAMB.MP3",
-	"AUDIO\\STRIP.MP3",
-	"AUDIO\\MALIBU.MP3",
-	"AUDIO\\HOTEL.MP3",
-	"AUDIO\\DIRTRING.MP3",
-	"AUDIO\\LAW4RIOT.MP3",
-	"AUDIO\\AMBSIL.MP3",
-	"AUDIO\\POLICE.MP3",
-	"AUDIO\\TAXI.MP3",
-	"AUDIO\\BCLOSED.MP3",
-	"AUDIO\\BOPEN.MP3",
-	"AUDIO\\ASS_1.MP3",
-	"AUDIO\\ASS_2.MP3",
-	"AUDIO\\BANK_1.MP3",
-	"AUDIO\\BANK_2A.MP3",
-	"AUDIO\\BANK_2B.MP3",
-	"AUDIO\\BANK_3A.MP3",
-	"AUDIO\\BANK_3B.MP3",
-	"AUDIO\\BANK_4.MP3",
-	"AUDIO\\BIKE_1.MP3",
-	"AUDIO\\BIKE_2.MP3",
-	"AUDIO\\BIKE_3.MP3",
-	"AUDIO\\BUD_1.MP3",
-	"AUDIO\\BUD_2.MP3",
-	"AUDIO\\BUD_3.MP3",
-	"AUDIO\\CAP_1.MP3",
-	"AUDIO\\CAR_1.MP3",
-	"AUDIO\\CNT_1A.MP3",
-	"AUDIO\\CNT_1B.MP3",
-	"AUDIO\\CNT_2.MP3",
-	"AUDIO\\COK_1.MP3",
-	"AUDIO\\COK_2A.MP3",
-	"AUDIO\\COK_2B.MP3",
-	"AUDIO\\COK_3.MP3",
-	"AUDIO\\COK_4A.MP3",
-	"AUDIO\\COK_4A2.MP3",
-	"AUDIO\\COK_4B.MP3",
-	"AUDIO\\COL_1.MP3",
-	"AUDIO\\COL_2.MP3",
-	"AUDIO\\COL_3A.MP3",
-	"AUDIO\\COL_4A.MP3",
-	"AUDIO\\COL_5A.MP3",
-	"AUDIO\\COL_5B.MP3",
-	"AUDIO\\CUB_1.MP3",
-	"AUDIO\\CUB_2.MP3",
-	"AUDIO\\CUB_3.MP3",
-	"AUDIO\\CUB_4.MP3",
-	"AUDIO\\DRUG_1.MP3",
-	"AUDIO\\FIN.MP3",
-	"AUDIO\\FIN2.MP3",
-	"AUDIO\\FINALE.MP3",
-	"AUDIO\\HAT_1.MP3",
-	"AUDIO\\HAT_2.MP3",
-	"AUDIO\\HAT_3.MP3",
-	"AUDIO\\ICE_1.MP3",
-	"AUDIO\\INT_A.MP3",
-	"AUDIO\\INT_B.MP3",
-	"AUDIO\\INT_D.MP3",
-	"AUDIO\\INT_M.MP3",
-	"AUDIO\\LAW_1A.MP3",
-	"AUDIO\\LAW_1B.MP3",
-	"AUDIO\\LAW_2A.MP3",
-	"AUDIO\\LAW_2B.MP3",
-	"AUDIO\\LAW_2C.MP3",
-	"AUDIO\\LAW_3.MP3",
-	"AUDIO\\LAW_4.MP3",
-	"AUDIO\\PHIL_1.MP3",
-	"AUDIO\\PHIL_2.MP3",
-	"AUDIO\\PORN_1.MP3",
-	"AUDIO\\PORN_2.MP3",
-	"AUDIO\\PORN_3.MP3",
-	"AUDIO\\PORN_4.MP3",
-	"AUDIO\\RESC_1A.MP3",
-	"AUDIO\\ROK_1.MP3",
-	"AUDIO\\ROK_2.MP3",
-	"AUDIO\\ROK_3A.MP3",
-	"AUDIO\\STRIPA.MP3",
-	"AUDIO\\TAX_1.MP3",
-	"AUDIO\\TEX_1.MP3",
-	"AUDIO\\TEX_2.MP3",
-	"AUDIO\\TEX_3.MP3",
-	"AUDIO\\GLIGHT.MP3",
-	"AUDIO\\FIST.MP3",
-	"AUDIO\\MISCOM.MP3",
-	"AUDIO\\MISCOM.MP3",
-	"AUDIO\\MISCOM.MP3",
-	"AUDIO\\MISCOM.MP3",
-#endif
-
+static char StreamedNameTable[][40] = {
+	"AUDIO\\MUSIC\\HEAD",
+	"AUDIO\\MUSIC\\DOUBLE",
+	"AUDIO\\MUSIC\\KJAH",
+	"AUDIO\\MUSIC\\RISE",
+	"AUDIO\\MUSIC\\LIPS",
+	"AUDIO\\MUSIC\\MUNDO",
+	"AUDIO\\MUSIC\\MSX",
+	"AUDIO\\MUSIC\\FLASH",
+	"AUDIO\\MUSIC\\LCJ",
+	"AUDIO\\MUSIC\\LCFR",
+	"AUDIO\\MUSIC\\MISCOM2",
+	"AUDIO\\MUSIC\\CITY",
+	"AUDIO\\MUSIC\\WATER",
+	"AUDIO\\MUSIC\\SAWMILL",
+	"AUDIO\\MUSIC\\CITY",
+	"AUDIO\\MUSIC\\WATER",
+	"AUDIO\\MUSIC\\WATER",
+	"AUDIO\\MUSIC\\CITY",
+	"AUDIO\\MUSIC\\CITY",
+	"AUDIO\\MUSIC\\CITY",
+	"AUDIO\\MUSIC\\CITY",
+	"AUDIO\\MUSIC\\CITY",
+	"AUDIO\\MUSIC\\CITY",
+	"AUDIO\\MUSIC\\CITY",
+	"AUDIO\\MUSIC\\POLICE",
+	"AUDIO\\MUSIC\\TAXI",
+	"AUDIO\\NEWS\\NEWS_A",
+	"AUDIO\\NEWS\\NEWS_B",
+	"AUDIO\\NEWS\\NEWS_C",
+	"AUDIO\\NEWS\\NEWS_D",
+	"AUDIO\\NEWS\\NEWS_E",
+	"AUDIO\\NEWS\\NEWS_F",
+	"AUDIO\\NEWS\\NEWS_G",
+	"AUDIO\\NEWS\\NEWS_H",
+	"AUDIO\\NEWS\\NEWS_I",
+	"AUDIO\\NEWS\\NEWS_J",
+	"AUDIO\\NEWS\\NEWS_K",
+	"AUDIO\\NEWS\\NEWS_L",
+	"AUDIO\\NEWS\\NEWS_M",
+	"AUDIO\\NEWS\\NEWS_N",
+	"AUDIO\\CUTSCENE\\BIKER",
+	"AUDIO\\CUTSCENE\\BONEVOY",
+	"AUDIO\\CUTSCENE\\CAMPAIN",
+	"AUDIO\\CUTSCENE\\CASHCHP",
+	"AUDIO\\CUTSCENE\\CONTBAN",
+	"AUDIO\\CUTSCENE\\CRAZY69",
+	"AUDIO\\CUTSCENE\\CRAZY69",
+	"AUDIO\\CUTSCENE\\DEADLY",
+	"AUDIO\\CUTSCENE\\DONPROB",
+	"AUDIO\\CUTSCENE\\DRIVNMR",
+	"AUDIO\\CUTSCENE\\ELECTON",
+	"AUDIO\\CUTSCENE\\FINAL",
+	"AUDIO\\CUTSCENE\\FINAL_2",
+	"AUDIO\\CUTSCENE\\HOMSWET",
+	"AUDIO\\CUTSCENE\\HOTWHEL",
+	"AUDIO\\CUTSCENE\\KIDNAPP",
+	"AUDIO\\CUTSCENE\\LANDGRB",
+	"AUDIO\\CUTSCENE\\MORGUE",
+	"AUDIO\\CUTSCENE\\OVERDOS",
+	"AUDIO\\CUTSCENE\\RUFJUST",
+	"AUDIO\\CUTSCENE\\SAYONAR",
+	"AUDIO\\CUTSCENE\\SICILAN",
+	"AUDIO\\CUTSCENE\\THEOFER",
+	"AUDIO\\CUTSCENE\\INTRO",
+	"AUDIO\\MUSIC\\FINALE",
+	"AUDIO\\MUSIC\\MISCOM2"
 };
\ No newline at end of file
diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp
index bf91a874..5e2b348b 100644
--- a/src/audio/sampman_miles.cpp
+++ b/src/audio/sampman_miles.cpp
@@ -28,7 +28,7 @@ char SampleBankDataFilename[] = "AUDIO\\SFX.RAW";
 
 FILE *fpSampleDescHandle;
 FILE *fpSampleDataHandle;
-bool  bSampleBankLoaded            [MAX_SFX_BANKS];
+bool8 bSampleBankLoaded            [MAX_SFX_BANKS];
 int32 nSampleBankDiscStartOffset   [MAX_SFX_BANKS];
 int32 nSampleBankSize              [MAX_SFX_BANKS];
 int32 nSampleBankMemoryStartAddress[MAX_SFX_BANKS];
@@ -60,14 +60,14 @@ char _mp3DirectoryPath[MAX_PATH];
 HSTREAM mp3Stream [MAX_STREAMS];
 int8 nStreamPan   [MAX_STREAMS];
 int8 nStreamVolume[MAX_STREAMS];
-uint8 nStreamLoopedFlag[MAX_STREAMS];
+bool8 nStreamLoopedFlag[MAX_STREAMS];
 uint32 _CurMP3Index;
 int32 _CurMP3Pos;
-bool _bIsMp3Active;
+bool8 _bIsMp3Active;
 ///////////////////////////////////////////////////////////////
 
 
-bool _bSampmanInitialised = false;
+bool8 _bSampmanInitialised = FALSE;
 
 //
 // Miscellaneous globals / defines
@@ -94,7 +94,7 @@ S32         speaker_type=0;
 
 U32 _maxSamples;
 float _fPrevEaxRatioDestination;
-bool _usingMilesFast2D;
+bool8 _usingMilesFast2D;
 float _fEffectsLevel;
 
 
@@ -166,17 +166,17 @@ release_existing()
 	}
 
 	_fPrevEaxRatioDestination = 0.0f;
-	_usingMilesFast2D = false;
+	_usingMilesFast2D = FALSE;
 	_fEffectsLevel = 0.0f;
 }
 
-static bool
+static bool8
 set_new_provider(S32 index)
 {
 	DWORD result;
 	
 	if ( curprovider == index )
-		return true;
+		return TRUE;
 
 	//close the already opened provider
 	curprovider = index;
@@ -203,7 +203,7 @@ set_new_provider(S32 index)
 			
 			release_existing();
 			
-			return false;
+			return FALSE;
 		}
 		else
 		{
@@ -234,7 +234,7 @@ set_new_provider(S32 index)
 				AIL_set_3D_room_type(opened_provider, ENVIRONMENT_CAVE);
 				
 				if ( !strcmp(providers[index].name, "Miles Fast 2D Positional Audio") )
-					_usingMilesFast2D = true;
+					_usingMilesFast2D = TRUE;
 			}
 			
 			AIL_3D_provider_attribute(opened_provider, "Maximum supported samples", &_maxSamples);
@@ -252,11 +252,11 @@ set_new_provider(S32 index)
 					AIL_set_3D_sample_effects_level(opened_samples[i], 0.0f);
 			}
 			
-			return true;
+			return TRUE;
 		}	
 	}
 	
-	return false;
+	return FALSE;
 }
 
 U32 RadioHandlers[9];
@@ -323,6 +323,80 @@ cSampleManager::~cSampleManager(void)
 	
 }
 
+int gBankStartOffset[67];
+
+void
+SetUpDebugBanksInfo()
+{
+	gBankStartOffset[3] = SFX_FE_BACK;
+	gBankStartOffset[4] = SFX_CAR_ACCEL_1;
+	gBankStartOffset[5] = SFX_CAR_ACCEL_2;
+	gBankStartOffset[9] = SFX_CAR_ACCEL_6;
+	gBankStartOffset[10] = SFX_CAR_ACCEL_7;
+	gBankStartOffset[1] = SFX_EMPTY;
+	gBankStartOffset[11] = SFX_CAR_ACCEL_8;
+	gBankStartOffset[7] = SFX_CAR_ACCEL_4;
+	gBankStartOffset[15] = SFX_CAR_ACCEL_12;
+	gBankStartOffset[13] = SFX_CAR_ACCEL_10;
+	gBankStartOffset[16] = SFX_CAR_CHAINSAW_IDLE;
+	gBankStartOffset[0] = SFX_AIR_BRAKES;
+	gBankStartOffset[17] = SFX_RC_IDLE;
+	gBankStartOffset[6] = SFX_CAR_ACCEL_3;
+	gBankStartOffset[19] = SFX_CAR_ACCEL_16;
+	gBankStartOffset[12] = SFX_CAR_ACCEL_9;
+	gBankStartOffset[2] = SFX_AMBULAN_VOICE_1_VAN_1;
+	gBankStartOffset[21] = SFX_CAR_ACCEL_18;
+	gBankStartOffset[22] = SFX_CAR_ACCEL_19;
+	gBankStartOffset[8] = SFX_CAR_ACCEL_5;
+	gBankStartOffset[23] = SFX_CAR_ACCEL_20;
+	gBankStartOffset[14] = SFX_CAR_ACCEL_11;
+	gBankStartOffset[20] = SFX_CAR_ACCEL_17;
+	gBankStartOffset[18] = SFX_CAR_RC_HELI;
+	gBankStartOffset[25] = SFX_CAR_AFTER_ACCEL_21;
+	gBankStartOffset[26] = SFX_CAR_FINGER_OFF_ACCEL_21;
+	gBankStartOffset[27] = SFX_CAR_ACCEL_22;
+	gBankStartOffset[28] = SFX_CAR_AFTER_ACCEL_22;
+	gBankStartOffset[29] = SFX_CAR_FINGER_OFF_ACCEL_22;
+	gBankStartOffset[24] = SFX_CAR_ACCEL_21;
+	gBankStartOffset[30] = SFX_HELI_APACHE_1;
+	gBankStartOffset[31] = SFX_HELI_UNUSED_1;
+	gBankStartOffset[32] = SFX_HELI_UNUSED_2;
+	gBankStartOffset[33] = SFX_HELI_UNUSED_3;
+	gBankStartOffset[34] = SFX_HELI_UNUSED_4;
+	gBankStartOffset[35] = SFX_SEAPLANE_LOW;
+	gBankStartOffset[37] = SFX_PLANE_UNUSED_2;
+	gBankStartOffset[38] = SFX_PLANE_UNUSED_3;
+	gBankStartOffset[39] = SFX_PLANE_UNUSED_4;
+	gBankStartOffset[40] = SFX_BUILDINGS_BANK_ALARM;
+	gBankStartOffset[41] = SFX_BUILDING_SNORE;
+	gBankStartOffset[36] = SFX_PLANE_UNUSED_1;
+	gBankStartOffset[43] = SFX_BUILDING_BAR_2;
+	gBankStartOffset[44] = SFX_BUILDING_BAR_3;
+	gBankStartOffset[45] = SFX_BUILDING_BAR_4;
+	gBankStartOffset[46] = SFX_BUILDING_MAL1;
+	gBankStartOffset[47] = SFX_BUILDING_MAL2;
+	gBankStartOffset[42] = SFX_BUILDING_BAR_1;
+	gBankStartOffset[49] = SFX_BUILDING_STR1;
+	gBankStartOffset[50] = SFX_BUILDING_STR2;
+	gBankStartOffset[51] = SFX_BUILDING_STR3;
+	gBankStartOffset[52] = SFX_BUILDING_CHURCH;
+	gBankStartOffset[53] = SFX_BUILDING_FAN_1;
+	gBankStartOffset[48] = SFX_BUILDING_MAL3;
+	gBankStartOffset[55] = SFX_BUILDING_INSECTS_1;
+	gBankStartOffset[56] = SFX_BUILDING_INSECTS_2;
+	gBankStartOffset[54] = SFX_BUILDING_FAN_2;
+	gBankStartOffset[57] = SFX_CLUB_1;
+	gBankStartOffset[58] = SFX_CLUB_2;
+	gBankStartOffset[59] = SFX_CLUB_3;
+	gBankStartOffset[60] = SFX_CLUB_4;
+	gBankStartOffset[61] = SFX_FOOTSTEP_GRASS_1;
+	gBankStartOffset[62] = SFX_FOOTSTEP_GRAVEL_1;
+	gBankStartOffset[63] = SFX_FOOTSTEP_WOOD_1;
+	gBankStartOffset[64] = SFX_FOOTSTEP_METAL_1;
+	gBankStartOffset[65] = SFX_FOOTSTEP_WATER_1;
+	gBankStartOffset[66] = SFX_FOOTSTEP_SAND_1;
+}
+
 void
 cSampleManager::SetSpeakerConfig(int32 which)
 {
@@ -459,7 +533,7 @@ cSampleManager::AutoDetect3DProviders()
 	return -1;
 }
 
-static bool
+static bool8
 _ResolveLink(char const *path, char *out)
 {
 	IShellLink* psl;
@@ -495,7 +569,7 @@ _ResolveLink(char const *path, char *out)
 						ppf->Release();
 						psl->Release();
 #endif
-						return true;
+						return TRUE;
 					}
 				}
 			}
@@ -505,15 +579,15 @@ _ResolveLink(char const *path, char *out)
 		psl->Release();
 	}
 	
-	return false;
+	return FALSE;
 }
 
 static void
 _FindMP3s(void)
 {
 	tMP3Entry *pList;
-	bool bShortcut;	
-	bool bInitFirstEntry;	
+	bool8 bShortcut;	
+	bool8 bInitFirstEntry;	
 	HANDLE hFind;
 	char path[MAX_PATH];
 	char filepath[MAX_PATH*2];
@@ -565,10 +639,10 @@ _FindMP3s(void)
 				OutputDebugString(filepath);
 			}
 			
-			bShortcut = true;
+			bShortcut = TRUE;
 		}
 		else
-			bShortcut = false;
+			bShortcut = FALSE;
 	}
 	
 	mp3Stream[0] = AIL_open_stream(DIG, filepath, 0);
@@ -608,7 +682,7 @@ _FindMP3s(void)
 		{
 			_pMP3List->pLinkPath = NULL;
 		}
-		bInitFirstEntry = false;
+		bInitFirstEntry = FALSE;
 	}
 	else
 	{
@@ -616,10 +690,10 @@ _FindMP3s(void)
 		
 		OutputDebugString(filepath);
 
-		bInitFirstEntry = true;
+		bInitFirstEntry = TRUE;
 	}
 	
-	while ( true )
+	while ( TRUE )
 	{
 		if ( !FindNextFile(hFind, &fd) )
 			break;
@@ -643,11 +717,11 @@ _FindMP3s(void)
 							OutputDebugString(filepath);
 						}
 						
-						bShortcut = true;
+						bShortcut = TRUE;
 					}
 					else
 					{
-						bShortcut = false;
+						bShortcut = FALSE;
 						
 						if ( filepathlen > MAX_PATH )
 						{
@@ -690,7 +764,7 @@ _FindMP3s(void)
 					
 					pList = _pMP3List;
 
-					bInitFirstEntry = false;
+					bInitFirstEntry = FALSE;
 				}
 				else
 				{
@@ -718,11 +792,11 @@ _FindMP3s(void)
 							OutputDebugString(filepath);
 						}
 						
-						bShortcut = true;
+						bShortcut = TRUE;
 					}
 					else
 					{
-						bShortcut = false;
+						bShortcut = FALSE;
 					}
 				}
 				
@@ -834,7 +908,7 @@ _GetMP3EntryByIndex(uint32 idx)
 	return NULL;
 }
 
-static inline bool
+static inline bool8
 _GetMP3PosFromStreamPos(uint32 *pPosition, tMP3Entry **pEntry)
 {
 	_CurMP3Index = 0;
@@ -847,7 +921,7 @@ _GetMP3PosFromStreamPos(uint32 *pPosition, tMP3Entry **pEntry)
 			*pPosition -= (*pEntry)->nTrackStreamPos;
 			_CurMP3Pos = *pPosition;
 			
-			return true;
+			return TRUE;
 		}
 		
 		_CurMP3Index++;
@@ -858,10 +932,10 @@ _GetMP3PosFromStreamPos(uint32 *pPosition, tMP3Entry **pEntry)
 	_CurMP3Pos = 0;
 	_CurMP3Index = 0;
 	
-	return false;
+	return FALSE;
 }
 
-bool
+bool8
 cSampleManager::IsMP3RadioChannelAvailable(void)
 {
 	return nNumMP3s != 0;
@@ -890,13 +964,13 @@ cSampleManager::ReacquireDigitalHandle(void)
 	}
 }
 
-bool
+bool8
 cSampleManager::Initialise(void)
 {
 	TRACE("start");
 	
 	if ( _bSampmanInitialised )
-		return true;
+		return TRUE;
 
 	{
 		for ( int32 i = 0; i < TOTAL_AUDIO_SAMPLES; i++ )
@@ -922,7 +996,7 @@ cSampleManager::Initialise(void)
 		curprovider = -1;
 		prevprovider = -1;
 		
-		_usingMilesFast2D = false;
+		_usingMilesFast2D = FALSE;
 		usingEAX=0;
 		usingEAX3=0;
 		
@@ -947,7 +1021,7 @@ cSampleManager::Initialise(void)
 		
 		for ( int32 i = 0; i < MAX_SFX_BANKS; i++ )
 		{
-			bSampleBankLoaded[i]             = false;
+			bSampleBankLoaded[i]             = FALSE;
 			nSampleBankDiscStartOffset[i]    = 0;
 			nSampleBankSize[i]               = 0;
 			nSampleBankMemoryStartAddress[i] = 0;
@@ -988,24 +1062,24 @@ cSampleManager::Initialise(void)
 #ifdef AUDIO_CACHE
 	TRACE("cache");
 	FILE *cacheFile = fcaseopen("audio\\sound.cache", "rb");
-	bool CreateCache = false;
+	bool8 CreateCache = FALSE;
 	if (cacheFile) {
 		fread(nStreamLength, sizeof(uint32), TOTAL_STREAMED_SOUNDS, cacheFile);
 		fclose(cacheFile);
 	}else
-		CreateCache = true;
+		CreateCache = TRUE;
 #endif
 	
 	char filepath[MAX_PATH];
-	bool bFileNotFound;
+	bool8 bFileNotFound;
 	S32 tatalms;
 
 	TRACE("cdrom");
 	{
-		m_bInitialised = false;
+		m_bInitialised = FALSE;
 
 		
-		while (true)
+		while (TRUE)
 		{
 
 			// Find path of WAVs (originally in HDD)
@@ -1026,9 +1100,18 @@ cSampleManager::Initialise(void)
 				{
 					strcpy(filepath, m_szCDRomRootPath);
 					strcat(filepath, StreamedNameTable[0]);
+					strcat(filepath, ".VB");
 					
 					FILE *f = fopen(filepath, "rb");
 					
+					if ( !f )
+					{
+						strcpy(filepath, m_szCDRomRootPath);
+						strcat(filepath, StreamedNameTable[0]);
+						strcat(filepath, ".MP3");
+						f = fopen(filepath, "rb");
+					}
+
 					if ( f )
 					{
 						fclose(f);
@@ -1046,7 +1129,7 @@ cSampleManager::Initialise(void)
 			{
 				OutputDebugString(AIL_last_error());
 				Terminate();
-				return false;
+				return FALSE;
 			}
 			
 			add_providers();
@@ -1076,9 +1159,9 @@ cSampleManager::Initialise(void)
 				}
 				else
 				{
-					m_bInitialised = false;
+					m_bInitialised = FALSE;
 					Terminate();
-					return false;
+					return FALSE;
 				}
 			}
 			*/
@@ -1103,8 +1186,16 @@ cSampleManager::Initialise(void)
 				{
 					strcpy(filepath, m_MP3FilesPath);
 					strcat(filepath, StreamedNameTable[i]);
+					strcat(filepath, ".VB");
 
 					mp3Stream[0] = AIL_open_stream(DIG, filepath, 0);
+					if (!mp3Stream[0])
+					{
+						strcpy(filepath, m_MP3FilesPath);
+						strcat(filepath, StreamedNameTable[i]);
+						strcat(filepath, ".MP3");
+						mp3Stream[0] = AIL_open_stream(DIG, filepath, 0);
+					}
 
 					if (mp3Stream[0])
 					{
@@ -1113,7 +1204,7 @@ cSampleManager::Initialise(void)
 						AIL_close_stream(mp3Stream[0]);
 						mp3Stream[0] = NULL;
 
-						bFileNotFound = false;
+						bFileNotFound = FALSE;
 #ifdef AUDIO_CACHE
 						if (!CreateCache)
 							break;
@@ -1124,7 +1215,7 @@ cSampleManager::Initialise(void)
 					}
 					else
 					{
-						bFileNotFound = true;
+						bFileNotFound = TRUE;
 						break;
 					}
 				}
@@ -1159,11 +1250,11 @@ cSampleManager::Initialise(void)
 						mp3Stream[0] = NULL;
 						
 						nStreamLength[i] = tatalms;
-						bFileNotFound = false;
+						bFileNotFound = FALSE;
 					}
 					else
 					{
-						bFileNotFound = true;
+						bFileNotFound = TRUE;
 						break;
 					}
 				}*/
@@ -1178,11 +1269,11 @@ cSampleManager::Initialise(void)
 				if ( FrontEndMenuManager.m_bQuitGameNoCD )
 				{
 					Terminate();
-					return false;
+					return FALSE;
 				}
 				continue;
 #else
-				m_bInitialised = true;
+				m_bInitialised = TRUE;
 #endif
 			}
 			
@@ -1201,14 +1292,14 @@ cSampleManager::Initialise(void)
 	if ( !InitialiseSampleBanks() )
 	{
 		Terminate();
-		return false;
+		return FALSE;
 	}
 	
 	nSampleBankMemoryStartAddress[SFX_BANK_0] = (int32)AIL_mem_alloc_lock(nSampleBankSize[SFX_BANK_0]);
 	if ( !nSampleBankMemoryStartAddress[SFX_BANK_0] )
 	{
 		Terminate();
-		return false;
+		return FALSE;
 	}
 
 	nSampleBankMemoryStartAddress[SFX_BANK_PED_COMMENTS] = (int32)AIL_mem_alloc_lock(PED_BLOCKSIZE*MAX_PEDSFX);
@@ -1237,7 +1328,7 @@ cSampleManager::Initialise(void)
 	
 	TRACE("providerset");
 	{
-		_bSampmanInitialised = true;
+		_bSampmanInitialised = TRUE;
 		
 		U32 n = 0;
 		
@@ -1254,7 +1345,7 @@ cSampleManager::Initialise(void)
 		if ( n == m_nNumberOfProviders )
 		{
 			Terminate();
-			return false;
+			return FALSE;
 		}
 	}
 	
@@ -1279,13 +1370,13 @@ cSampleManager::Initialise(void)
 			
 			time_t t = time(NULL);
 			tm *localtm;
-			bool bUseRandomTable;
+			bool8 bUseRandomTable;
 			
 			if ( t == -1 )
-				bUseRandomTable = true;
+				bUseRandomTable = TRUE;
 			else
 			{
-				bUseRandomTable = false;
+				bUseRandomTable = FALSE;
 				localtm = localtime(&t);
 			}
 			
@@ -1317,12 +1408,12 @@ cSampleManager::Initialise(void)
 		else
 			_CurMP3Pos = 0;
 		
-		_bIsMp3Active = false;
+		_bIsMp3Active = FALSE;
 	}
 	
 	TRACE("end");
 	
-	return true;
+	return TRUE;
 }
 
 void
@@ -1371,10 +1462,10 @@ cSampleManager::Terminate(void)
 	
 	AIL_shutdown();
 	
-	_bSampmanInitialised = false;
+	_bSampmanInitialised = FALSE;
 }
 
-bool
+bool8
 cSampleManager::CheckForAnAudioFileOnCD(void)
 {
 #if !defined(NO_CDCHECK) // TODO: check steam, probably GTAVC_STEAM_PATCH needs to be added
@@ -1392,17 +1483,17 @@ cSampleManager::CheckForAnAudioFileOnCD(void)
 		DMAudio.SetEffectsMasterVolume(FrontEndMenuManager.m_PrefsSfxVolume);
 		DMAudio.Service();
 
-		return true;
+		return TRUE;
 	}
 
 	DMAudio.SetMusicMasterVolume(0);
 	DMAudio.SetEffectsMasterVolume(0);
 	DMAudio.Service();
 
-	return false;
+	return FALSE;
 	
 #else
-	return true;
+	return TRUE;
 #endif // #if !defined(NO_CDCHECK)
 }
 
@@ -1484,48 +1575,48 @@ cSampleManager::SetMusicFadeVolume(uint8 nVolume)
 }
 
 void
-cSampleManager::SetMonoMode(uint8 nMode)
+cSampleManager::SetMonoMode(bool8 nMode)
 {
 	m_nMonoMode = nMode;
 }
 
-bool
+bool8
 cSampleManager::LoadSampleBank(uint8 nBank)
 {
 	if ( CTimer::GetIsCodePaused() )
-		return false;
+		return FALSE;
 	
 	if ( MusicManager.IsInitialised()
 		&& MusicManager.GetMusicMode() == MUSICMODE_CUTSCENE
 		&& nBank != SFX_BANK_0 )
 	{
-		return false;
+		return FALSE;
 	}
 	
 	if ( fseek(fpSampleDataHandle, nSampleBankDiscStartOffset[nBank], SEEK_SET) != 0 )
-		return false;
+		return FALSE;
 	
 	if ( fread((void *)nSampleBankMemoryStartAddress[nBank], 1, nSampleBankSize[nBank],fpSampleDataHandle) != nSampleBankSize[nBank] )
-		return false;
+		return FALSE;
 	
-	bSampleBankLoaded[nBank] = true;
+	bSampleBankLoaded[nBank] = TRUE;
 	
-	return true;
+	return TRUE;
 }
 
 void
 cSampleManager::UnloadSampleBank(uint8 nBank)
 {
-	bSampleBankLoaded[nBank] = false;
+	bSampleBankLoaded[nBank] = FALSE;
 }
 
-bool
+bool8
 cSampleManager::IsSampleBankLoaded(uint8 nBank)
 {
 	return bSampleBankLoaded[nBank];
 }
 
-bool
+bool8
 cSampleManager::IsPedCommentLoaded(uint32 nComment)
 {
 	int8 slot;
@@ -1538,10 +1629,10 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
 			slot += ARRAY_SIZE(nPedSlotSfx);
 #endif
 		if ( nComment == nPedSlotSfx[slot] )
-			return true;
+			return TRUE;
 	}
 	
-	return false;
+	return FALSE;
 }
 
 int32
@@ -1563,11 +1654,11 @@ cSampleManager::_GetPedCommentSlot(uint32 nComment)
 	return -1;
 }
 
-bool
+bool8
 cSampleManager::LoadPedComment(uint32 nComment)
 {
 	if ( CTimer::GetIsCodePaused() )
-		return false;
+		return FALSE;
 	
 	// no talking peds during cutsenes or the game end
 	if ( MusicManager.IsInitialised() )
@@ -1576,7 +1667,7 @@ cSampleManager::LoadPedComment(uint32 nComment)
 		{
 			case MUSICMODE_CUTSCENE:
 			{
-				return false;
+				return FALSE;
 
 				break;
 			}
@@ -1584,10 +1675,10 @@ cSampleManager::LoadPedComment(uint32 nComment)
 	}
 	
 	if ( fseek(fpSampleDataHandle, m_aSamples[nComment].nOffset, SEEK_SET) != 0 )
-		return false;
+		return FALSE;
 	
 	if ( fread((void *)(nSampleBankMemoryStartAddress[SFX_BANK_PED_COMMENTS] + PED_BLOCKSIZE*nCurrentPedSlot), 1, m_aSamples[nComment].nSize, fpSampleDataHandle) != m_aSamples[nComment].nSize )
-		return false;
+		return FALSE;
 	
 	nPedSlotSfxAddr[nCurrentPedSlot] = nSampleBankMemoryStartAddress[SFX_BANK_PED_COMMENTS] + PED_BLOCKSIZE*nCurrentPedSlot;
 	nPedSlotSfx    [nCurrentPedSlot] = nComment;
@@ -1595,7 +1686,7 @@ cSampleManager::LoadPedComment(uint32 nComment)
 	if ( ++nCurrentPedSlot >= MAX_PEDSFX )
 		nCurrentPedSlot = 0;
 	
-	return true;
+	return TRUE;
 }
 
 int32
@@ -1634,14 +1725,14 @@ cSampleManager::GetSampleLength(uint32 nSample)
 	return m_aSamples[nSample].nSize >> 1;
 }
 
-bool
+bool8
 cSampleManager::UpdateReverb(void)
 {
 	if ( !usingEAX )
-		return false;
+		return FALSE;
 	
 	if ( AudioManager.GetFrameCounter() & 15 )
-		return false;
+		return FALSE;
 
 	float fRatio = 0.0f;
 
@@ -1662,7 +1753,7 @@ cSampleManager::UpdateReverb(void)
 	fRatio = clamp(fRatio, 0.0f, 0.6f);
 	
 	if ( fRatio == _fPrevEaxRatioDestination )
-		return false;
+		return FALSE;
 	
 	if ( usingEAX3 )
 	{
@@ -1684,26 +1775,28 @@ cSampleManager::UpdateReverb(void)
 
 	_fPrevEaxRatioDestination = fRatio;
 	
-	return true;
+	return TRUE;
 }
 
 void
-cSampleManager::SetChannelReverbFlag(uint32 nChannel, uint8 nReverbFlag)
+cSampleManager::SetChannelReverbFlag(uint32 nChannel, bool8 nReverbFlag)
 {
-	bool b2d = false;
+	bool8 b2d = FALSE;
 	
 	switch ( nChannel )
 	{
-		case CHANNEL2D:
+		case CHANNEL_POLICE_RADIO:
+		case CHANNEL_MISSION_AUDIO_1:
+		case CHANNEL_MISSION_AUDIO_2:
 		{
-			b2d = true;
+			b2d = TRUE;
 			break;
 		}
 	}
 	
 	if ( usingEAX )
 	{
-		if ( nReverbFlag != 0 )
+		if ( nReverbFlag != FALSE )
 		{
 			if ( !b2d )
 				AIL_set_3D_sample_effects_level(opened_samples[nChannel], _fEffectsLevel);
@@ -1716,16 +1809,18 @@ cSampleManager::SetChannelReverbFlag(uint32 nChannel, uint8 nReverbFlag)
 	}
 }
 
-bool
+bool8
 cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank)
 {
-	bool b2d = false;
+	bool8 b2d = FALSE;
 
 	switch ( nChannel )
 	{
-		case CHANNEL2D:
+		case CHANNEL_POLICE_RADIO:
+		case CHANNEL_MISSION_AUDIO_1:
+		case CHANNEL_MISSION_AUDIO_2:
 		{
-			b2d = true;
+			b2d = TRUE;
 			break;
 		}
 	}
@@ -1735,14 +1830,14 @@ cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank)
 	if ( nSfx < SAMPLEBANK_MAX )
 	{
 		if ( !IsSampleBankLoaded(nBank) )
-			return false;
+			return FALSE;
 		
 		addr = nSampleBankMemoryStartAddress[nBank] + m_aSamples[nSfx].nOffset - m_aSamples[BankStartOffset[nBank]].nOffset;
 	}
 	else
 	{	
 		if ( !IsPedCommentLoaded(nSfx) )
-			return false;
+			return FALSE;
 		
 		int32 slot = _GetPedCommentSlot(nSfx);
 		
@@ -1754,10 +1849,10 @@ cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank)
 		if ( opened_2dsamples[nChannel - MAXCHANNELS] )
 		{
 			AIL_set_sample_address(opened_2dsamples[nChannel - MAXCHANNELS], (void *)addr, m_aSamples[nSfx].nSize);
-			return true;
+			return TRUE;
 		}
 		else
-			return false;
+			return FALSE;
 	}
 	else
 	{
@@ -1773,10 +1868,10 @@ cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank)
 		if ( AIL_set_3D_sample_info(opened_samples[nChannel], &info) == 0 )
 		{
 			OutputDebugString(AIL_last_error());
-			return false;
+			return FALSE;
 		}
 		
-		return true;
+		return TRUE;
 	}
 }
 
@@ -1823,7 +1918,9 @@ cSampleManager::SetChannelVolume(uint32 nChannel, uint32 nVolume)
 	
 	switch ( nChannel )
 	{
-		case CHANNEL2D:
+		case CHANNEL_POLICE_RADIO:
+		case CHANNEL_MISSION_AUDIO_1:
+		case CHANNEL_MISSION_AUDIO_2:
 		{
 			nChannelVolume[nChannel] = vol;
 			
@@ -1850,7 +1947,9 @@ cSampleManager::SetChannelPan(uint32 nChannel, uint32 nPan)
 {
 	switch ( nChannel )
 	{
-		case CHANNEL2D:
+		case CHANNEL_POLICE_RADIO:
+		case CHANNEL_MISSION_AUDIO_1:
+		case CHANNEL_MISSION_AUDIO_2:
 		{
 #ifndef FIX_BUGS
 			if ( opened_samples[nChannel - MAXCHANNELS] ) // BUG
@@ -1867,13 +1966,15 @@ cSampleManager::SetChannelPan(uint32 nChannel, uint32 nPan)
 void
 cSampleManager::SetChannelFrequency(uint32 nChannel, uint32 nFreq)
 {
-	bool b2d = false;
+	bool8 b2d = FALSE;
 
 	switch ( nChannel )
 	{
-		case CHANNEL2D:
+		case CHANNEL_POLICE_RADIO:
+		case CHANNEL_MISSION_AUDIO_1:
+		case CHANNEL_MISSION_AUDIO_2:
 		{
-			b2d = true;
+			b2d = TRUE;
 			break;
 		}
 	}
@@ -1893,13 +1994,15 @@ cSampleManager::SetChannelFrequency(uint32 nChannel, uint32 nFreq)
 void
 cSampleManager::SetChannelLoopPoints(uint32 nChannel, uint32 nLoopStart, int32 nLoopEnd)
 {
-	bool b2d = false;
+	bool8 b2d = FALSE;
 
 	switch ( nChannel )
 	{
-		case CHANNEL2D:
+		case CHANNEL_POLICE_RADIO:
+		case CHANNEL_MISSION_AUDIO_1:
+		case CHANNEL_MISSION_AUDIO_2:
 		{
-			b2d = true;
+			b2d = TRUE;
 			break;
 		}
 	}
@@ -1919,13 +2022,15 @@ cSampleManager::SetChannelLoopPoints(uint32 nChannel, uint32 nLoopStart, int32 n
 void
 cSampleManager::SetChannelLoopCount(uint32 nChannel, uint32 nLoopCount)
 {
-	bool b2d = false;
+	bool8 b2d = FALSE;
 
 	switch ( nChannel )
 	{
-		case CHANNEL2D:
+		case CHANNEL_POLICE_RADIO:
+		case CHANNEL_MISSION_AUDIO_1:
+		case CHANNEL_MISSION_AUDIO_2:
 		{
-			b2d = true;
+			b2d = TRUE;
 			break;
 		}
 	}
@@ -1942,16 +2047,18 @@ cSampleManager::SetChannelLoopCount(uint32 nChannel, uint32 nLoopCount)
 	}
 }
 
-bool
+bool8
 cSampleManager::GetChannelUsedFlag(uint32 nChannel)
 {
-	bool b2d = false;
+	bool8 b2d = FALSE;
 
 	switch ( nChannel )
 	{
-		case CHANNEL2D:
+		case CHANNEL_POLICE_RADIO:
+		case CHANNEL_MISSION_AUDIO_1:
+		case CHANNEL_MISSION_AUDIO_2:
 		{
-			b2d = true;
+			b2d = TRUE;
 			break;
 		}
 	}
@@ -1961,14 +2068,14 @@ cSampleManager::GetChannelUsedFlag(uint32 nChannel)
 		if ( opened_2dsamples[nChannel - MAXCHANNELS] )
 			return AIL_sample_status(opened_2dsamples[nChannel - MAXCHANNELS]) == SMP_PLAYING;
 		else
-			return false;
+			return FALSE;
 	}
 	else
 	{
 		if ( opened_samples[nChannel] )
 			return AIL_3D_sample_status(opened_samples[nChannel]) == SMP_PLAYING;
 		else
-			return false;
+			return FALSE;
 	}
 	
 }
@@ -1976,13 +2083,15 @@ cSampleManager::GetChannelUsedFlag(uint32 nChannel)
 void
 cSampleManager::StartChannel(uint32 nChannel)
 {
-	bool b2d = false;
+	bool8 b2d = FALSE;
 
 	switch ( nChannel )
 	{
-		case CHANNEL2D:
+		case CHANNEL_POLICE_RADIO:
+		case CHANNEL_MISSION_AUDIO_1:
+		case CHANNEL_MISSION_AUDIO_2:
 		{
-			b2d = true;
+			b2d = TRUE;
 			break;
 		}
 	}
@@ -2002,13 +2111,15 @@ cSampleManager::StartChannel(uint32 nChannel)
 void
 cSampleManager::StopChannel(uint32 nChannel)
 {
-	bool b2d = false;
+	bool8 b2d = FALSE;
 
 	switch ( nChannel )
 	{
-		case CHANNEL2D:
+		case CHANNEL_POLICE_RADIO:
+		case CHANNEL_MISSION_AUDIO_1:
+		case CHANNEL_MISSION_AUDIO_2:
 		{
-			b2d = true;
+			b2d = TRUE;
 			break;
 		}
 	}
@@ -2045,8 +2156,17 @@ cSampleManager::PreloadStreamedFile(uint32 nFile, uint8 nStream)
 			
 			strcpy(filepath, m_MP3FilesPath);
 			strcat(filepath, StreamedNameTable[nFile]);
+			strcat(filepath, ".VB");
 			
 			mp3Stream[nStream] = AIL_open_stream(DIG, filepath, 0);
+
+			if(!mp3Stream[nStream])
+			{
+				strcpy(filepath, m_MP3FilesPath);
+				strcat(filepath, StreamedNameTable[nFile]);
+				strcat(filepath, ".MP3");
+				mp3Stream[nStream] = AIL_open_stream(DIG, filepath, 0);
+			}
 	
 			if ( mp3Stream[nStream] )
 			{
@@ -2060,12 +2180,12 @@ cSampleManager::PreloadStreamedFile(uint32 nFile, uint8 nStream)
 }
 
 void
-cSampleManager::PauseStream(uint8 nPauseFlag, uint8 nStream)
+cSampleManager::PauseStream(bool8 nPauseFlag, uint8 nStream)
 {
 	if ( m_bInitialised )
 	{
 		if ( mp3Stream[nStream] )
-			AIL_pause_stream(mp3Stream[nStream], nPauseFlag != 0);
+			AIL_pause_stream(mp3Stream[nStream], nPauseFlag != FALSE);
 	}
 }
 
@@ -2079,146 +2199,165 @@ cSampleManager::StartPreloadedStreamedFile(uint8 nStream)
 	}
 }
 
-bool
+bool8
 cSampleManager::StartStreamedFile(uint32 nFile, uint32 nPos, uint8 nStream)
 {
+	int i = 0;
 	uint32 position = nPos;
 	char filename[MAX_PATH];
 	
-	if ( m_bInitialised && nFile < TOTAL_STREAMED_SOUNDS )
+	if ( !m_bInitialised || nFile >= TOTAL_STREAMED_SOUNDS )
+		return FALSE;
+
+	if ( mp3Stream[nStream] )
 	{
-		if ( mp3Stream[nStream] )
-		{
-			AIL_pause_stream(mp3Stream[nStream], 1);
-			AIL_close_stream(mp3Stream[nStream]);
-		}
-		
-		if ( nFile == STREAMED_SOUND_RADIO_MP3_PLAYER )
+		AIL_pause_stream(mp3Stream[nStream], 1);
+		AIL_close_stream(mp3Stream[nStream]);
+	}
+	if ( nFile == STREAMED_SOUND_RADIO_MP3_PLAYER )
+	{
+		do
 		{
-			uint32 i = 0;
-			do {
-				if(i != 0 || _bIsMp3Active) {
-					if(++_CurMP3Index >= nNumMP3s) _CurMP3Index = 0;
-
-					_CurMP3Pos = 0;
-
-					tMP3Entry *mp3 = _GetMP3EntryByIndex(_CurMP3Index);
-
-					if(mp3) {
-						mp3 = _pMP3List;
-						if(mp3 == NULL) {
-							_bIsMp3Active = false;
-							nFile = 0;
-							strcpy(filename, m_MiscomPath);
-							strcat(filename, StreamedNameTable[nFile]);
-
-							mp3Stream[nStream] =
-							    AIL_open_stream(DIG, filename, 0);
-							if(mp3Stream[nStream]) {
-								AIL_set_stream_loop_count(
-								    mp3Stream[nStream], nStreamLoopedFlag[nStream] ? 0 : 1);
-								nStreamLoopedFlag[nStream] = true;
-								AIL_set_stream_ms_position(
-								    mp3Stream[nStream], position);
-								AIL_pause_stream(mp3Stream[nStream],
-								                 0);
-								return true;
-							}
-
-							return false;
-						}
+			// Just switched to MP3 player
+			if ( !_bIsMp3Active && i == 0 )
+			{
+				if ( nPos > nStreamLength[STREAMED_SOUND_RADIO_MP3_PLAYER] )
+					position = 0;
+				tMP3Entry *e = _pMP3List;
+
+				// Try to continue from previous song, if already started
+				if(!_GetMP3PosFromStreamPos(&position, &e) && !e) {
+					nFile = 0;
+					strcpy(filename, m_MiscomPath);
+					strcat(filename, StreamedNameTable[nFile]);
+					strcat(filename, ".VB");
+					mp3Stream[nStream] =
+					    AIL_open_stream(DIG, filename, 0);
+
+					if(!mp3Stream[nStream])
+					{
+						strcpy(filename, m_MP3FilesPath);
+						strcat(filename, StreamedNameTable[nFile]);
+						strcat(filename, ".MP3");
+						mp3Stream[nStream] = AIL_open_stream(DIG, filename, 0);
 					}
+					if(mp3Stream[nStream]) {
+						AIL_set_stream_loop_count(mp3Stream[nStream], nStreamLoopedFlag[nStream] ? 0 : 1);
+						nStreamLoopedFlag[nStream] = TRUE;
+						AIL_set_stream_ms_position(mp3Stream[nStream], position);
+						AIL_pause_stream(mp3Stream[nStream], 0);
+						return TRUE;
+					}
+					return FALSE;
 
-					if(mp3->pLinkPath != NULL)
-						mp3Stream[nStream] =
-						    AIL_open_stream(DIG, mp3->pLinkPath, 0);
+				} else {
+					if ( e->pLinkPath != NULL )
+						mp3Stream[nStream] = AIL_open_stream(DIG, e->pLinkPath, 0);
 					else {
 						strcpy(filename, _mp3DirectoryPath);
-						strcat(filename, mp3->aFilename);
-
-						mp3Stream[nStream] =
-						    AIL_open_stream(DIG, filename, 0);
+						strcat(filename, e->aFilename);
+					
+						mp3Stream[nStream] = AIL_open_stream(DIG, filename, 0);
 					}
-
-					if(mp3Stream[nStream]) {
+										
+					if ( mp3Stream[nStream] ) {
 						AIL_set_stream_loop_count(mp3Stream[nStream], 1);
-						AIL_set_stream_ms_position(mp3Stream[nStream], 0);
+						AIL_set_stream_ms_position(mp3Stream[nStream], position);
 						AIL_pause_stream(mp3Stream[nStream], 0);
-						return true;
+						
+						_bIsMp3Active = TRUE;
+				
+						return TRUE;
 					}
-
-					_bIsMp3Active = false;
-					continue;
+					// fall through, start playing from another song
 				}
-				if ( nPos > nStreamLength[STREAMED_SOUND_RADIO_MP3_PLAYER] )
-					position = 0;
-				
-				tMP3Entry *e;
-				if ( !_GetMP3PosFromStreamPos(&position, &e) )
+			} else {
+				if(++_CurMP3Index >= nNumMP3s) _CurMP3Index = 0;
+
+				_CurMP3Pos = 0;
+
+				tMP3Entry *mp3 = _GetMP3EntryByIndex(_CurMP3Index);
+				if ( !mp3 )
 				{
-					if ( e == NULL )
+					mp3 = _pMP3List;
+					if ( !_pMP3List )
 					{
 						nFile = 0;
+						_bIsMp3Active = 0;
 						strcpy(filename, m_MiscomPath);
 						strcat(filename, StreamedNameTable[nFile]);
+						strcat(filename, ".VB");
+
 						mp3Stream[nStream] =
 						    AIL_open_stream(DIG, filename, 0);
+						if(!mp3Stream[nStream])
+						{
+							strcpy(filename, m_MiscomPath);
+							strcat(filename, StreamedNameTable[nFile]);
+							strcat(filename, ".MP3");
+							mp3Stream[nStream] = AIL_open_stream(DIG, filename, 0);
+						}
 						if(mp3Stream[nStream]) {
-							AIL_set_stream_loop_count(mp3Stream[nStream], nStreamLoopedFlag[nStream] ? 0 : 1);
-							nStreamLoopedFlag[nStream] = true;
-							AIL_set_stream_ms_position(mp3Stream[nStream], position);
-							AIL_pause_stream(mp3Stream[nStream], 0);
-							return true;
+							AIL_set_stream_loop_count(
+							    mp3Stream[nStream], nStreamLoopedFlag[nStream] ? 0 : 1);
+							nStreamLoopedFlag[nStream] = TRUE;
+							AIL_set_stream_ms_position(
+							    mp3Stream[nStream], position);
+							AIL_pause_stream(mp3Stream[nStream],
+							                 0);
+							return TRUE;
 						}
-
-						return false;
+						return FALSE;
 					}
 				}
-
-				if ( e->pLinkPath != NULL )
-					mp3Stream[nStream] = AIL_open_stream(DIG, e->pLinkPath, 0);
-				else
-				{
+				if(mp3->pLinkPath != NULL)
+					mp3Stream[nStream] = AIL_open_stream(DIG, mp3->pLinkPath, 0);
+				else {
 					strcpy(filename, _mp3DirectoryPath);
-					strcat(filename, e->aFilename);
-				
-					mp3Stream[nStream] = AIL_open_stream(DIG, filename, 0);
+					strcat(filename, mp3->aFilename);
+
+					mp3Stream[nStream] =
+					    AIL_open_stream(DIG, filename, 0);
 				}
-									
-				if ( mp3Stream[nStream] )
-				{
+
+				if(mp3Stream[nStream]) {
 					AIL_set_stream_loop_count(mp3Stream[nStream], 1);
-					AIL_set_stream_ms_position(mp3Stream[nStream], position);
+					AIL_set_stream_ms_position(mp3Stream[nStream], 0);
 					AIL_pause_stream(mp3Stream[nStream], 0);
-					
-					_bIsMp3Active = true;
-			
-					return true;
+#ifdef FIX_BUGS
+					_bIsMp3Active = TRUE;
+#endif
+					return TRUE;
 				}
-				
-				_bIsMp3Active = false;
-
-			} while(++i < nNumMP3s);
 
-			position = 0;
-			nFile = 0;
+			}
+			_bIsMp3Active = 0;
 		}
-		
+		while ( ++i < nNumMP3s );
+		position = 0;
+		nFile = 0;
+	}
+	strcpy(filename, m_MiscomPath);
+	strcat(filename, StreamedNameTable[nFile]);
+	strcat(filename, ".VB");
+	
+	mp3Stream[nStream] = AIL_open_stream(DIG, filename, 0);
+	if( !mp3Stream[nStream] )
+	{
 		strcpy(filename, m_MiscomPath);
 		strcat(filename, StreamedNameTable[nFile]);
-		
+		strcat(filename, ".MP3");
 		mp3Stream[nStream] = AIL_open_stream(DIG, filename, 0);
-		if ( mp3Stream[nStream] )
-		{
-			AIL_set_stream_loop_count(mp3Stream[nStream], nStreamLoopedFlag[nStream] ? 0 : 1);
-			nStreamLoopedFlag[nStream] = true;
-			AIL_set_stream_ms_position(mp3Stream[nStream], position);
-			AIL_pause_stream(mp3Stream[nStream], 0);
-			return true;
-		}
 	}
-	
-	return false;
+	if ( mp3Stream[nStream] )
+	{
+		AIL_set_stream_loop_count(mp3Stream[nStream], nStreamLoopedFlag[nStream] ? 0 : 1);
+		nStreamLoopedFlag[nStream] = TRUE;
+		AIL_set_stream_ms_position(mp3Stream[nStream], position);
+		AIL_pause_stream(mp3Stream[nStream], 0);
+		return TRUE;
+	}
+	return FALSE;
 }
 
 void
@@ -2234,7 +2373,7 @@ cSampleManager::StopStreamedFile(uint8 nStream)
 			mp3Stream[nStream] = NULL;
 			
 			if ( nStream == 0 )
-				_bIsMp3Active = false;
+				_bIsMp3Active = FALSE;
 		}
 	}
 }
@@ -2272,7 +2411,7 @@ cSampleManager::GetStreamedFilePosition(uint8 nStream)
 }
 
 void
-cSampleManager::SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, uint8 nEffectFlag, uint8 nStream)
+cSampleManager::SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, bool8 nEffectFlag, uint8 nStream)
 {
 	uint8 vol = nVolume;
 	float boostMult = 0.0f;
@@ -2313,7 +2452,7 @@ cSampleManager::GetStreamedFileLength(uint8 nStream)
 	return 0;
 }
 
-bool
+bool8
 cSampleManager::IsStreamPlaying(uint8 nStream)
 {
 	if ( m_bInitialised )
@@ -2321,23 +2460,25 @@ cSampleManager::IsStreamPlaying(uint8 nStream)
 		if ( mp3Stream[nStream] )
 		{
 			if ( AIL_stream_status(mp3Stream[nStream]) == SMP_PLAYING )
-				return true;
+				return TRUE;
 			else
-				return false;
+				return FALSE;
 		}
 	}
 	
-	return false;
+	return FALSE;
 }
 
-bool
+bool8
 cSampleManager::InitialiseSampleBanks(void)
 {
+	SetUpDebugBanksInfo();
+
 	int32 nBank = SFX_BANK_0;
 	
 	fpSampleDescHandle = fopen(SampleBankDescFilename, "rb");
 	if ( fpSampleDescHandle == NULL )
-		return false;
+		return FALSE;
 	
 	fpSampleDataHandle = fopen(SampleBankDataFilename, "rb");
 	if ( fpSampleDataHandle == NULL )
@@ -2345,7 +2486,7 @@ cSampleManager::InitialiseSampleBanks(void)
 		fclose(fpSampleDescHandle);
 		fpSampleDescHandle = NULL;
 		
-		return false;
+		return FALSE;
 	}
 	
 	fseek(fpSampleDataHandle, 0, SEEK_END);
@@ -2356,7 +2497,7 @@ cSampleManager::InitialiseSampleBanks(void)
 	
 	fclose(fpSampleDescHandle);
 	fpSampleDescHandle = NULL;
-	
+
 	for ( int32 i = 0; i < TOTAL_AUDIO_SAMPLES; i++ )
 	{
 #ifdef FIX_BUGS
@@ -2372,12 +2513,12 @@ cSampleManager::InitialiseSampleBanks(void)
 	nSampleBankSize[SFX_BANK_0] = nSampleBankDiscStartOffset[SFX_BANK_PED_COMMENTS] - nSampleBankDiscStartOffset[SFX_BANK_0];
 	nSampleBankSize[SFX_BANK_PED_COMMENTS] = _nSampleDataEndOffset                       - nSampleBankDiscStartOffset[SFX_BANK_PED_COMMENTS];
 	
-	return true;
+	return TRUE;
 }
 
 
 void
-cSampleManager::SetStreamedFileLoopFlag(uint8 nLoopFlag, uint8 nChannel)
+cSampleManager::SetStreamedFileLoopFlag(bool8 nLoopFlag, uint8 nChannel)
 {
 	if (m_bInitialised)
 		nStreamLoopedFlag[nChannel] = nLoopFlag;
diff --git a/src/audio/sampman_null.cpp b/src/audio/sampman_null.cpp
index e9a9eaa1..a5ed2889 100644
--- a/src/audio/sampman_null.cpp
+++ b/src/audio/sampman_null.cpp
@@ -4,7 +4,7 @@
 #include "AudioManager.h"
 
 cSampleManager SampleManager;
-bool _bSampmanInitialised = false;
+bool8 _bSampmanInitialised = FALSE;
 
 uint32 BankStartOffset[MAX_SFX_BANKS];
 uint32     nNumMP3s;
@@ -60,7 +60,7 @@ int8 cSampleManager::SetCurrent3DProvider(uint8 nProvider)
 	return 0;
 }
 
-bool
+bool8
 cSampleManager::IsMP3RadioChannelAvailable(void)
 {
 	return nNumMP3s != 0;
@@ -75,10 +75,10 @@ void cSampleManager::ReacquireDigitalHandle(void)
 {
 }
 
-bool
+bool8
 cSampleManager::Initialise(void)
 {
-	return true;
+	return TRUE;
 }
 
 void
@@ -87,9 +87,9 @@ cSampleManager::Terminate(void)
 
 }
 
-bool cSampleManager::CheckForAnAudioFileOnCD(void)
+bool8 cSampleManager::CheckForAnAudioFileOnCD(void)
 {
-	return true;
+	return TRUE;
 }
 
 char cSampleManager::GetCDAudioDriveLetter(void)
@@ -129,15 +129,15 @@ cSampleManager::SetMusicFadeVolume(uint8 nVolume)
 }
 
 void
-cSampleManager::SetMonoMode(uint8 nMode)
+cSampleManager::SetMonoMode(bool8 nMode)
 {
 }
 
-bool
+bool8
 cSampleManager::LoadSampleBank(uint8 nBank)
 {
 	ASSERT( nBank < MAX_SFX_BANKS );
-	return false;
+	return FALSE;
 }
 
 void
@@ -146,20 +146,20 @@ cSampleManager::UnloadSampleBank(uint8 nBank)
 	ASSERT( nBank < MAX_SFX_BANKS );
 }
 
-bool
+bool8
 cSampleManager::IsSampleBankLoaded(uint8 nBank)
 {
 	ASSERT( nBank < MAX_SFX_BANKS );
 	
-	return false;
+	return FALSE;
 }
 
-bool
+bool8
 cSampleManager::IsPedCommentLoaded(uint32 nComment)
 {
 	ASSERT( nComment < TOTAL_AUDIO_SAMPLES );
 
-	return false;
+	return FALSE;
 }
 
 
@@ -169,11 +169,11 @@ cSampleManager::_GetPedCommentSlot(uint32 nComment)
 	return -1;
 }
 
-bool
+bool8
 cSampleManager::LoadPedComment(uint32 nComment)
 {
 	ASSERT( nComment < TOTAL_AUDIO_SAMPLES );
-	return false;
+	return FALSE;
 }
 
 int32
@@ -210,22 +210,22 @@ cSampleManager::GetSampleLength(uint32 nSample)
 	return 0;
 }
 
-bool cSampleManager::UpdateReverb(void)
+bool8 cSampleManager::UpdateReverb(void)
 {
-	return false;
+	return FALSE;
 }
 
 void
-cSampleManager::SetChannelReverbFlag(uint32 nChannel, uint8 nReverbFlag)
+cSampleManager::SetChannelReverbFlag(uint32 nChannel, bool8 nReverbFlag)
 {
 	ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
 }
 
-bool
+bool8
 cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank)
 {
 	ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
-	return false;
+	return FALSE;
 }
 
 void
@@ -281,12 +281,12 @@ cSampleManager::SetChannelLoopCount(uint32 nChannel, uint32 nLoopCount)
 	ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
 }
 
-bool
+bool8
 cSampleManager::GetChannelUsedFlag(uint32 nChannel)
 {
 	ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
 
-	return false;
+	return FALSE;
 }
 
 void
@@ -308,7 +308,7 @@ cSampleManager::PreloadStreamedFile(uint32 nFile, uint8 nStream)
 }
 
 void
-cSampleManager::PauseStream(uint8 nPauseFlag, uint8 nStream)
+cSampleManager::PauseStream(bool8 nPauseFlag, uint8 nStream)
 {
 	ASSERT( nStream < MAX_STREAMS );
 }
@@ -319,12 +319,12 @@ cSampleManager::StartPreloadedStreamedFile(uint8 nStream)
 	ASSERT( nStream < MAX_STREAMS );
 }
 
-bool
+bool8
 cSampleManager::StartStreamedFile(uint32 nFile, uint32 nPos, uint8 nStream)
 {	
 	ASSERT( nStream < MAX_STREAMS );
 	
-	return false;
+	return FALSE;
 }
 
 void
@@ -342,7 +342,7 @@ cSampleManager::GetStreamedFilePosition(uint8 nStream)
 }
 
 void
-cSampleManager::SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, uint8 nEffectFlag, uint8 nStream)
+cSampleManager::SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, bool8 nEffectFlag, uint8 nStream)
 {
 	ASSERT( nStream < MAX_STREAMS );
 }
@@ -355,23 +355,23 @@ cSampleManager::GetStreamedFileLength(uint8 nStream)
 	return 1;
 }
 
-bool
+bool8
 cSampleManager::IsStreamPlaying(uint8 nStream)
 {
 	ASSERT( nStream < MAX_STREAMS );
 
-	return false;
+	return FALSE;
 }
 
-bool
+bool8
 cSampleManager::InitialiseSampleBanks(void)
 {
 	
-	return true;
+	return TRUE;
 }
 
 void
-cSampleManager::SetStreamedFileLoopFlag(uint8 nLoopFlag, uint8 nChannel)
+cSampleManager::SetStreamedFileLoopFlag(bool8 nLoopFlag, uint8 nChannel)
 {
 }
 
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index 7da871a5..186990a4 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -45,11 +45,9 @@
 #endif
 
 //TODO: fix eax3 reverb
-//TODO: max channels
-//TODO: loop count
 
 cSampleManager SampleManager;
-bool _bSampmanInitialised = false;
+bool8 _bSampmanInitialised = FALSE;
 
 uint32 BankStartOffset[MAX_SFX_BANKS];
 
@@ -61,16 +59,18 @@ int           usingEAX3=0;
 ALCdevice    *ALDevice = NULL;
 ALCcontext   *ALContext = NULL;
 unsigned int _maxSamples;
-float        _fPrevEaxRatioDestination;
+float        _fPrevEaxRatioDestination; 
+bool         _effectsSupported = false;
 bool         _usingEFX;
 float        _fEffectsLevel;
 ALuint       ALEffect = AL_EFFECT_NULL;
 ALuint       ALEffectSlot = AL_EFFECTSLOT_NULL;
 struct
-{
-	char id[256];
+{ 
+	const char *id;
 	char name[256];
 	int sources;
+	bool bSupportsFx;
 }providers[MAXPROVIDERS];
 
 int defaultProvider;
@@ -85,7 +85,7 @@ OggOpusFile *fpSampleDataHandle;
 #else
 FILE *fpSampleDataHandle;
 #endif
-bool  bSampleBankLoaded            [MAX_SFX_BANKS];
+bool8  bSampleBankLoaded            [MAX_SFX_BANKS];
 int32 nSampleBankDiscStartOffset   [MAX_SFX_BANKS];
 int32 nSampleBankSize              [MAX_SFX_BANKS];
 uintptr nSampleBankMemoryStartAddress[MAX_SFX_BANKS];
@@ -95,8 +95,8 @@ int32 nPedSlotSfx    [MAX_PEDSFX];
 int32 nPedSlotSfxAddr[MAX_PEDSFX];
 uint8 nCurrentPedSlot;
 
-CChannel aChannel[MAXCHANNELS+MAX2DCHANNELS];
-uint8 nChannelVolume[MAXCHANNELS+MAX2DCHANNELS];
+CChannel aChannel[NUM_CHANNELS];
+uint8 nChannelVolume[NUM_CHANNELS];
 
 uint32 nStreamLength[TOTAL_STREAMED_SOUNDS];
 ALuint ALStreamSources[MAX_STREAMS][2];
@@ -119,10 +119,10 @@ char _mp3DirectoryPath[MAX_PATH];
 CStream    *aStream[MAX_STREAMS];
 uint8      nStreamPan   [MAX_STREAMS];
 uint8      nStreamVolume[MAX_STREAMS];
-uint8      nStreamLoopedFlag[MAX_STREAMS];
+bool8      nStreamLoopedFlag[MAX_STREAMS];
 uint32 _CurMP3Index;
 int32 _CurMP3Pos;
-bool _bIsMp3Active;
+bool8 _bIsMp3Active;
 ///////////////////////////////////////////////////////////////
 //	Env		Size	Diffus	Room	RoomHF	RoomLF	DecTm	DcHF	DcLF	Refl	RefDel	Ref Pan				Revb	RevDel		Rev Pan				EchTm	EchDp	ModTm	ModDp	AirAbs	HFRef		LFRef	RRlOff	FLAGS
 EAXLISTENERPROPERTIES StartEAX3 =
@@ -136,7 +136,7 @@ EAXLISTENERPROPERTIES EAX3Params;
 
 bool IsFXSupported()
 {
-	return usingEAX || usingEAX3 || _usingEFX;
+	return _effectsSupported; // usingEAX || usingEAX3 || _usingEFX;
 }
 
 void EAX_SetAll(const EAXLISTENERPROPERTIES *allparameters)
@@ -151,21 +151,22 @@ static void
 add_providers()
 {
 	SampleManager.SetNum3DProvidersAvailable(0);
-	
-	ALDeviceList *pDeviceList = NULL;
-	pDeviceList = new ALDeviceList();
+
+	static ALDeviceList DeviceList;
+	ALDeviceList *pDeviceList = &DeviceList;
 
 	if ((pDeviceList) && (pDeviceList->GetNumDevices()))
 	{
 		const int devNumber = Min(pDeviceList->GetNumDevices(), MAXPROVIDERS);
 		int n = 0;
 		
-		for (int i = 0; i < devNumber; i++) 
+		//for (int i = 0; i < devNumber; i++) 
+		int i = pDeviceList->GetDefaultDevice();
 		{
 			if ( n < MAXPROVIDERS )
-			{
-				strcpy(providers[n].id, pDeviceList->GetDeviceName(i));
-				strncpy(providers[n].name, pDeviceList->GetDeviceName(i), sizeof(providers[n].name));
+			{ 
+				providers[n].id = pDeviceList->GetDeviceName(i);
+				strcpy(providers[n].name, "OPENAL SOFT");
 				providers[n].sources = pDeviceList->GetMaxNumSources(i);
 				SampleManager.Set3DProviderName(n, providers[n].name);
 				n++;
@@ -176,23 +177,24 @@ add_providers()
 				|| pDeviceList->IsExtensionSupported(i, ADEXT_EAX3) 
 				|| pDeviceList->IsExtensionSupported(i, ADEXT_EAX4)
 				|| pDeviceList->IsExtensionSupported(i, ADEXT_EAX5) )
-			{
+			{ 
+				providers[n - 1].bSupportsFx = true;
 				if ( n < MAXPROVIDERS )
-				{
-					strcpy(providers[n].id, pDeviceList->GetDeviceName(i));
-					strncpy(providers[n].name, pDeviceList->GetDeviceName(i), sizeof(providers[n].name));
-					strcat(providers[n].name, " EAX");
+				{ 
+					providers[n].id = pDeviceList->GetDeviceName(i);
+					strcpy(providers[n].name, "OPENAL SOFT EAX");
 					providers[n].sources = pDeviceList->GetMaxNumSources(i);
+					providers[n].bSupportsFx = true;
 					SampleManager.Set3DProviderName(n, providers[n].name);
 					n++;
 				}
 				
 				if ( n < MAXPROVIDERS )
-				{
-					strcpy(providers[n].id, pDeviceList->GetDeviceName(i));
-					strncpy(providers[n].name, pDeviceList->GetDeviceName(i), sizeof(providers[n].name));
-					strcat(providers[n].name, " EAX3");
+				{ 
+					providers[n].id = pDeviceList->GetDeviceName(i);
+					strcpy(providers[n].name, "OPENAL SOFT EAX3");
 					providers[n].sources = pDeviceList->GetMaxNumSources(i);
+					providers[n].bSupportsFx = true;
 					SampleManager.Set3DProviderName(n, providers[n].name);
 					n++;
 				}
@@ -202,76 +204,38 @@ add_providers()
 	
 		for(int j=n;j<MAXPROVIDERS;j++)
 			SampleManager.Set3DProviderName(j, NULL);
-		
-		defaultProvider = pDeviceList->GetDefaultDevice();
-		if ( defaultProvider > MAXPROVIDERS )
-			defaultProvider = 0;
+
+		// devices are gone now
+		//defaultProvider = pDeviceList->GetDefaultDevice();
+		//if ( defaultProvider > MAXPROVIDERS )
+		defaultProvider = 0;
 	}
-	
-	delete pDeviceList;
 }
 
 static void
 release_existing()
 {
-	for ( int32 i = 0; i < MAXCHANNELS; i++ )
-		aChannel[i].Term();
-	aChannel[CHANNEL2D].Term();
-	
 	if ( IsFXSupported() )
 	{
 		if ( alIsEffect(ALEffect) )
 		{
 			alEffecti(ALEffect, AL_EFFECT_TYPE, AL_EFFECT_NULL);
-			alDeleteEffects(1, &ALEffect);
-			ALEffect = AL_EFFECT_NULL;
 		}
 		
 		if (alIsAuxiliaryEffectSlot(ALEffectSlot))
 		{
 			alAuxiliaryEffectSloti(ALEffectSlot, AL_EFFECTSLOT_EFFECT, AL_EFFECT_NULL);
-			
-			alDeleteAuxiliaryEffectSlots(1, &ALEffectSlot);
-			ALEffectSlot = AL_EFFECTSLOT_NULL;
 		}
 	}
-	
-	for ( int32 i = 0; i < MAX_STREAMS; i++ )
-	{
-		CStream *stream = aStream[i];
-		if (stream)
-			stream->ProviderTerm();
-		
-		alDeleteBuffers(NUM_STREAMBUFFERS, ALStreamBuffers[i]);
-	}
-	alDeleteSources(MAX_STREAMS*2, ALStreamSources[0]);
-	
-	CChannel::DestroyChannels();
-	
-	if ( ALContext )
-	{
-		alcMakeContextCurrent(NULL);
-		alcSuspendContext(ALContext);
-		alcDestroyContext(ALContext);
-	}
-	if ( ALDevice )
-		alcCloseDevice(ALDevice);
-	
-	ALDevice = NULL;
-	ALContext = NULL;
-	
-	_fPrevEaxRatioDestination = 0.0f;
-	_usingEFX                 = false;
-	_fEffectsLevel            = 0.0f;
-	
+
 	DEV("release_existing()\n");
 }
 
-static bool
+static bool8
 set_new_provider(int index)
 {
 	if ( curprovider == index )
-		return true;
+		return TRUE;
 	
 	curprovider = index;
 	
@@ -281,61 +245,6 @@ set_new_provider(int index)
 	{
 		DEV("set_new_provider()\n");
 		
-		//TODO:
-		_maxSamples = MAXCHANNELS;
-		
-		ALCint attr[] = {ALC_FREQUENCY,MAX_FREQ,
-						ALC_MONO_SOURCES, MAX_STREAMS * 2 + MAXCHANNELS,
-						0,
-						};
-		
-		ALDevice  = alcOpenDevice(providers[index].id);
-		ASSERT(ALDevice != NULL);
-		
-		ALContext = alcCreateContext(ALDevice, attr);
-		ASSERT(ALContext != NULL);
-		
-		alcMakeContextCurrent(ALContext);
-	
-		const char* ext=(const char*)alGetString(AL_EXTENSIONS);
-		ASSERT(strstr(ext,"AL_SOFT_loop_points")!=NULL);
-		if ( strstr(ext,"AL_SOFT_loop_points")==NULL )
-		{
-			curprovider=-1;
-			release_existing();
-			return false;
-		}
-		
-		alListenerf (AL_GAIN,     1.0f);
-		alListener3f(AL_POSITION, 0.0f, 0.0f, 0.0f);
-		alListener3f(AL_VELOCITY, 0.0f, 0.0f, 0.0f);
-		ALfloat orientation[6] = { 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f };
-		alListenerfv(AL_ORIENTATION, orientation);
-		
-		alDistanceModel(AL_INVERSE_DISTANCE_CLAMPED);
-		
-		if ( alcIsExtensionPresent(ALDevice, (ALCchar*)ALC_EXT_EFX_NAME) )
-		{
-			alGenAuxiliaryEffectSlots(1, &ALEffectSlot);
-			alGenEffects(1, &ALEffect);
-		}
-
-		alGenSources(MAX_STREAMS*2, ALStreamSources[0]);
-		for ( int32 i = 0; i < MAX_STREAMS; i++ )
-		{
-			alGenBuffers(NUM_STREAMBUFFERS, ALStreamBuffers[i]);
-			alSourcei(ALStreamSources[i][0], AL_SOURCE_RELATIVE, AL_TRUE);
-			alSource3f(ALStreamSources[i][0], AL_POSITION, 0.0f, 0.0f, 0.0f);
-			alSourcef(ALStreamSources[i][0], AL_GAIN, 1.0f);
-			alSourcei(ALStreamSources[i][1], AL_SOURCE_RELATIVE, AL_TRUE);
-			alSource3f(ALStreamSources[i][1], AL_POSITION, 0.0f, 0.0f, 0.0f);
-			alSourcef(ALStreamSources[i][1], AL_GAIN, 1.0f);
-			
-			CStream *stream = aStream[i];
-			if (stream)
-				stream->ProviderInit();
-		}
-		
 		usingEAX = 0;
 		usingEAX3 = 0;
 		_usingEFX = false;
@@ -343,16 +252,16 @@ set_new_provider(int index)
 		if ( !strcmp(&providers[index].name[strlen(providers[index].name) - strlen(" EAX3")], " EAX3") 
 				&& alcIsExtensionPresent(ALDevice, (ALCchar*)ALC_EXT_EFX_NAME) )
 		{
-			EAX_SetAll(&FinishEAX3);
 			
 			usingEAX = 1;
 			usingEAX3 = 1;
+			alAuxiliaryEffectSloti(ALEffectSlot, AL_EFFECTSLOT_EFFECT, ALEffect);
+			EAX_SetAll(&FinishEAX3);
 
 			DEV("EAX3\n");
 		}
 		else if ( alcIsExtensionPresent(ALDevice, (ALCchar*)ALC_EXT_EFX_NAME) )
 		{
-			EAX_SetAll(&EAX30_ORIGINAL_PRESETS[EAX_ENVIRONMENT_CAVE]);
 			
 			if ( !strcmp(&providers[index].name[strlen(providers[index].name) - strlen(" EAX")], " EAX"))
 			{
@@ -364,33 +273,25 @@ set_new_provider(int index)
 				_usingEFX = true;
 				DEV("EFX\n");
 			}
+			alAuxiliaryEffectSloti(ALEffectSlot, AL_EFFECTSLOT_EFFECT, ALEffect);
+			EAX_SetAll(&EAX30_ORIGINAL_PRESETS[EAX_ENVIRONMENT_CAVE]);
 		}
 		
 		//SampleManager.SetSpeakerConfig(speaker_type);
 		
-		CChannel::InitChannels();
-
-		for ( int32 i = 0; i < MAXCHANNELS; i++ )
-			aChannel[i].Init(i);
-		aChannel[CHANNEL2D].Init(CHANNEL2D, true);
-		
 		if ( IsFXSupported() )
 		{
-			/**/
-			alAuxiliaryEffectSloti(ALEffectSlot, AL_EFFECTSLOT_EFFECT, ALEffect);
-			/**/
-			
 			for ( int32 i = 0; i < MAXCHANNELS; i++ )
 				aChannel[i].SetReverbMix(ALEffectSlot, 0.0f);
 		}
 		
-		return true;
+		return TRUE;
 	}
 	
-	return false;
+	return FALSE;
 }
 
-static bool
+static bool8
 IsThisTrackAt16KHz(uint32 track)
 {
 	return false;// track == STREAMED_SOUND_RADIO_KCHAT || track == STREAMED_SOUND_RADIO_VCPR || track == STREAMED_SOUND_RADIO_POLICE;
@@ -406,6 +307,80 @@ cSampleManager::~cSampleManager(void)
 	
 }
 
+int gBankStartOffset[67];
+
+void
+SetUpDebugBanksInfo()
+{
+	gBankStartOffset[3] = SFX_FE_BACK;
+	gBankStartOffset[4] = SFX_CAR_ACCEL_1;
+	gBankStartOffset[5] = SFX_CAR_ACCEL_2;
+	gBankStartOffset[9] = SFX_CAR_ACCEL_6;
+	gBankStartOffset[10] = SFX_CAR_ACCEL_7;
+	gBankStartOffset[1] = SFX_EMPTY;
+	gBankStartOffset[11] = SFX_CAR_ACCEL_8;
+	gBankStartOffset[7] = SFX_CAR_ACCEL_4;
+	gBankStartOffset[15] = SFX_CAR_ACCEL_12;
+	gBankStartOffset[13] = SFX_CAR_ACCEL_10;
+	gBankStartOffset[16] = SFX_CAR_CHAINSAW_IDLE;
+	gBankStartOffset[0] = SFX_AIR_BRAKES;
+	gBankStartOffset[17] = SFX_RC_IDLE;
+	gBankStartOffset[6] = SFX_CAR_ACCEL_3;
+	gBankStartOffset[19] = SFX_CAR_ACCEL_16;
+	gBankStartOffset[12] = SFX_CAR_ACCEL_9;
+	gBankStartOffset[2] = SFX_AMBULAN_VOICE_1_VAN_1;
+	gBankStartOffset[21] = SFX_CAR_ACCEL_18;
+	gBankStartOffset[22] = SFX_CAR_ACCEL_19;
+	gBankStartOffset[8] = SFX_CAR_ACCEL_5;
+	gBankStartOffset[23] = SFX_CAR_ACCEL_20;
+	gBankStartOffset[14] = SFX_CAR_ACCEL_11;
+	gBankStartOffset[20] = SFX_CAR_ACCEL_17;
+	gBankStartOffset[18] = SFX_CAR_RC_HELI;
+	gBankStartOffset[25] = SFX_CAR_AFTER_ACCEL_21;
+	gBankStartOffset[26] = SFX_CAR_FINGER_OFF_ACCEL_21;
+	gBankStartOffset[27] = SFX_CAR_ACCEL_22;
+	gBankStartOffset[28] = SFX_CAR_AFTER_ACCEL_22;
+	gBankStartOffset[29] = SFX_CAR_FINGER_OFF_ACCEL_22;
+	gBankStartOffset[24] = SFX_CAR_ACCEL_21;
+	gBankStartOffset[30] = SFX_HELI_APACHE_1;
+	gBankStartOffset[31] = SFX_HELI_UNUSED_1;
+	gBankStartOffset[32] = SFX_HELI_UNUSED_2;
+	gBankStartOffset[33] = SFX_HELI_UNUSED_3;
+	gBankStartOffset[34] = SFX_HELI_UNUSED_4;
+	gBankStartOffset[35] = SFX_SEAPLANE_LOW;
+	gBankStartOffset[37] = SFX_PLANE_UNUSED_2;
+	gBankStartOffset[38] = SFX_PLANE_UNUSED_3;
+	gBankStartOffset[39] = SFX_PLANE_UNUSED_4;
+	gBankStartOffset[40] = SFX_BUILDINGS_BANK_ALARM;
+	gBankStartOffset[41] = SFX_BUILDING_SNORE;
+	gBankStartOffset[36] = SFX_PLANE_UNUSED_1;
+	gBankStartOffset[43] = SFX_BUILDING_BAR_2;
+	gBankStartOffset[44] = SFX_BUILDING_BAR_3;
+	gBankStartOffset[45] = SFX_BUILDING_BAR_4;
+	gBankStartOffset[46] = SFX_BUILDING_MAL1;
+	gBankStartOffset[47] = SFX_BUILDING_MAL2;
+	gBankStartOffset[42] = SFX_BUILDING_BAR_1;
+	gBankStartOffset[49] = SFX_BUILDING_STR1;
+	gBankStartOffset[50] = SFX_BUILDING_STR2;
+	gBankStartOffset[51] = SFX_BUILDING_STR3;
+	gBankStartOffset[52] = SFX_BUILDING_CHURCH;
+	gBankStartOffset[53] = SFX_BUILDING_FAN_1;
+	gBankStartOffset[48] = SFX_BUILDING_MAL3;
+	gBankStartOffset[55] = SFX_BUILDING_INSECTS_1;
+	gBankStartOffset[56] = SFX_BUILDING_INSECTS_2;
+	gBankStartOffset[54] = SFX_BUILDING_FAN_2;
+	gBankStartOffset[57] = SFX_CLUB_1;
+	gBankStartOffset[58] = SFX_CLUB_2;
+	gBankStartOffset[59] = SFX_CLUB_3;
+	gBankStartOffset[60] = SFX_CLUB_4;
+	gBankStartOffset[61] = SFX_FOOTSTEP_GRASS_1;
+	gBankStartOffset[62] = SFX_FOOTSTEP_GRAVEL_1;
+	gBankStartOffset[63] = SFX_FOOTSTEP_WOOD_1;
+	gBankStartOffset[64] = SFX_FOOTSTEP_METAL_1;
+	gBankStartOffset[65] = SFX_FOOTSTEP_WATER_1;
+	gBankStartOffset[66] = SFX_FOOTSTEP_SAND_1;
+}
+
 void cSampleManager::SetSpeakerConfig(int32 nConfig)
 {
 
@@ -483,13 +458,13 @@ cSampleManager::AutoDetect3DProviders()
 	return -1;
 }
 
-static bool
+static bool8
 _ResolveLink(char const *path, char *out)
 {
 #ifdef _WIN32
 	size_t len = strlen(path);
 	if (len < 4 || strcmp(&path[len - 4], ".lnk") != 0)
-		return false;
+		return FALSE;
 		
 	IShellLink* psl;
 	WIN32_FIND_DATA fd;
@@ -524,7 +499,7 @@ _ResolveLink(char const *path, char *out)
 						ppf->Release();
 						psl->Release();
 #endif
-						return true;
+						return TRUE;
 					}
 				}
 			}
@@ -534,31 +509,31 @@ _ResolveLink(char const *path, char *out)
 		psl->Release();
 	}
 	
-	return false;
+	return FALSE;
 #else
 	struct stat sb;
 
 	if (lstat(path, &sb) == -1) {
 		perror("lstat: ");
-		return false;
+		return FALSE;
 	}
 
 	if (S_ISLNK(sb.st_mode)) {
 		char* linkname = (char*)alloca(sb.st_size + 1);
 		if (linkname == NULL) {
 			fprintf(stderr, "insufficient memory\n");
-			return false;
+			return FALSE;
 		}
 
 		if (readlink(path, linkname, sb.st_size + 1) < 0) {
 			perror("readlink: ");
-			return false;
+			return FALSE;
 		}
 		linkname[sb.st_size] = '\0';
 		strcpy(out, linkname);
-		return true;
+		return TRUE;
 	} else {
-		return false;
+		return FALSE;
 	}
 #endif
 }
@@ -567,8 +542,8 @@ static void
 _FindMP3s(void)
 {
 	tMP3Entry *pList;
-	bool bShortcut;	
-	bool bInitFirstEntry;	
+	bool8 bShortcut;	
+	bool8 bInitFirstEntry;	
 	HANDLE hFind;
 	char path[MAX_PATH];
 	char filepath[MAX_PATH*2];
@@ -611,9 +586,9 @@ _FindMP3s(void)
 	{
 		OutputDebugString("Resolving Link");
 		OutputDebugString(filepath);
-		bShortcut = true;
+		bShortcut = TRUE;
 	} else
-		bShortcut = false;
+		bShortcut = FALSE;
 	
 	aStream[0] = new CStream(filepath, ALStreamSources[0], ALStreamBuffers[0]);
 
@@ -653,7 +628,7 @@ _FindMP3s(void)
 			_pMP3List->pLinkPath = NULL;
 		}
 
-		bInitFirstEntry = false;
+		bInitFirstEntry = FALSE;
 	}
 	else
 	{
@@ -661,10 +636,10 @@ _FindMP3s(void)
 		
 		OutputDebugString(filepath);
 
-		bInitFirstEntry = true;
+		bInitFirstEntry = TRUE;
 	}
 	
-	while ( true )
+	while ( TRUE )
 	{
 		if ( !FindNextFile(hFind, &fd) )
 			break;
@@ -682,9 +657,9 @@ _FindMP3s(void)
 				{
 					OutputDebugString("Resolving Link");
 					OutputDebugString(filepath);
-					bShortcut = true;
+					bShortcut = TRUE;
 				} else {
-					bShortcut = false;
+					bShortcut = FALSE;
 					if (filepathlen > MAX_PATH) {
 						continue;
 					}
@@ -723,7 +698,7 @@ _FindMP3s(void)
 					
 					pList = _pMP3List;
 
-					bInitFirstEntry = false;
+					bInitFirstEntry = FALSE;
 				}
 				else
 				{
@@ -745,9 +720,9 @@ _FindMP3s(void)
 				{
 					OutputDebugString("Resolving Link");
 					OutputDebugString(filepath);
-					bShortcut = true;
+					bShortcut = TRUE;
 				} else
-					bShortcut = false;
+					bShortcut = FALSE;
 				
 				aStream[0] = new CStream(filepath, ALStreamSources[0], ALStreamBuffers[0]);
 
@@ -859,7 +834,7 @@ _GetMP3EntryByIndex(uint32 idx)
 	return NULL;
 }
 
-static inline bool
+static inline bool8
 _GetMP3PosFromStreamPos(uint32 *pPosition, tMP3Entry **pEntry)
 {
 	_CurMP3Index = 0;
@@ -872,7 +847,7 @@ _GetMP3PosFromStreamPos(uint32 *pPosition, tMP3Entry **pEntry)
 			*pPosition -= (*pEntry)->nTrackStreamPos;
 			_CurMP3Pos = *pPosition;
 			
-			return true;
+			return TRUE;
 		}
 		
 		_CurMP3Index++;
@@ -883,10 +858,10 @@ _GetMP3PosFromStreamPos(uint32 *pPosition, tMP3Entry **pEntry)
 	_CurMP3Pos = 0;
 	_CurMP3Index = 0;
 	
-	return false;
+	return FALSE;
 }
 
-bool
+bool8
 cSampleManager::IsMP3RadioChannelAvailable(void)
 {
 	return nNumMP3s != 0;
@@ -895,29 +870,20 @@ cSampleManager::IsMP3RadioChannelAvailable(void)
 
 void cSampleManager::ReleaseDigitalHandle(void)
 {
-	if ( ALDevice )
-	{
-		prevprovider = curprovider;
-		release_existing();
-		curprovider = -1;
-	}
+	// TODO? alcSuspendContext
 }
 
 void cSampleManager::ReacquireDigitalHandle(void)
 {
-	if ( ALDevice )
-	{
-		if ( prevprovider != -1 )
-			set_new_provider(prevprovider);
-	}
+	// TODO? alcProcessContext
 }
 
-bool
+bool8
 cSampleManager::Initialise(void)
 {
 	if ( _bSampmanInitialised )
-		return true;
-
+		return TRUE;
+	SetUpDebugBanksInfo();
 	EFXInit();
 	CStream::Initialise();
 
@@ -926,7 +892,7 @@ cSampleManager::Initialise(void)
 		{
 			m_aSamples[i].nOffset    = 0;
 			m_aSamples[i].nSize      = 0;
-			m_aSamples[i].nFrequency = MAX_FREQ;
+			m_aSamples[i].nFrequency = 22050;
 			m_aSamples[i].nLoopStart = 0;
 			m_aSamples[i].nLoopEnd   = -1;
 		}
@@ -961,7 +927,7 @@ cSampleManager::Initialise(void)
 		
 		for ( int32 i = 0; i < MAX_SFX_BANKS; i++ )
 		{
-			bSampleBankLoaded[i]             = false;
+			bSampleBankLoaded[i]             = FALSE;
 			nSampleBankDiscStartOffset[i]    = 0;
 			nSampleBankSize[i]               = 0;
 			nSampleBankMemoryStartAddress[i] = 0;
@@ -979,16 +945,87 @@ cSampleManager::Initialise(void)
 	}
 	
 	{
-		for ( int32 i = 0; i < MAXCHANNELS+MAX2DCHANNELS; i++ )
+		for ( int32 i = 0; i < NUM_CHANNELS; i++ )
 			nChannelVolume[i] = 0;
 	}
+
+	add_providers();
+
+	{
+		int index = 0;
+		_maxSamples = Min(MAXCHANNELS, providers[index].sources);
+		
+		ALCint attr[] = {ALC_FREQUENCY,MAX_FREQ,
+						ALC_MONO_SOURCES, MAX_DIGITAL_MIXER_CHANNELS - MAX2DCHANNELS,
+						ALC_STEREO_SOURCES, MAX2DCHANNELS,
+						0,
+						};
+		
+		ALDevice  = alcOpenDevice(providers[index].id);
+		ASSERT(ALDevice != NULL);
+		
+		ALContext = alcCreateContext(ALDevice, attr);
+		ASSERT(ALContext != NULL);
+		
+		alcMakeContextCurrent(ALContext);
 	
+		const char* ext=(const char*)alGetString(AL_EXTENSIONS);
+		ASSERT(strstr(ext,"AL_SOFT_loop_points")!=NULL);
+		if ( strstr(ext,"AL_SOFT_loop_points")==NULL )
+		{
+			Terminate();
+			return FALSE;
+		}
+		
+		alListenerf (AL_GAIN,     1.0f);
+		alListener3f(AL_POSITION, 0.0f, 0.0f, 0.0f);
+		alListener3f(AL_VELOCITY, 0.0f, 0.0f, 0.0f);
+		ALfloat orientation[6] = { 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f };
+		alListenerfv(AL_ORIENTATION, orientation);
+		
+		alDistanceModel(AL_INVERSE_DISTANCE_CLAMPED);
+		
+		if ( alcIsExtensionPresent(ALDevice, (ALCchar*)ALC_EXT_EFX_NAME) )
+		{ 
+			_effectsSupported = providers[index].bSupportsFx;
+			alGenAuxiliaryEffectSlots(1, &ALEffectSlot);
+			alGenEffects(1, &ALEffect);
+		}
+
+		alGenSources(MAX_STREAMS*2, ALStreamSources[0]);
+		for ( int32 i = 0; i < MAX_STREAMS; i++ )
+		{
+			alGenBuffers(NUM_STREAMBUFFERS, ALStreamBuffers[i]);
+			alSourcei(ALStreamSources[i][0], AL_SOURCE_RELATIVE, AL_TRUE);
+			alSource3f(ALStreamSources[i][0], AL_POSITION, 0.0f, 0.0f, 0.0f);
+			alSourcef(ALStreamSources[i][0], AL_GAIN, 1.0f);
+			alSourcei(ALStreamSources[i][1], AL_SOURCE_RELATIVE, AL_TRUE);
+			alSource3f(ALStreamSources[i][1], AL_POSITION, 0.0f, 0.0f, 0.0f);
+			alSourcef(ALStreamSources[i][1], AL_GAIN, 1.0f);
+		} 
+		
+		CChannel::InitChannels();
+
+		for ( int32 i = 0; i < MAXCHANNELS; i++ )
+			aChannel[i].Init(i);
+		for ( int32 i = 0; i < MAX2DCHANNELS; i++ )
+			aChannel[MAXCHANNELS+i].Init(MAXCHANNELS+i, true);
+		
+		if ( IsFXSupported() )
+		{
+			/**/
+			alAuxiliaryEffectSloti(ALEffectSlot, AL_EFFECTSLOT_EFFECT, ALEffect);
+			/**/
+			
+			for ( int32 i = 0; i < MAXCHANNELS; i++ )
+				aChannel[i].SetReverbMix(ALEffectSlot, 0.0f);
+		}
+	}
+
 	{	
 		for ( int32 i = 0; i < TOTAL_STREAMED_SOUNDS; i++ )
 			nStreamLength[i] = 0;
 	}
-	
-		add_providers();
 
 #ifdef AUDIO_CACHE
 	FILE *cacheFile = fcaseopen("audio\\sound.cache", "rb");
@@ -1003,7 +1040,25 @@ cSampleManager::Initialise(void)
 
 		for ( int32 i = 0; i < TOTAL_STREAMED_SOUNDS; i++ )
 		{	
-			aStream[0] = new CStream(StreamedNameTable[i], ALStreamSources[0], ALStreamBuffers[0], IsThisTrackAt16KHz(i) ? 16000 : 32000);
+			char filename[MAX_PATH];
+			sprintf(filename, "%s.VB", StreamedNameTable[i]);
+			aStream[0] = new CStream(filename, ALStreamSources[0], ALStreamBuffers[0], IsThisTrackAt16KHz(i) ? 16000 : 32000);
+			if ( aStream[0] && !aStream[0]->IsOpened() )
+			{
+				delete aStream[0];
+				aStream[0] = NULL;
+			}
+
+			if ( !aStream[0] )
+			{
+				sprintf(filename, "%s.MP3", StreamedNameTable[i]);
+				aStream[0] = new CStream(filename, ALStreamSources[0], ALStreamBuffers[0], IsThisTrackAt16KHz(i) ? 16000 : 32000);
+				if ( aStream[0] && !aStream[0]->IsOpened() )
+				{
+					delete aStream[0];
+					aStream[0] = NULL;
+				}
+			}
 			
 			if ( aStream[0] && aStream[0]->IsOpened() )
 			{
@@ -1032,7 +1087,7 @@ cSampleManager::Initialise(void)
 		if ( !InitialiseSampleBanks() )
 		{
 			Terminate();
-			return false;
+			return FALSE;
 		}
 		
 		nSampleBankMemoryStartAddress[SFX_BANK_0] = (uintptr)malloc(nSampleBankSize[SFX_BANK_0]);
@@ -1041,7 +1096,7 @@ cSampleManager::Initialise(void)
 		if ( nSampleBankMemoryStartAddress[SFX_BANK_0] == 0 )
 		{
 			Terminate();
-			return false;
+			return FALSE;
 		}
 		
 		nSampleBankMemoryStartAddress[SFX_BANK_PED_COMMENTS] = (uintptr)malloc(PED_BLOCKSIZE*MAX_PEDSFX);
@@ -1060,7 +1115,7 @@ cSampleManager::Initialise(void)
 	}
 	
 	{
-		_bSampmanInitialised = true;
+		_bSampmanInitialised = TRUE;
 		
 		if ( defaultProvider >= 0 && defaultProvider < m_nNumberOfProviders )
 		{
@@ -1069,7 +1124,7 @@ cSampleManager::Initialise(void)
 		else
 		{
 			Terminate();
-			return false;
+			return FALSE;
 		}
 	}
 
@@ -1092,13 +1147,13 @@ cSampleManager::Initialise(void)
 			
 			time_t t = time(NULL);
 			tm *localtm;
-			bool bUseRandomTable;
+			bool8 bUseRandomTable;
 			
 			if ( t == -1 )
-				bUseRandomTable = true;
+				bUseRandomTable = TRUE;
 			else
 			{
-				bUseRandomTable = false;
+				bUseRandomTable = FALSE;
 				localtm = localtime(&t);
 			}
 			
@@ -1130,10 +1185,10 @@ cSampleManager::Initialise(void)
 		else
 			_CurMP3Pos = 0;
 		
-		_bIsMp3Active = false;
+		_bIsMp3Active = FALSE;
 	}
 	
-	return true;
+	return TRUE;
 }
 
 void
@@ -1149,8 +1204,51 @@ cSampleManager::Terminate(void)
 		}
 	}
 
-	release_existing();
+	for ( int32 i = 0; i < NUM_CHANNELS; i++ )
+		aChannel[i].Term();
 
+	if ( IsFXSupported() )
+	{
+		if ( alIsEffect(ALEffect) )
+		{
+			alEffecti(ALEffect, AL_EFFECT_TYPE, AL_EFFECT_NULL);
+			alDeleteEffects(1, &ALEffect);
+			ALEffect = AL_EFFECT_NULL;
+		}
+		
+		if (alIsAuxiliaryEffectSlot(ALEffectSlot))
+		{
+			alAuxiliaryEffectSloti(ALEffectSlot, AL_EFFECTSLOT_EFFECT, AL_EFFECT_NULL);
+			
+			alDeleteAuxiliaryEffectSlots(1, &ALEffectSlot);
+			ALEffectSlot = AL_EFFECTSLOT_NULL;
+		}
+	}
+
+	for ( int32 i = 0; i < MAX_STREAMS; i++ )
+	{
+		alDeleteBuffers(NUM_STREAMBUFFERS, ALStreamBuffers[i]);
+	}
+	alDeleteSources(MAX_STREAMS*2, ALStreamSources[0]);
+	
+	CChannel::DestroyChannels();
+	
+	if ( ALContext )
+	{
+		alcMakeContextCurrent(NULL);
+		alcSuspendContext(ALContext);
+		alcDestroyContext(ALContext);
+	}
+	if ( ALDevice )
+		alcCloseDevice(ALDevice);
+	
+	ALDevice = NULL;
+	ALContext = NULL;
+	
+	_fPrevEaxRatioDestination = 0.0f;
+	_usingEFX                 = false;
+	_fEffectsLevel            = 0.0f;
+	
 	_DeleteMP3Entries();
 
 	CStream::Terminate();
@@ -1167,12 +1265,12 @@ cSampleManager::Terminate(void)
 		nSampleBankMemoryStartAddress[SFX_BANK_PED_COMMENTS] = 0;
 	}
 	
-	_bSampmanInitialised = false;
+	_bSampmanInitialised = FALSE;
 }
 
-bool cSampleManager::CheckForAnAudioFileOnCD(void)
+bool8 cSampleManager::CheckForAnAudioFileOnCD(void)
 {
-	return true;
+	return TRUE;
 }
 
 char cSampleManager::GetCDAudioDriveLetter(void)
@@ -1185,7 +1283,7 @@ cSampleManager::UpdateEffectsVolume(void)
 {
 	if ( _bSampmanInitialised )
 	{
-		for ( int32 i = 0; i < MAXCHANNELS+MAX2DCHANNELS; i++ )
+		for ( int32 i = 0; i < NUM_CHANNELS; i++ )
 		{
 			if ( GetChannelUsedFlag(i) )
 			{
@@ -1229,24 +1327,24 @@ cSampleManager::SetMusicFadeVolume(uint8 nVolume)
 }
 
 void
-cSampleManager::SetMonoMode(uint8 nMode)
+cSampleManager::SetMonoMode(bool8 nMode)
 {
 	m_nMonoMode = nMode;
 }
 
-bool
+bool8
 cSampleManager::LoadSampleBank(uint8 nBank)
 {
 	ASSERT( nBank < MAX_SFX_BANKS);
 	
 	if ( CTimer::GetIsCodePaused() )
-		return false;
+		return FALSE;
 	
 	if ( MusicManager.IsInitialised()
 		&& MusicManager.GetMusicMode() == MUSICMODE_CUTSCENE
 		&& nBank != SFX_BANK_0 )
 	{
-		return false;
+		return FALSE;
 	}
 	
 #ifdef OPUS_SFX
@@ -1265,14 +1363,14 @@ cSampleManager::LoadSampleBank(uint8 nBank)
 	}
 #else
 	if ( fseek(fpSampleDataHandle, nSampleBankDiscStartOffset[nBank], SEEK_SET) != 0 )
-		return false;
+		return FALSE;
 	
 	if ( fread((void *)nSampleBankMemoryStartAddress[nBank], 1, nSampleBankSize[nBank], fpSampleDataHandle) != nSampleBankSize[nBank] )
-		return false;
+		return FALSE;
 #endif
-	bSampleBankLoaded[nBank] = true;
+	bSampleBankLoaded[nBank] = TRUE;
 	
-	return true;
+	return TRUE;
 }
 
 void
@@ -1280,10 +1378,10 @@ cSampleManager::UnloadSampleBank(uint8 nBank)
 {
 	ASSERT( nBank < MAX_SFX_BANKS);
 	
-	bSampleBankLoaded[nBank] = false;
+	bSampleBankLoaded[nBank] = FALSE;
 }
 
-bool
+bool8
 cSampleManager::IsSampleBankLoaded(uint8 nBank)
 {
 	ASSERT( nBank < MAX_SFX_BANKS);
@@ -1291,7 +1389,7 @@ cSampleManager::IsSampleBankLoaded(uint8 nBank)
 	return bSampleBankLoaded[nBank];
 }
 
-bool
+bool8
 cSampleManager::IsPedCommentLoaded(uint32 nComment)
 {
 	ASSERT( nComment < TOTAL_AUDIO_SAMPLES );
@@ -1306,10 +1404,10 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
 			slot += ARRAY_SIZE(nPedSlotSfx);
 #endif
 		if ( nComment == nPedSlotSfx[slot] )
-			return true;
+			return TRUE;
 	}
 	
-	return false;
+	return FALSE;
 }
 
 
@@ -1332,13 +1430,13 @@ cSampleManager::_GetPedCommentSlot(uint32 nComment)
 	return -1;
 }
 
-bool
+bool8
 cSampleManager::LoadPedComment(uint32 nComment)
 {
 	ASSERT( nComment < TOTAL_AUDIO_SAMPLES );
 	
 	if ( CTimer::GetIsCodePaused() )
-		return false;
+		return FALSE;
 	
 	// no talking peds during cutsenes or the game end
 	if ( MusicManager.IsInitialised() )
@@ -1347,7 +1445,7 @@ cSampleManager::LoadPedComment(uint32 nComment)
 		{
 			case MUSICMODE_CUTSCENE:
 			{
-				return false;
+				return FALSE;
 
 				break;
 			}
@@ -1362,17 +1460,17 @@ cSampleManager::LoadPedComment(uint32 nComment)
 		int size = op_read(fpSampleDataHandle, (opus_int16 *)(nSampleBankMemoryStartAddress[SAMPLEBANK_PED] + PED_BLOCKSIZE * nCurrentPedSlot + samplesRead),
 		                   samplesSize, NULL);
 		if (size <= 0) {
-			return false;
+			return FALSE;
 		}
 		samplesRead += size * 2;
 		samplesSize -= size;
 	}
 #else
 	if ( fseek(fpSampleDataHandle, m_aSamples[nComment].nOffset, SEEK_SET) != 0 )
-		return false;
+		return FALSE;
 	
 	if ( fread((void *)(nSampleBankMemoryStartAddress[SFX_BANK_PED_COMMENTS] + PED_BLOCKSIZE*nCurrentPedSlot), 1, m_aSamples[nComment].nSize, fpSampleDataHandle) != m_aSamples[nComment].nSize )
-		return false;
+		return FALSE;
 
 #endif
 	nPedSlotSfx[nCurrentPedSlot] = nComment;
@@ -1380,7 +1478,7 @@ cSampleManager::LoadPedComment(uint32 nComment)
 	if ( ++nCurrentPedSlot >= MAX_PEDSFX )
 		nCurrentPedSlot = 0;
 	
-	return true;
+	return TRUE;
 }
 
 int32
@@ -1423,13 +1521,13 @@ cSampleManager::GetSampleLength(uint32 nSample)
 	return m_aSamples[nSample].nSize / sizeof(uint16);
 }
 
-bool cSampleManager::UpdateReverb(void)
+bool8 cSampleManager::UpdateReverb(void)
 {
 	if ( !usingEAX && !_usingEFX )
-		return false;
+		return FALSE;
 
 	if ( AudioManager.GetFrameCounter() & 15 )
-		return false;
+		return FALSE;
 
 	float fRatio = 0.0f;
 
@@ -1450,7 +1548,7 @@ bool cSampleManager::UpdateReverb(void)
 	fRatio = clamp(fRatio, 0.0f, 0.6f);
 	
 	if ( fRatio == _fPrevEaxRatioDestination )
-		return false;
+		return FALSE;
 	
 #ifdef JUICY_OAL
 	if ( usingEAX3 || _usingEFX )
@@ -1487,13 +1585,13 @@ bool cSampleManager::UpdateReverb(void)
 
 	_fPrevEaxRatioDestination = fRatio;
 	
-	return true;
+	return TRUE;
 }
 
 void
-cSampleManager::SetChannelReverbFlag(uint32 nChannel, uint8 nReverbFlag)
+cSampleManager::SetChannelReverbFlag(uint32 nChannel, bool8 nReverbFlag)
 {
-	ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
+	ASSERT( nChannel < NUM_CHANNELS );
 	
 	if ( usingEAX || _usingEFX )
 	{
@@ -1501,7 +1599,7 @@ cSampleManager::SetChannelReverbFlag(uint32 nChannel, uint8 nReverbFlag)
 		{
 			alAuxiliaryEffectSloti(ALEffectSlot, AL_EFFECTSLOT_EFFECT, ALEffect);
 			
-			if ( nReverbFlag != 0 )
+			if ( nReverbFlag != FALSE )
 				aChannel[nChannel].SetReverbMix(ALEffectSlot, _fEffectsLevel);
 			else
 				aChannel[nChannel].SetReverbMix(ALEffectSlot, 0.0f);
@@ -1509,24 +1607,24 @@ cSampleManager::SetChannelReverbFlag(uint32 nChannel, uint8 nReverbFlag)
 	}
 }
 
-bool
+bool8
 cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank)
 {
-	ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
+	ASSERT( nChannel < NUM_CHANNELS );
 	
 	uintptr addr;
 	
 	if ( nSfx < SAMPLEBANK_MAX )
 	{
 		if ( !IsSampleBankLoaded(nBank) )
-			return false;
+			return FALSE;
 		
 		addr = nSampleBankMemoryStartAddress[nBank] + m_aSamples[nSfx].nOffset - m_aSamples[BankStartOffset[nBank]].nOffset;
 	}
 	else
 	{
 		if ( !IsPedCommentLoaded(nSfx) )
-			return false;
+			return FALSE;
 		
 		int32 slot = _GetPedCommentSlot(nSfx);
 		addr = (nSampleBankMemoryStartAddress[SFX_BANK_PED_COMMENTS] + PED_BLOCKSIZE * slot);
@@ -1544,17 +1642,16 @@ cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank)
 		aChannel[nChannel].SetSampleData   ((void*)addr, m_aSamples[nSfx].nSize, m_aSamples[nSfx].nFrequency);
 		aChannel[nChannel].SetLoopPoints   (0, -1);
 		aChannel[nChannel].SetPitch        (1.0f);
-		return true;
+		return TRUE;
 	}
 	
-	return false;
+	return FALSE;
 }
 
 void
 cSampleManager::SetChannelEmittingVolume(uint32 nChannel, uint32 nVolume)
 {
-	ASSERT( nChannel != CHANNEL2D );
-	ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
+	ASSERT( nChannel < MAXCHANNELS );
 	
 	uint32 vol = nVolume;
 	if ( vol > MAX_VOLUME ) vol = MAX_VOLUME;
@@ -1575,8 +1672,7 @@ cSampleManager::SetChannelEmittingVolume(uint32 nChannel, uint32 nVolume)
 void
 cSampleManager::SetChannel3DPosition(uint32 nChannel, float fX, float fY, float fZ)
 {
-	ASSERT( nChannel != CHANNEL2D );
-	ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
+	ASSERT( nChannel < MAXCHANNELS );
 	
 	aChannel[nChannel].SetPosition(-fX, fY, fZ);
 }
@@ -1584,18 +1680,17 @@ cSampleManager::SetChannel3DPosition(uint32 nChannel, float fX, float fY, float
 void
 cSampleManager::SetChannel3DDistances(uint32 nChannel, float fMax, float fMin)
 {
-	ASSERT( nChannel != CHANNEL2D );
-	ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
+	ASSERT( nChannel < MAXCHANNELS );
 	aChannel[nChannel].SetDistances(fMax, fMin);
 }
 
 void
 cSampleManager::SetChannelVolume(uint32 nChannel, uint32 nVolume)
 {
-	ASSERT( nChannel == CHANNEL2D );
-	ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
+	ASSERT( nChannel >= MAXCHANNELS );
+	ASSERT( nChannel < NUM_CHANNELS );
 	
-	if ( nChannel == CHANNEL2D )
+	if( nChannel >= CHANNEL_POLICE_RADIO )
 	{
 		uint32 vol = nVolume;
 		if ( vol > MAX_VOLUME ) vol = MAX_VOLUME;
@@ -1617,10 +1712,10 @@ cSampleManager::SetChannelVolume(uint32 nChannel, uint32 nVolume)
 void
 cSampleManager::SetChannelPan(uint32 nChannel, uint32 nPan)
 {
-	ASSERT(nChannel == CHANNEL2D);
-	ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
+	ASSERT( nChannel >= MAXCHANNELS );
+	ASSERT( nChannel < NUM_CHANNELS );
 	
-	if ( nChannel == CHANNEL2D )
+	if ( nChannel >= CHANNEL_POLICE_RADIO )
 	{
 		aChannel[nChannel].SetPan(nPan);
 	}
@@ -1629,7 +1724,7 @@ cSampleManager::SetChannelPan(uint32 nChannel, uint32 nPan)
 void
 cSampleManager::SetChannelFrequency(uint32 nChannel, uint32 nFreq)
 {
-	ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
+	ASSERT( nChannel < NUM_CHANNELS );
 	
 	aChannel[nChannel].SetCurrentFreq(nFreq);
 }
@@ -1637,7 +1732,7 @@ cSampleManager::SetChannelFrequency(uint32 nChannel, uint32 nFreq)
 void
 cSampleManager::SetChannelLoopPoints(uint32 nChannel, uint32 nLoopStart, int32 nLoopEnd)
 {
-	ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
+	ASSERT( nChannel < NUM_CHANNELS );
 	
 	aChannel[nChannel].SetLoopPoints(nLoopStart / (DIGITALBITS / 8), nLoopEnd / (DIGITALBITS / 8));
 }
@@ -1645,15 +1740,15 @@ cSampleManager::SetChannelLoopPoints(uint32 nChannel, uint32 nLoopStart, int32 n
 void
 cSampleManager::SetChannelLoopCount(uint32 nChannel, uint32 nLoopCount)
 {
-	ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
+	ASSERT( nChannel < NUM_CHANNELS );
 	
 	aChannel[nChannel].SetLoopCount(nLoopCount);
 }
 
-bool
+bool8
 cSampleManager::GetChannelUsedFlag(uint32 nChannel)
 {
-	ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
+	ASSERT( nChannel < NUM_CHANNELS );
 	
 	return aChannel[nChannel].IsUsed();
 }
@@ -1661,7 +1756,7 @@ cSampleManager::GetChannelUsedFlag(uint32 nChannel)
 void
 cSampleManager::StartChannel(uint32 nChannel)
 {
-	ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
+	ASSERT( nChannel < NUM_CHANNELS );
 	
 	aChannel[nChannel].Start();
 }
@@ -1669,7 +1764,7 @@ cSampleManager::StartChannel(uint32 nChannel)
 void
 cSampleManager::StopChannel(uint32 nChannel)
 {
-	ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
+	ASSERT( nChannel < NUM_CHANNELS );
 	
 	aChannel[nChannel].Stop();
 }
@@ -1688,14 +1783,32 @@ cSampleManager::PreloadStreamedFile(uint32 nFile, uint8 nStream)
 			delete aStream[nStream];
 			aStream[nStream] = NULL;
 		}
-		
-		strcpy(filename, StreamedNameTable[nFile]);
-		
+
+		sprintf(filename, "%s.VB", StreamedNameTable[nFile]);
 		CStream *stream = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
+		
+		if ( stream && !stream->IsOpened() )
+		{
+			delete stream;
+			stream = NULL;
+		}
+
+		if (!stream)
+		{
+			sprintf(filename, "%s.MP3", StreamedNameTable[nFile]);
+			stream = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
+			if ( stream && !stream->IsOpened() )
+			{
+				delete stream;
+				stream = NULL;
+			}
+		}
+
+
 		ASSERT(stream != NULL);
 		
 		aStream[nStream] = stream;
-		if ( !stream->IsOpened() )
+		if ( !stream->Setup() )
 		{
 			delete stream;
 			aStream[nStream] = NULL;
@@ -1704,7 +1817,7 @@ cSampleManager::PreloadStreamedFile(uint32 nFile, uint8 nStream)
 }
 
 void
-cSampleManager::PauseStream(uint8 nPauseFlag, uint8 nStream)
+cSampleManager::PauseStream(bool8 nPauseFlag, uint8 nStream)
 {
 	ASSERT( nStream < MAX_STREAMS );
 	
@@ -1712,7 +1825,7 @@ cSampleManager::PauseStream(uint8 nPauseFlag, uint8 nStream)
 	
 	if ( stream )
 	{
-		stream->SetPause(nPauseFlag != 0);
+		stream->SetPause(nPauseFlag != FALSE);
 	}
 }
 
@@ -1725,181 +1838,220 @@ cSampleManager::StartPreloadedStreamedFile(uint8 nStream)
 	
 	if ( stream )
 	{
-		if ( stream->Setup() )
+		if ( stream->IsOpened() )
 		{
 			stream->Start();
 		}
 	}
 }
 
-bool
+bool8
 cSampleManager::StartStreamedFile(uint32 nFile, uint32 nPos, uint8 nStream)
 {
+	int i = 0;
 	uint32 position = nPos;
-	char filename[256];
-	
-	ASSERT( nStream < MAX_STREAMS );
+	char filename[MAX_PATH];
 	
-	if ( nFile < TOTAL_STREAMED_SOUNDS )
+	if ( nFile >= TOTAL_STREAMED_SOUNDS )
+		return FALSE;
+
+	if ( aStream[nStream] )
 	{
-		if ( aStream[nStream] )
-		{
-			delete aStream[nStream];
-			aStream[nStream] = NULL;
-		}
-		
-		if ( nFile == STREAMED_SOUND_RADIO_MP3_PLAYER )
+		delete aStream[nStream];
+		aStream[nStream] = NULL;
+	}
+	if ( nFile == STREAMED_SOUND_RADIO_MP3_PLAYER )
+	{
+		do
 		{
-			uint32 i = 0;
-			do {
-				if(i != 0 || _bIsMp3Active) {
-					if(++_CurMP3Index >= nNumMP3s) _CurMP3Index = 0;
-
-					_CurMP3Pos = 0;
-
-					tMP3Entry *mp3 = _GetMP3EntryByIndex(_CurMP3Index);
-
-					if(mp3) {
-						mp3 = _pMP3List;
-						if(mp3 == NULL) {
-							_bIsMp3Active = false;
-							nFile = 0;
-							strcat(filename, StreamedNameTable[nFile]);
+			// Just switched to MP3 player
+			if ( !_bIsMp3Active && i == 0 )
+			{
+				if ( nPos > nStreamLength[STREAMED_SOUND_RADIO_MP3_PLAYER] )
+					position = 0;
+				tMP3Entry *e = _pMP3List;
 
-							CStream* stream = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
-							ASSERT(stream != NULL);
+				// Try to continue from previous song, if already started
+				if(!_GetMP3PosFromStreamPos(&position, &e) && !e) {
+					nFile = 0;
 
-							aStream[nStream] = stream;
+					sprintf(filename, "%s.VB", StreamedNameTable[nFile]);
+					CStream* stream = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
+					
+					if ( stream && !stream->IsOpened() )
+					{
+						delete stream;
+						stream = NULL;
+					}
 
-							if (stream->IsOpened()) {
-								if (stream->Setup()) {
-									if (position != 0)
-										stream->SetPosMS(position);
+					if (!stream)
+					{
+						sprintf(filename, "%s.MP3", StreamedNameTable[nFile]);
+						stream = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
+						if ( stream && !stream->IsOpened() )
+						{
+							delete stream;
+							stream = NULL;
+						}
+					}
+					aStream[nStream] = stream;
 
-									stream->Start();
-								}
+					if (stream->Setup()) {
+						stream->SetLoopCount(nStreamLoopedFlag[nStream] ? 0 : 1);
+						nStreamLoopedFlag[nStream] = TRUE;
+						if (position != 0)
+							stream->SetPosMS(position);
 
-								return true;
-							} else {
-								delete stream;
-								aStream[nStream] = NULL;
-							}
+						stream->Start();
 
-							return false;
-						}
+						return TRUE;
+					} else {
+						delete stream;
+						aStream[nStream] = NULL;
 					}
+					return FALSE;
 
-					if (mp3->pLinkPath != NULL)
-						aStream[nStream] = new CStream(mp3->pLinkPath, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
+				} else {
+
+					if (e->pLinkPath != NULL)
+						aStream[nStream] = new CStream(e->pLinkPath, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
 					else {
 						strcpy(filename, _mp3DirectoryPath);
-						strcat(filename, mp3->aFilename);
+						strcat(filename, e->aFilename);
 
-						aStream[nStream] = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
+						aStream[nStream] = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream]);
 					}
 
-					if (aStream[nStream]->IsOpened()) {
-						if (aStream[nStream]->Setup()) {
-							aStream[nStream]->Start();
-						}
+					if (aStream[nStream]->Setup()) {
+						if (position != 0)
+							aStream[nStream]->SetPosMS(position);
+
+						aStream[nStream]->Start();
 
-						return true;
+						_bIsMp3Active = TRUE;
+						return TRUE;
 					} else {
 						delete aStream[nStream];
 						aStream[nStream] = NULL;
 					}
-
-					_bIsMp3Active = false;
-					continue;
+					// fall through, start playing from another song
 				}
-				if ( nPos > nStreamLength[STREAMED_SOUND_RADIO_MP3_PLAYER] )
-					position = 0;
-				
-				tMP3Entry *e;
-				if ( !_GetMP3PosFromStreamPos(&position, &e) )
+			} else {
+				if(++_CurMP3Index >= nNumMP3s) _CurMP3Index = 0;
+
+				_CurMP3Pos = 0;
+
+				tMP3Entry *mp3 = _GetMP3EntryByIndex(_CurMP3Index);
+				if ( !mp3 )
 				{
-					if ( e == NULL )
+					mp3 = _pMP3List;
+					if ( !_pMP3List )
 					{
 						nFile = 0;
-						strcat(filename, StreamedNameTable[nFile]);
+						_bIsMp3Active = 0;
+						sprintf(filename, "%s.VB", StreamedNameTable[nFile]);
+
 						CStream* stream = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
-						ASSERT(stream != NULL);
+						
+						if ( stream && !stream->IsOpened() )
+						{
+							delete stream;
+							stream = NULL;
+						}
+
+						if (!stream)
+						{
+							sprintf(filename, "%s.MP3", StreamedNameTable[nFile]);
+							stream = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
+							if ( stream && !stream->IsOpened() )
+							{
+								delete stream;
+								stream = NULL;
+							}
+						}
 
 						aStream[nStream] = stream;
 
-						if (stream->IsOpened()) {
-							if (stream->Setup()) {
-								if (position != 0)
-									stream->SetPosMS(position);
+						if (stream->Setup()) {
+							stream->SetLoopCount(nStreamLoopedFlag[nStream] ? 0 : 1);
+							nStreamLoopedFlag[nStream] = TRUE;
+							if (position != 0)
+								stream->SetPosMS(position);
 
-								stream->Start();
-							}
+							stream->Start();
 
-							return true;
+							return TRUE;
 						} else {
 							delete stream;
 							aStream[nStream] = NULL;
 						}
-
-						return false;
+						return FALSE;
 					}
 				}
-
-				if (e->pLinkPath != NULL)
-					aStream[nStream] = new CStream(e->pLinkPath, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
+				if (mp3->pLinkPath != NULL)
+					aStream[nStream] = new CStream(mp3->pLinkPath, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
 				else {
 					strcpy(filename, _mp3DirectoryPath);
-					strcat(filename, e->aFilename);
+					strcat(filename, mp3->aFilename);
 
-					aStream[nStream] = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream]);
+					aStream[nStream] = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
 				}
 
-				if (aStream[nStream]->IsOpened()) {
-					if (aStream[nStream]->Setup()) {
-						if (position != 0)
-							aStream[nStream]->SetPosMS(position);
-
-						aStream[nStream]->Start();
-					}
-
-					_bIsMp3Active = true;
-					return true;
+				if (aStream[nStream]->Setup()) {
+					aStream[nStream]->Start();
+#ifdef FIX_BUGS
+					_bIsMp3Active = TRUE;
+#endif
+					return TRUE;
 				} else {
 					delete aStream[nStream];
 					aStream[nStream] = NULL;
 				}
-				
-				_bIsMp3Active = false;
 
-			} while(++i < nNumMP3s);
-
-			position = 0;
-			nFile = 0;
+			}
+			_bIsMp3Active = 0;
 		}
+		while ( ++i < nNumMP3s );
+		position = 0;
+		nFile = 0;
+	}
+	sprintf(filename, "%s.VB", StreamedNameTable[nFile]);
+	
+	CStream *stream = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
 
-		strcpy(filename, StreamedNameTable[nFile]);
-		
-		CStream *stream = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
-		ASSERT(stream != NULL);
-
-		aStream[nStream] = stream;
-		
-		if ( stream->IsOpened() ) {
-			if ( stream->Setup() ) {
-				if (position != 0)
-					stream->SetPosMS(position);	
+	if ( stream && !stream->IsOpened() )
+	{
+		delete stream;
+		stream = NULL;
+	}
 
-				stream->Start();
-			}
-			
-			return true;
-		} else {
+	if (!stream)
+	{
+		sprintf(filename, "%s.MP3", StreamedNameTable[nFile]);
+		stream = new CStream(filename, ALStreamSources[nStream], ALStreamBuffers[nStream], IsThisTrackAt16KHz(nFile) ? 16000 : 32000);
+		if ( stream && !stream->IsOpened() )
+		{
 			delete stream;
-			aStream[nStream] = NULL;
+			stream = NULL;
 		}
 	}
+
+	aStream[nStream] = stream;
 	
-	return false;
+	if ( stream->Setup() ) {
+		stream->SetLoopCount(nStreamLoopedFlag[nStream] ? 0 : 1);
+		nStreamLoopedFlag[nStream] = TRUE;
+		if (position != 0)
+			stream->SetPosMS(position);	
+
+		stream->Start();
+		
+		return TRUE;
+	} else {
+		delete stream;
+		aStream[nStream] = NULL;
+	}
+	return FALSE;
 }
 
 void
@@ -1913,6 +2065,9 @@ cSampleManager::StopStreamedFile(uint8 nStream)
 	{
 		delete stream;
 		aStream[nStream] = NULL;
+
+		if ( nStream == 0 )
+			_bIsMp3Active = FALSE;
 	}
 }
 
@@ -1925,14 +2080,28 @@ cSampleManager::GetStreamedFilePosition(uint8 nStream)
 	
 	if ( stream )
 	{
-		return stream->GetPosMS();
+		if ( _bIsMp3Active )
+		{
+			tMP3Entry *mp3 = _GetMP3EntryByIndex(_CurMP3Index);
+			
+			if ( mp3 != NULL )
+			{
+				return stream->GetPosMS() + mp3->nTrackStreamPos;
+			}
+			else
+				return 0;
+		}
+		else
+		{
+			return stream->GetPosMS();
+		}
 	}
 	
 	return 0;
 }
 
 void
-cSampleManager::SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, uint8 nEffectFlag, uint8 nStream)
+cSampleManager::SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, bool8 nEffectFlag, uint8 nStream)
 {
 	ASSERT( nStream < MAX_STREAMS );
 	
@@ -1975,7 +2144,7 @@ cSampleManager::GetStreamedFileLength(uint8 nStream)
 	return nStreamLength[nStream];
 }
 
-bool
+bool8
 cSampleManager::IsStreamPlaying(uint8 nStream)
 {
 	ASSERT( nStream < MAX_STREAMS );
@@ -1985,10 +2154,10 @@ cSampleManager::IsStreamPlaying(uint8 nStream)
 	if ( stream )
 	{
 		if ( stream->IsPlaying() )
-			return true;
+			return TRUE;
 	}
 	
-	return false;
+	return FALSE;
 }
 
 void
@@ -2001,16 +2170,22 @@ cSampleManager::Service(void)
 		if ( stream )
 			stream->Update();
 	}
+	int refCount = CChannel::channelsThatNeedService;
+	for ( int32 i = 0; refCount && i < NUM_CHANNELS; i++ )
+	{
+		if ( aChannel[i].Update() )
+			refCount--;
+	}
 }
 
-bool
+bool8
 cSampleManager::InitialiseSampleBanks(void)
 {
 	int32 nBank = SFX_BANK_0;
 	
 	fpSampleDescHandle = fcaseopen(SampleBankDescFilename, "rb");
 	if ( fpSampleDescHandle == NULL )
-		return false;
+		return FALSE;
 #ifndef OPUS_SFX
 	fpSampleDataHandle = fcaseopen(SampleBankDataFilename, "rb");
 	if ( fpSampleDataHandle == NULL )
@@ -2018,7 +2193,7 @@ cSampleManager::InitialiseSampleBanks(void)
 		fclose(fpSampleDescHandle);
 		fpSampleDescHandle = NULL;
 		
-		return false;
+		return FALSE;
 	}
 	
 	fseek(fpSampleDataHandle, 0, SEEK_END);
@@ -2050,11 +2225,11 @@ cSampleManager::InitialiseSampleBanks(void)
 	nSampleBankSize[SFX_BANK_0] = nSampleBankDiscStartOffset[SFX_BANK_PED_COMMENTS] - nSampleBankDiscStartOffset[SFX_BANK_0];
 	nSampleBankSize[SFX_BANK_PED_COMMENTS]  = _nSampleDataEndOffset                      - nSampleBankDiscStartOffset[SFX_BANK_PED_COMMENTS];
 
-	return true;
+	return TRUE;
 }
 
 void
-cSampleManager::SetStreamedFileLoopFlag(uint8 nLoopFlag, uint8 nChannel)
+cSampleManager::SetStreamedFileLoopFlag(bool8 nLoopFlag, uint8 nChannel)
 {
 	nStreamLoopedFlag[nChannel] = nLoopFlag;
 }
diff --git a/src/audio/soundlist.h b/src/audio/soundlist.h
index 4d88590e..c6dbb634 100644
--- a/src/audio/soundlist.h
+++ b/src/audio/soundlist.h
@@ -54,8 +54,8 @@ enum eSound
 	SOUND_49,
 	SOUND_WEAPON_BAT_ATTACK,
 	SOUND_WEAPON_KNIFE_ATTACK,
-	SOUND_WEAPON_CHAINSAW_ATTACK,
 	SOUND_WEAPON_CHAINSAW_IDLE,
+	SOUND_WEAPON_CHAINSAW_ATTACK,
 	SOUND_WEAPON_CHAINSAW_MADECONTACT,
 	SOUND_WEAPON_SHOT_FIRED,
 	SOUND_WEAPON_RELOAD,
@@ -116,8 +116,8 @@ enum eSound
 	SOUND_PED_MIAMIVICE_EXITING_CAR,
 	SOUND_PED_COP_HELIPILOTPHRASE,
 	SOUND_PED_PULLOUTWEAPON,
-	SOUND_PED_HELI_PLAYER_FOUND = 114,
-	SOUND_PED_VCPA_PLAYER_FOUND = 115,
+	SOUND_PED_HELI_PLAYER_FOUND,
+	SOUND_PED_VCPA_PLAYER_FOUND,
 	SOUND_PED_ON_FIRE,
 	SOUND_PED_AIMING,
 	SOUND_PED_HANDS_UP,
@@ -128,15 +128,15 @@ enum eSound
 	SOUND_PED_CAR_JACKED,
 	SOUND_PED_ROBBED,
 	SOUND_PED_ACCIDENTREACTION1,
-	SOUND_PED_UNK_126,
+	SOUND_PED_INNOCENT,
 	SOUND_PED_PLAYER_AFTERSEX,
 	SOUND_PED_PLAYER_BEFORESEX,
-	SOUND_PED_COP_UNK_129, // also used for medics
+	SOUND_PED_COP_TARGETING, // also used for medics
 	SOUND_PED_COP_MANYCOPSAROUND, // also used for medics
 	SOUND_PED_GUNAIMEDAT2,
 	SOUND_PED_COP_ALONE, // also used for medics
 	SOUND_PED_GUNAIMEDAT3,
-	SOUND_PED_COP_REACTION,
+	SOUND_PED_COP_ASK_FOR_ID,
 	SOUND_PED_COP_LITTLECOPSAROUND, // also used for medics
 	SOUND_PED_PLAYER_FARFROMCOPS, // also used for medics
 	SOUND_PED_TAXI_WAIT,
@@ -151,12 +151,12 @@ enum eSound
 	SOUND_PED_ANNOYED_DRIVER,
 	SOUND_PED_147,
 	SOUND_PED_SOLICIT,
-	SOUND_PED_149,
+	SOUND_PED_JEER,
 	SOUND_PED_150,
 	SOUND_PED_EXTINGUISHING_FIRE,
 	SOUND_PED_WAIT_DOUBLEBACK,
-	SOUND_153,
-	SOUND_PED_CHAT_SEXY,
+	SOUND_PED_CHAT_SEXY_FEMALE,
+	SOUND_PED_CHAT_SEXY_MALE,
 	SOUND_PED_CHAT_EVENT,
 	SOUND_PED_PED_COLLISION,
 	SOUND_PED_CHAT,
@@ -171,22 +171,22 @@ enum eSound
 	SOUND_CAR_PED_COLLISION,
 	SOUND_CLOCK_TICK,
 	SOUND_PART_MISSION_COMPLETE,
-	SOUND_FRONTEND_MENU_STARTING, // same with SOUND_HUD_SOUND
+	SOUND_FRONTEND_MENU_STARTING, // same sound as SOUND_HUD
 
 	// TODO(Miami): What are 170-175??
 	
-	SOUND_FRONTEND_NO_RADIO = 176, // those 3 are all same sound
-	SOUND_FRONTEND_RADIO_CHANGE,
-	SOUND_FRONTEND_RADIO_CHANGE_2,
-	SOUND_HUD_SOUND,
+	SOUND_FRONTEND_RADIO_TURN_OFF = 176, // those 2 are same sound
+	SOUND_FRONTEND_RADIO_TURN_ON,
+	SOUND_FRONTEND_HURRICANE, // yes, frontend
+	SOUND_HUD,
 	SOUND_180,
 	SOUND_181,
 	SOUND_182,
 	SOUND_LIGHTNING,
 	SOUND_BULLETTRACE_1,
 	SOUND_BULLETTRACE_2,
-	SOUND_186, // makes same sound with 40
-	SOUND_187, // makes same sound with 46
+	SOUND_186, // makes same sound as 40
+	SOUND_187, // makes same sound as 46
 	SOUND_MELEE_ATTACK_START,
 	SOUND_SKATING,
 	SOUND_WEAPON_MINIGUN_ATTACK,