10 files changed, 321 insertions, 447 deletions

diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 63b73a9f..207d64ad 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -671,10 +671,10 @@ cAudioManager::CreateEntity(int32 type, void *entity)
 			m_asAudioEntities[i].m_nStatus = 0;
 			m_asAudioEntities[i].m_nType = (eAudioType)type;
 			m_asAudioEntities[i].m_pEntity = entity;
-			m_asAudioEntities[i].m_awAudioEvent[0] = SOUND_TOTAL_PED_SOUNDS;
-			m_asAudioEntities[i].m_awAudioEvent[1] = SOUND_TOTAL_PED_SOUNDS;
-			m_asAudioEntities[i].m_awAudioEvent[2] = SOUND_TOTAL_PED_SOUNDS;
-			m_asAudioEntities[i].m_awAudioEvent[3] = SOUND_TOTAL_PED_SOUNDS;
+			m_asAudioEntities[i].m_awAudioEvent[0] = SOUND_NO_SOUND;
+			m_asAudioEntities[i].m_awAudioEvent[1] = SOUND_NO_SOUND;
+			m_asAudioEntities[i].m_awAudioEvent[2] = SOUND_NO_SOUND;
+			m_asAudioEntities[i].m_awAudioEvent[3] = SOUND_NO_SOUND;
 			m_asAudioEntities[i].m_AudioEvents = 0;
 			m_anAudioEntityIndices[m_nAudioEntitiesTotal++] = i;
 			return i;
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 99d67444..bbbc84bd 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -467,8 +467,6 @@ public:
 	// only used in pc
 	void AdjustSamplesVolume();
 	uint8 ComputeEmittingVolume(uint8 emittingVolume, float intensity, float dist);
-
-	void DebugShit();
 };
 
 #ifdef AUDIO_MSS
diff --git a/src/audio/AudioScriptObject.cpp b/src/audio/AudioScriptObject.cpp
index 3d84006d..69d80fbc 100644
--- a/src/audio/AudioScriptObject.cpp
+++ b/src/audio/AudioScriptObject.cpp
@@ -7,7 +7,7 @@
 void
 cAudioScriptObject::Reset()
 {
-	AudioId = SCRSOUND_INVALID;
+	AudioId = SCRIPT_SOUND_INVALID;
 	Posn = CVector(0.0f, 0.0f, 0.0f);
 	AudioEntity = AEHANDLE_NONE;
 }
diff --git a/src/audio/AudioScriptObject.h b/src/audio/AudioScriptObject.h
index ecc07fdf..ff36474d 100644
--- a/src/audio/AudioScriptObject.h
+++ b/src/audio/AudioScriptObject.h
@@ -1,135 +1,5 @@
 #pragma once
 
-enum 
-{
-	SCRSOUND_TEST_1,
-	_SCRSOUND_UNK_1,
-	_SCRSOUND_UNK_2,
-	_SCRSOUND_UNK_3,
-	_SCRSOUND_CLUB_1_S,
-	_SCRSOUND_CLUB_1_L,
-	_SCRSOUND_CLUB_2_S,
-	_SCRSOUND_CLUB_2_L,
-	_SCRSOUND_CLUB_3_S,
-	_SCRSOUND_CLUB_3_L,
-	_SCRSOUND_CLUB_4_S,
-	_SCRSOUND_CLUB_4_L,
-	_SCRSOUND_CLUB_5_S,
-	_SCRSOUND_CLUB_5_L,
-	_SCRSOUND_CLUB_6_S,
-	_SCRSOUND_CLUB_6_L,
-	_SCRSOUND_CLUB_7_S,
-	_SCRSOUND_CLUB_7_L,
-	_SCRSOUND_CLUB_8_S,
-	_SCRSOUND_CLUB_8_L,
-	_SCRSOUND_CLUB_9_S,
-	_SCRSOUND_CLUB_9_L,
-	_SCRSOUND_CLUB_10_S,
-	_SCRSOUND_CLUB_10_L,
-	_SCRSOUND_CLUB_11_S,
-	_SCRSOUND_CLUB_11_L,
-	_SCRSOUND_CLUB_12_S,
-	_SCRSOUND_CLUB_12_L,
-	_SCRSOUND_CLUB_RAGGA_S,
-	_SCRSOUND_CLUB_RAGGA_L,
-	SCRSOUND_STRIP_CLUB_LOOP_1_S,
-	_SCRSOUND_STRIP_CLUB_LOOP_1_L,
-	SCRSOUND_STRIP_CLUB_LOOP_2_S,
-	_SCRSOUND_STRIP_CLUB_LOOP_2_L,
-	_SCRSOUND_SFX_WORKSHOP_1,
-	_SCRSOUND_SFX_WORKSHOP_2,
-	_SCRSOUND_SAWMILL_LOOP_S,
-	SCRSOUND_SAWMILL_LOOP_L,
-	_SCRSOUND_DOG_FOOD_FACTORY_S,
-	_SCRSOUND_DOG_FOOD_FACTORY_L,
-	_SCRSOUND_LAUNDERETTE_1,
-	_SCRSOUND_LAUNDERETTE_2,
-	_SCRSOUND_RESTAURANT_CHINATOWN_S,
-	_SCRSOUND_RESTAURANT_CHINATOWN_L,
-	_SCRSOUND_RESTAURANT_ITALY_S,
-	_SCRSOUND_RESTAURANT_ITALY_L,
-	_SCRSOUND_RESTAURANT_GENERIC_1_S,
-	_SCRSOUND_RESTAURANT_GENERIC_1_L,
-	_SCRSOUND_RESTAURANT_GENERIC_2_S,
-	_SCRSOUND_RESTAURANT_GENERIC_2_L,
-	_SCRSOUND_AIRPORT_ANNOUNCEMENT_S,
-	_SCRSOUND_AIRPORT_ANNOUNCEMENT_L,
-	_SCRSOUND_SHOP_LOOP_1,
-	_SCRSOUND_SHOP_LOOP_2,
-	_SCRSOUND_CINEMA_S,
-	_SCRSOUND_CINEMA_L,
-	_SCRSOUND_DOCKS_FOGHORN_S,
-	_SCRSOUND_DOCKS_FOGHORN_L,
-	_SCRSOUND_HOME_S,
-	_SCRSOUND_HOME_L,
-	_SCRSOUND_PIANO_BAR,
-	_SCRSOUND_CLUB,
-	SCRSOUND_PORN_CINEMA_1_S,
-	_SCRSOUND_PORN_CINEMA_1_L,
-	SCRSOUND_PORN_CINEMA_2_S,
-	_SCRSOUND_PORN_CINEMA_2_L,
-	SCRSOUND_PORN_CINEMA_3_S,
-	_SCRSOUND_PORN_CINEMA_3_L,
-	_SCRSOUND_BANK_ALARM_LOOP_S,
-	SCRSOUND_BANK_ALARM_LOOP_L,
-	_SCRSOUND_POLICE_BALL_LOOP_S,
-	SCRSOUND_POLICE_BALL_LOOP_L,
-	_SCRSOUND_RAVE_LOOP_INDUSTRIAL_S,
-	SCRSOUND_RAVE_LOOP_INDUSTRIAL_L,
-	_SCRSOUND_UNK_74,
-	_SCRSOUND_UNK_75,
-	_SCRSOUND_POLICE_CELL_BEATING_LOOP_S,
-	SCRSOUND_POLICE_CELL_BEATING_LOOP_L,
-	SCRSOUND_INJURED_PED_MALE_OUCH_S,
-	SCRSOUND_INJURED_PED_MALE_OUCH_L,
-	SCRSOUND_INJURED_PED_FEMALE_OUCH_S,
-	SCRSOUND_INJURED_PED_FEMALE_OUCH_L,
-	SCRSOUND_EVIDENCE_PICKUP,
-	SCRSOUND_UNLOAD_GOLD,
-	_SCRSOUND_RAVE_INDUSTRIAL_S,
-	_SCRSOUND_RAVE_INDUSTRIAL_L,
-	_SCRSOUND_RAVE_COMMERCIAL_S,
-	_SCRSOUND_RAVE_COMMERCIAL_L,
-	_SCRSOUND_RAVE_SUBURBAN_S,
-	_SCRSOUND_RAVE_SUBURBAN_L,
-	_SCRSOUND_GROAN_S,
-	_SCRSOUND_GROAN_L,
-	SCRSOUND_GATE_START_CLUNK,
-	SCRSOUND_GATE_STOP_CLUNK,
-	SCRSOUND_PART_MISSION_COMPLETE,
-	SCRSOUND_CHUNKY_RUN_SHOUT,
-	SCRSOUND_SECURITY_GUARD_RUN_AWAY_SHOUT,
-	SCRSOUND_RACE_START_1,
-	SCRSOUND_RACE_START_2,
-	SCRSOUND_RACE_START_3,
-	SCRSOUND_RACE_START_GO,
-	SCRSOUND_SWAT_PED_SHOUT,
-	SCRSOUND_PRETEND_FIRE_LOOP,
-	SCRSOUND_AMMUNATION_CHAT_1,
-	SCRSOUND_AMMUNATION_CHAT_2,
-	SCRSOUND_AMMUNATION_CHAT_3,
-	_SCRSOUND_BULLET_WALL_1,
-	_SCRSOUND_BULLET_WALL_2,
-	_SCRSOUND_BULLET_WALL_3,
-	_SCRSOUND_UNK_109,
-	_SCRSOUND_GLASSFX2_1,
-	_SCRSOUND_GLASSFX2_2,
-	_SCRSOUND_PHONE_RING,
-	_SCRSOUND_UNK_113,
-	_SCRSOUND_GLASS_SMASH_1,
-	_SCRSOUND_GLASS_SMASH_2,
-	_SCRSOUND_GLASS_CRACK,
-	_SCRSOUND_GLASS_SHARD,
-	_SCRSOUND_WOODEN_BOX_SMASH,
-	_SCRSOUND_CARDBOARD_BOX_SMASH,
-	_SCRSOUND_COL_CAR,
-	_SCRSOUND_TYRE_BUMP,
-	_SCRSOUND_BULLET_SHELL_HIT_GROUND_1,
-	_SCRSOUND_BULLET_SHELL_HIT_GROUND_2,
-	TOTAL_SCRSOUNDS,
-	SCRSOUND_INVALID
-};
-
 class cAudioScriptObject
 {
 public:
diff --git a/src/audio/soundlist.h b/src/audio/soundlist.h
index 64d7dbcb..6d1ff6e3 100644
--- a/src/audio/soundlist.h
+++ b/src/audio/soundlist.h
@@ -1,301 +1,303 @@
 #pragma once
 
-enum eSound : int16
+enum eSound : uint16
 {
 	SOUND_CAR_DOOR_CLOSE_BONNET = 0,
-	SOUND_CAR_DOOR_CLOSE_BUMPER = 1,
-	SOUND_CAR_DOOR_CLOSE_FRONT_LEFT = 2,
-	SOUND_CAR_DOOR_CLOSE_FRONT_RIGHT = 3,
-	SOUND_CAR_DOOR_CLOSE_BACK_LEFT = 4,
-	SOUND_CAR_DOOR_CLOSE_BACK_RIGHT = 5,
-	SOUND_CAR_DOOR_OPEN_BONNET = 6,
-	SOUND_CAR_DOOR_OPEN_BUMPER = 7,
-	SOUND_CAR_DOOR_OPEN_FRONT_LEFT = 8,
-	SOUND_CAR_DOOR_OPEN_FRONT_RIGHT = 9,
-	SOUND_CAR_DOOR_OPEN_BACK_LEFT = 10,
-	SOUND_CAR_DOOR_OPEN_BACK_RIGHT = 11,
-	SOUND_CAR_WINDSHIELD_CRACK = 12,
-	SOUND_CAR_JUMP = 13,
-	SOUND_E = 14,
-	SOUND_F = 15,
-	SOUND_CAR_ENGINE_START = 16,
-	SOUND_CAR_LIGHT_BREAK = 17,
-	SOUND_CAR_HYDRAULIC_1 = 18,
-	SOUND_CAR_HYDRAULIC_2 = 19,
-	SOUND_CAR_HYDRAULIC_3 = 20,
-	SOUND_CAR_JERK = 21,
-	SOUND_CAR_SPLASH = 22,
-	SOUND_17 = 23,
-	SOUND_18 = 24,
-	SOUND_19 = 25,
-	SOUND_CAR_TANK_TURRET_ROTATE = 26,
-	SOUND_CAR_BOMB_TICK = 27,
-	SOUND_PLANE_ON_GROUND = 28,
-	SOUND_STEP_START = 29,
-	SOUND_STEP_END = 30,
-	SOUND_FALL_LAND = 31,
-	SOUND_FALL_COLLAPSE = 32,
-	SOUND_FIGHT_PUNCH_33 = 33,
-	SOUND_FIGHT_KICK_34 = 34,
-	SOUND_FIGHT_HEADBUTT_35 = 35,
-	SOUND_FIGHT_PUNCH_36 = 36,
-	SOUND_FIGHT_PUNCH_37 = 37,
-	SOUND_FIGHT_CLOSE_PUNCH_38 = 38,
-	SOUND_FIGHT_PUNCH_39 = 39,
-	SOUND_FIGHT_PUNCH_OR_KICK_BELOW_40 = 40,
-	SOUND_FIGHT_PUNCH_41 = 41,
-	SOUND_FIGHT_PUNCH_FROM_BEHIND_42 = 42,
-	SOUND_FIGHT_KNEE_OR_KICK_43 = 43,
-	SOUND_FIGHT_KICK_44 = 44,
-	SOUND_2D = 45,
-	SOUND_WEAPON_BAT_ATTACK = 46,
-	SOUND_WEAPON_SHOT_FIRED = 47,
-	SOUND_WEAPON_RELOAD = 48,
-	SOUND_WEAPON_AK47_BULLET_ECHO = 49,
-	SOUND_WEAPON_UZI_BULLET_ECHO = 50,
-	SOUND_WEAPON_M16_BULLET_ECHO = 51,
-	SOUND_WEAPON_FLAMETHROWER_FIRE = 52,
-	SOUND_WEAPON_SNIPER_SHOT_NO_ZOOM = 53,
-	SOUND_WEAPON_ROCKET_SHOT_NO_ZOOM = 54,
-	SOUND_WEAPON_HIT_PED = 55,
-	SOUND_WEAPON_HIT_VEHICLE = 56,
-	SOUND_GARAGE_NO_MONEY = 57,
-	SOUND_GARAGE_BAD_VEHICLE = 58,
-	SOUND_GARAGE_OPENING = 59,
-	SOUND_GARAGE_BOMB_ALREADY_SET = 60,
-	SOUND_GARAGE_BOMB1_SET = 61,
-	SOUND_GARAGE_BOMB2_SET = 62,
-	SOUND_GARAGE_BOMB3_SET = 63,
-	SOUND_40 = 64,
-	SOUND_41 = 65,
-	SOUND_GARAGE_VEHICLE_DECLINED = 66,
-	SOUND_GARAGE_VEHICLE_ACCEPTED = 67,
-	SOUND_GARAGE_DOOR_CLOSED = 68,
-	SOUND_GARAGE_DOOR_OPENED = 69,
-	SOUND_CRANE_PICKUP = 70,
-	SOUND_PICKUP_WEAPON_BOUGHT = 71,
-	SOUND_PICKUP_WEAPON = 72,
-	SOUND_PICKUP_HEALTH = 73,
-	SOUND_4A = 74,
-	SOUND_4B = 75,
-	SOUND_PICKUP_ADRENALINE = 76,
-	SOUND_PICKUP_ARMOUR = 77,
-	SOUND_PICKUP_BONUS = 78,
-	SOUND_PICKUP_MONEY = 79,
-	SOUND_PICKUP_HIDDEN_PACKAGE = 80,
-	SOUND_PICKUP_PACMAN_PILL = 81,
-	SOUND_PICKUP_PACMAN_PACKAGE = 82,
-	SOUND_PICKUP_FLOAT_PACKAGE = 83,
-	SOUND_BOMB_TIMED_ACTIVATED = 84,
-	SOUND_55 = 85,
-	SOUND_BOMB_ONIGNITION_ACTIVATED = 86,
-	SOUND_BOMB_TICK = 87,
-	SOUND_RAMPAGE_START = 88,
-	SOUND_RAMPAGE_ONGOING = 89,
-	SOUND_RAMPAGE_PASSED = 90,
-	SOUND_RAMPAGE_FAILED = 91,
-	SOUND_RAMPAGE_KILL = 92,
-	SOUND_RAMPAGE_CAR_BLOWN = 93,
-	SOUND_EVIDENCE_PICKUP = 94,
-	SOUND_UNLOAD_GOLD = 95,
-	SOUND_PAGER = 96,
-	SOUND_PED_DEATH = 97, // 103 in VC
-	SOUND_PED_DAMAGE = 98, // 104 in VC
-	SOUND_PED_HIT = 99, // 105 in VC
-	SOUND_PED_LAND = 100, // hopefully 106 in VC
-	SOUND_PED_BULLET_HIT = 101,
-	SOUND_PED_BOMBER = 102,
-	SOUND_PED_BURNING = 103, // 108 in VC
-	SOUND_PED_ARREST_FBI = 104,
-	SOUND_PED_ARREST_SWAT = 105,
-	SOUND_PED_ARREST_COP = 106,
-	SOUND_PED_HELI_PLAYER_FOUND = 107,
-	SOUND_PED_HANDS_UP = 108,
-	SOUND_PED_HANDS_COWER = 109,
-	SOUND_PED_FLEE_SPRINT = 110, // 120 in VC
-	SOUND_PED_CAR_JACKING = 111,
-	SOUND_PED_MUGGING = 112,
-	SOUND_PED_CAR_JACKED = 113,
-	SOUND_PED_ROBBED = 114,
-	SOUND_PED_TAXI_WAIT = 115, // 137 in VC
-	SOUND_PED_ATTACK = 116,
-	SOUND_PED_DEFEND = 117,
-	SOUND_PED_PURSUIT_ARMY = 118,
-	SOUND_PED_PURSUIT_FBI = 119,
-	SOUND_PED_PURSUIT_SWAT = 120,
-	SOUND_PED_PURSUIT_COP = 121,
-	SOUND_PED_HEALING = 122,
-	SOUND_PED_7B = 123,
-	SOUND_PED_LEAVE_VEHICLE = 124,
-	SOUND_PED_EVADE = 125, // 142 in VC
-	SOUND_PED_FLEE_RUN = 126,
-	SOUND_PED_CAR_COLLISION = 127, // 144-145-146 in VC
-	SOUND_PED_SOLICIT = 128,
-	SOUND_PED_EXTINGUISHING_FIRE = 129,
-	SOUND_PED_WAIT_DOUBLEBACK = 130,
-	SOUND_PED_CHAT_SEXY = 131,
-	SOUND_PED_CHAT_EVENT = 132,
-	SOUND_PED_CHAT = 133,
-	SOUND_PED_BODYCAST_HIT = 134,
-	SOUND_PED_TAXI_CALL = 135,
-	SOUND_INJURED_PED_MALE_OUCH = 136,
-	SOUND_INJURED_PED_FEMALE = 137,
-	SOUND_INJURED_PED_MALE_PRISON = 138,
-	SOUND_RACE_START_3 = 139,
-	SOUND_RACE_START_2 = 140,
-	SOUND_RACE_START_1 = 141,
-	SOUND_RACE_START_GO = 142,
-	SOUND_SPLASH = 143,
-	SOUND_WATER_FALL = 144,
-	SOUND_SPLATTER = 145,
-	SOUND_CAR_PED_COLLISION = 146,
-	SOUND_CLOCK_TICK = 147,
-	SOUND_PART_MISSION_COMPLETE = 148,
-	SOUND_FRONTEND_MENU_STARTING = 149,
-	SOUND_FRONTEND_MENU_COMPLETED = 150,
-	SOUND_FRONTEND_MENU_DENIED = 151,
-	SOUND_FRONTEND_MENU_SUCCESS = 152,
-	SOUND_FRONTEND_EXIT = 153,
-	SOUND_9A = 154,
-	SOUND_9B = 155,
-	SOUND_FRONTEND_AUDIO_TEST = 156,
-	SOUND_FRONTEND_FAIL = 157,
-	SOUND_FRONTEND_NO_RADIO = 158,
-	SOUND_FRONTEND_RADIO_CHANGE = 159,
-	SOUND_A0 = 160,
-	SOUND_AMMUNATION_WELCOME_1 = 161,
-	SOUND_AMMUNATION_WELCOME_2 = 162,
-	SOUND_AMMUNATION_WELCOME_3 = 163,
-	SOUND_LIGHTNING = 164,
-	SOUND_A5 = 165,
-	SOUND_TOTAL_SOUNDS = 166,
-	SOUND_TOTAL_PED_SOUNDS = 167,
+	SOUND_CAR_DOOR_CLOSE_BUMPER,
+	SOUND_CAR_DOOR_CLOSE_FRONT_LEFT,
+	SOUND_CAR_DOOR_CLOSE_FRONT_RIGHT,
+	SOUND_CAR_DOOR_CLOSE_BACK_LEFT,
+	SOUND_CAR_DOOR_CLOSE_BACK_RIGHT,
+	SOUND_CAR_DOOR_OPEN_BONNET,
+	SOUND_CAR_DOOR_OPEN_BUMPER,
+	SOUND_CAR_DOOR_OPEN_FRONT_LEFT,
+	SOUND_CAR_DOOR_OPEN_FRONT_RIGHT,
+	SOUND_CAR_DOOR_OPEN_BACK_LEFT,
+	SOUND_CAR_DOOR_OPEN_BACK_RIGHT,
+	SOUND_CAR_WINDSHIELD_CRACK,
+	SOUND_CAR_JUMP,
+	SOUND_E,
+	SOUND_F,
+	SOUND_CAR_ENGINE_START,
+	SOUND_CAR_LIGHT_BREAK,
+	SOUND_CAR_HYDRAULIC_1,
+	SOUND_CAR_HYDRAULIC_2,
+	SOUND_CAR_HYDRAULIC_3,
+	SOUND_CAR_JERK,
+	SOUND_CAR_SPLASH,
+	SOUND_17,
+	SOUND_18,
+	SOUND_19,
+	SOUND_CAR_TANK_TURRET_ROTATE,
+	SOUND_CAR_BOMB_TICK,
+	SOUND_PLANE_ON_GROUND,
+	SOUND_STEP_START,
+	SOUND_STEP_END,
+	SOUND_FALL_LAND,
+	SOUND_FALL_COLLAPSE,
+	SOUND_FIGHT_PUNCH_33,
+	SOUND_FIGHT_KICK_34,
+	SOUND_FIGHT_HEADBUTT_35,
+	SOUND_FIGHT_PUNCH_36,
+	SOUND_FIGHT_PUNCH_37,
+	SOUND_FIGHT_CLOSE_PUNCH_38,
+	SOUND_FIGHT_PUNCH_39,
+	SOUND_FIGHT_PUNCH_OR_KICK_BELOW_40,
+	SOUND_FIGHT_PUNCH_41,
+	SOUND_FIGHT_PUNCH_FROM_BEHIND_42,
+	SOUND_FIGHT_KNEE_OR_KICK_43,
+	SOUND_FIGHT_KICK_44,
+	SOUND_2D,
+	SOUND_WEAPON_BAT_ATTACK,
+	SOUND_WEAPON_SHOT_FIRED,
+	SOUND_WEAPON_RELOAD,
+	SOUND_WEAPON_AK47_BULLET_ECHO,
+	SOUND_WEAPON_UZI_BULLET_ECHO,
+	SOUND_WEAPON_M16_BULLET_ECHO,
+	SOUND_WEAPON_FLAMETHROWER_FIRE,
+	SOUND_WEAPON_SNIPER_SHOT_NO_ZOOM,
+	SOUND_WEAPON_ROCKET_SHOT_NO_ZOOM,
+	SOUND_WEAPON_HIT_PED,
+	SOUND_WEAPON_HIT_VEHICLE,
+	SOUND_GARAGE_NO_MONEY,
+	SOUND_GARAGE_BAD_VEHICLE,
+	SOUND_GARAGE_OPENING,
+	SOUND_GARAGE_BOMB_ALREADY_SET,
+	SOUND_GARAGE_BOMB1_SET,
+	SOUND_GARAGE_BOMB2_SET,
+	SOUND_GARAGE_BOMB3_SET,
+	SOUND_40,
+	SOUND_41,
+	SOUND_GARAGE_VEHICLE_DECLINED,
+	SOUND_GARAGE_VEHICLE_ACCEPTED,
+	SOUND_GARAGE_DOOR_CLOSED,
+	SOUND_GARAGE_DOOR_OPENED,
+	SOUND_CRANE_PICKUP,
+	SOUND_PICKUP_WEAPON_BOUGHT,
+	SOUND_PICKUP_WEAPON,
+	SOUND_PICKUP_HEALTH,
+	SOUND_4A,
+	SOUND_4B,
+	SOUND_PICKUP_ADRENALINE,
+	SOUND_PICKUP_ARMOUR,
+	SOUND_PICKUP_BONUS,
+	SOUND_PICKUP_MONEY,
+	SOUND_PICKUP_HIDDEN_PACKAGE,
+	SOUND_PICKUP_PACMAN_PILL,
+	SOUND_PICKUP_PACMAN_PACKAGE,
+	SOUND_PICKUP_FLOAT_PACKAGE,
+	SOUND_BOMB_TIMED_ACTIVATED,
+	SOUND_55,
+	SOUND_BOMB_ONIGNITION_ACTIVATED,
+	SOUND_BOMB_TICK,
+	SOUND_RAMPAGE_START,
+	SOUND_RAMPAGE_ONGOING,
+	SOUND_RAMPAGE_PASSED,
+	SOUND_RAMPAGE_FAILED,
+	SOUND_RAMPAGE_KILL,
+	SOUND_RAMPAGE_CAR_BLOWN,
+	SOUND_EVIDENCE_PICKUP,
+	SOUND_UNLOAD_GOLD,
+	SOUND_PAGER,
+	SOUND_PED_DEATH,  // 103 in VC
+	SOUND_PED_DAMAGE, // 104 in VC
+	SOUND_PED_HIT,    // 105 in VC
+	SOUND_PED_LAND,   // hopefully 106 in VC
+	SOUND_PED_BULLET_HIT,
+	SOUND_PED_BOMBER,
+	SOUND_PED_BURNING, // 108 in VC
+	SOUND_PED_ARREST_FBI,
+	SOUND_PED_ARREST_SWAT,
+	SOUND_PED_ARREST_COP,
+	SOUND_PED_HELI_PLAYER_FOUND,
+	SOUND_PED_HANDS_UP,
+	SOUND_PED_HANDS_COWER,
+	SOUND_PED_FLEE_SPRINT, // 120 in VC
+	SOUND_PED_CAR_JACKING,
+	SOUND_PED_MUGGING,
+	SOUND_PED_CAR_JACKED,
+	SOUND_PED_ROBBED,
+	SOUND_PED_TAXI_WAIT, // 137 in VC
+	SOUND_PED_ATTACK,
+	SOUND_PED_DEFEND,
+	SOUND_PED_PURSUIT_ARMY,
+	SOUND_PED_PURSUIT_FBI,
+	SOUND_PED_PURSUIT_SWAT,
+	SOUND_PED_PURSUIT_COP,
+	SOUND_PED_HEALING,
+	SOUND_PED_7B,
+	SOUND_PED_LEAVE_VEHICLE,
+	SOUND_PED_EVADE, // 142 in VC
+	SOUND_PED_FLEE_RUN,
+	SOUND_PED_CAR_COLLISION, // 144-145-146 in VC
+	SOUND_PED_SOLICIT,
+	SOUND_PED_EXTINGUISHING_FIRE,
+	SOUND_PED_WAIT_DOUBLEBACK,
+	SOUND_PED_CHAT_SEXY,
+	SOUND_PED_CHAT_EVENT,
+	SOUND_PED_CHAT,
+	SOUND_PED_BODYCAST_HIT,
+	SOUND_PED_TAXI_CALL,
+	SOUND_INJURED_PED_MALE_OUCH,
+	SOUND_INJURED_PED_FEMALE,
+	SOUND_INJURED_PED_MALE_PRISON,
+	SOUND_RACE_START_3,
+	SOUND_RACE_START_2,
+	SOUND_RACE_START_1,
+	SOUND_RACE_START_GO,
+	SOUND_SPLASH,
+	SOUND_WATER_FALL,
+	SOUND_SPLATTER,
+	SOUND_CAR_PED_COLLISION,
+	SOUND_CLOCK_TICK,
+	SOUND_PART_MISSION_COMPLETE,
+	SOUND_FRONTEND_MENU_STARTING,
+	SOUND_FRONTEND_MENU_COMPLETED,
+	SOUND_FRONTEND_MENU_DENIED,
+	SOUND_FRONTEND_MENU_SUCCESS,
+	SOUND_FRONTEND_EXIT,
+	SOUND_9A,
+	SOUND_9B,
+	SOUND_FRONTEND_AUDIO_TEST,
+	SOUND_FRONTEND_FAIL,
+	SOUND_FRONTEND_NO_RADIO,
+	SOUND_FRONTEND_RADIO_CHANGE,
+	SOUND_A0,
+	SOUND_AMMUNATION_WELCOME_1,
+	SOUND_AMMUNATION_WELCOME_2,
+	SOUND_AMMUNATION_WELCOME_3,
+	SOUND_LIGHTNING,
+	SOUND_A5,
+	SOUND_TOTAL_SOUNDS,
+	SOUND_NO_SOUND,
 };
 
 
-enum eScriptSounds : int16 {
+enum eScriptSounds : uint16 {
 	SCRIPT_SOUND_0 = 0,
-	SCRIPT_SOUND_1 = 1,
-	SCRIPT_SOUND_2 = 2,
-	SCRIPT_SOUND_3 = 3,
-	SCRIPT_SOUND_PARTY_1_LOOP_S = 4,
-	SCRIPT_SOUND_PARTY_1_LOOP_L = 5,
-	SCRIPT_SOUND_PARTY_2_LOOP_S = 6,
-	SCRIPT_SOUND_PARTY_2_LOOP_L = 7,
-	SCRIPT_SOUND_PARTY_3_LOOP_S = 8,
-	SCRIPT_SOUND_PARTY_3_LOOP_L = 9,
-	SCRIPT_SOUND_PARTY_4_LOOP_S = 10,
-	SCRIPT_SOUND_PARTY_4_LOOP_L = 11,
-	SCRIPT_SOUND_PARTY_5_LOOP_S = 12,
-	SCRIPT_SOUND_PARTY_5_LOOP_L = 13,
-	SCRIPT_SOUND_PARTY_6_LOOP_S = 14,
-	SCRIPT_SOUND_PARTY_6_LOOP_L = 15,
-	SCRIPT_SOUND_PARTY_7_LOOP_S = 16,
-	SCRIPT_SOUND_PARTY_7_LOOP_L = 17,
-	SCRIPT_SOUND_PARTY_8_LOOP_S = 18,
-	SCRIPT_SOUND_PARTY_8_LOOP_L = 19,
-	SCRIPT_SOUND_PARTY_9_LOOP_S = 20,
-	SCRIPT_SOUND_PARTY_9_LOOP_L = 21,
-	SCRIPT_SOUND_PARTY_10_LOOP_S = 22,
-	SCRIPT_SOUND_PARTY_10_LOOP_L = 23,
-	SCRIPT_SOUND_PARTY_11_LOOP_S = 24,
-	SCRIPT_SOUND_PARTY_11_LOOP_L = 25,
-	SCRIPT_SOUND_PARTY_12_LOOP_S = 26,
-	SCRIPT_SOUND_PARTY_12_LOOP_L = 27,
-	SCRIPT_SOUND_PARTY_13_LOOP_S = 28,
-	SCRIPT_SOUND_PARTY_13_LOOP_L = 29,
-	SCRIPT_SOUND_STRIP_CLUB_LOOP_1_S = 30,
-	SCRIPT_SOUND_STRIP_CLUB_LOOP_1_L = 31,
-	SCRIPT_SOUND_STRIP_CLUB_LOOP_2_S = 32,
-	SCRIPT_SOUND_STRIP_CLUB_LOOP_2_L = 33,
-	SCRIPT_SOUND_WORK_SHOP_LOOP_S = 34,
-	SCRIPT_SOUND_WORK_SHOP_LOOP_L = 35,
-	SCRIPT_SOUND_SAWMILL_LOOP_S = 36,
-	SCRIPT_SOUND_SAWMILL_LOOP_L = 37,
-	SCRIPT_SOUND_38 = 38,
-	SCRIPT_SOUND_39 = 39,
-	SCRIPT_SOUND_LAUNDERETTE_LOOP_S = 40,
-	SCRIPT_SOUND_LAUNDERETTE_LOOP_L = 41,
-	SCRIPT_SOUND_CHINATOWN_RESTAURANT_S = 42,
-	SCRIPT_SOUND_CHINATOWN_RESTAURANT_L = 43,
-	SCRIPT_SOUND_CIPRIANI_RESAURANT_S = 44,
-	SCRIPT_SOUND_CIPRIANI_RESAURANT_L = 45,
-	SCRIPT_SOUND_46_S = 46,
-	SCRIPT_SOUND_47_L = 47,
-	SCRIPT_SOUND_MARCO_BISTRO_S = 48,
-	SCRIPT_SOUND_MARCO_BISTRO_L = 49,
-	SCRIPT_SOUND_AIRPORT_LOOP_S = 50,
-	SCRIPT_SOUND_AIRPORT_LOOP_L = 51,
-	SCRIPT_SOUND_SHOP_LOOP_S = 52,
-	SCRIPT_SOUND_SHOP_LOOP_L = 53,
-	SCRIPT_SOUND_CINEMA_LOOP_S = 54,
-	SCRIPT_SOUND_CINEMA_LOOP_L = 55,
-	SCRIPT_SOUND_DOCKS_LOOP_S = 56,
-	SCRIPT_SOUND_DOCKS_LOOP_L = 57,
-	SCRIPT_SOUND_HOME_LOOP_S = 58,
-	SCRIPT_SOUND_HOME_LOOP_L = 59,
-	SCRIPT_SOUND_FRANKIE_PIANO = 60,
-	SCRIPT_SOUND_PARTY_1_LOOP = 61,
-	SCRIPT_SOUND_PORN_CINEMA_1_S = 62,
-	SCRIPT_SOUND_PORN_CINEMA_1_L = 63,
-	SCRIPT_SOUND_PORN_CINEMA_2_S = 64,
-	SCRIPT_SOUND_PORN_CINEMA_2_L = 65,
-	SCRIPT_SOUND_PORN_CINEMA_3_S = 66,
-	SCRIPT_SOUND_PORN_CINEMA_3_L = 67,
-	SCRIPT_SOUND_BANK_ALARM_LOOP_S = 68,
-	SCRIPT_SOUND_BANK_ALARM_LOOP_L = 69,
-	SCRIPT_SOUND_POLICE_BALL_LOOP_S = 70,
-	SCRIPT_SOUND_POLICE_BALL_LOOP_L = 71,
-	SCRIPT_SOUND_RAVE_LOOP_INDUSTRIAL_S = 72,
-	SCRIPT_SOUND_RAVE_LOOP_INDUSTRIAL_L = 73,
-	SCRIPT_SOUND_74 = 74,
-	SCRIPT_SOUND_75 = 75,
-	SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_S = 76,
-	SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_L = 77,
-	SCRIPT_SOUND_INJURED_PED_MALE_OUCH_S = 78,
-	SCRIPT_SOUND_INJURED_PED_MALE_OUCH_L = 79,
-	SCRIPT_SOUND_INJURED_PED_FEMALE_OUCH_S = 80,
-	SCRIPT_SOUND_INJURED_PED_FEMALE_OUCH_L = 81,
-	SCRIPT_SOUND_EVIDENCE_PICKUP = 82,
-	SCRIPT_SOUND_UNLOAD_GOLD = 83,
-	SCRIPT_SOUND_RAVE_1_LOOP_S = 84,
-	SCRIPT_SOUND_RAVE_1_LOOP_L = 85,
-	SCRIPT_SOUND_RAVE_2_LOOP_S = 86,
-	SCRIPT_SOUND_RAVE_2_LOOP_L = 87,
-	SCRIPT_SOUND_RAVE_3_LOOP_S = 88,
-	SCRIPT_SOUND_RAVE_3_LOOP_L = 89,
-	SCRIPT_SOUND_MISTY_SEX_S = 90,
-	SCRIPT_SOUND_MISTY_SEX_L = 91,
-	SCRIPT_SOUND_GATE_START_CLUNK = 92,
-	SCRIPT_SOUND_GATE_STOP_CLUNK = 93,
-	SCRIPT_SOUND_PART_MISSION_COMPLETE = 94,
-	SCRIPT_SOUND_CHUNKY_RUN_SHOUT = 95,
-	SCRIPT_SOUND_SECURITY_GUARD_AWAY_SHOUT = 96,
-	SCRIPT_SOUND_RACE_START_3 = 97,
-	SCRIPT_SOUND_RACE_START_2 = 98,
-	SCRIPT_SOUND_RACE_START_1 = 99,
-	SCRIPT_SOUND_RACE_START_GO = 100,
-	SCRIPT_SOUND_SWAT_PED_SHOUT = 101,
-	SCRIPT_SOUND_PRETEND_FIRE_LOOP = 102,
-	SCRIPT_SOUND_AMMUNATION_CHAT_1 = 103,
-	SCRIPT_SOUND_AMMUNATION_CHAT_2 = 104,
-	SCRIPT_SOUND_AMMUNATION_CHAT_3 = 105,
-	SCRIPT_SOUND_BULLET_HIT_GROUND_1 = 106,
-	SCRIPT_SOUND_BULLET_HIT_GROUND_2 = 107,
-	SCRIPT_SOUND_BULLET_HIT_GROUND_3 = 108,
-	SCRIPT_SOUND_BULLET_HIT_WATER = 109, //no sound
-	SCRIPT_SOUND_110 = 110,
-	SCRIPT_SOUND_111 = 111,
-	SCRIPT_SOUND_PAYPHONE_RINGING = 112,
-	SCRIPT_SOUND_113 = 113,
-	SCRIPT_SOUND_GLASS_BREAK_L = 114,
-	SCRIPT_SOUND_GLASS_BREAK_S = 115,
-	SCRIPT_SOUND_GLASS_CRACK = 116,
-	SCRIPT_SOUND_GLASS_LIGHT_BREAK = 117,
-	SCRIPT_SOUND_BOX_DESTROYED_1 = 118,
-	SCRIPT_SOUND_BOX_DESTROYED_2 = 119,
-	SCRIPT_SOUND_METAL_COLLISION = 120,
-	SCRIPT_SOUND_TIRE_COLLISION = 121,
-	SCRIPT_SOUND_GUNSHELL_DROP = 122,
-	SCRIPT_SOUND_GUNSHELL_DROP_SOFT = 123,
+	SCRIPT_SOUND_1,
+	SCRIPT_SOUND_2,
+	SCRIPT_SOUND_3,
+	SCRIPT_SOUND_PARTY_1_LOOP_S,
+	SCRIPT_SOUND_PARTY_1_LOOP_L,
+	SCRIPT_SOUND_PARTY_2_LOOP_S,
+	SCRIPT_SOUND_PARTY_2_LOOP_L,
+	SCRIPT_SOUND_PARTY_3_LOOP_S,
+	SCRIPT_SOUND_PARTY_3_LOOP_L,
+	SCRIPT_SOUND_PARTY_4_LOOP_S,
+	SCRIPT_SOUND_PARTY_4_LOOP_L,
+	SCRIPT_SOUND_PARTY_5_LOOP_S,
+	SCRIPT_SOUND_PARTY_5_LOOP_L,
+	SCRIPT_SOUND_PARTY_6_LOOP_S,
+	SCRIPT_SOUND_PARTY_6_LOOP_L,
+	SCRIPT_SOUND_PARTY_7_LOOP_S,
+	SCRIPT_SOUND_PARTY_7_LOOP_L,
+	SCRIPT_SOUND_PARTY_8_LOOP_S,
+	SCRIPT_SOUND_PARTY_8_LOOP_L,
+	SCRIPT_SOUND_PARTY_9_LOOP_S,
+	SCRIPT_SOUND_PARTY_9_LOOP_L,
+	SCRIPT_SOUND_PARTY_10_LOOP_S,
+	SCRIPT_SOUND_PARTY_10_LOOP_L,
+	SCRIPT_SOUND_PARTY_11_LOOP_S,
+	SCRIPT_SOUND_PARTY_11_LOOP_L,
+	SCRIPT_SOUND_PARTY_12_LOOP_S,
+	SCRIPT_SOUND_PARTY_12_LOOP_L,
+	SCRIPT_SOUND_PARTY_13_LOOP_S,
+	SCRIPT_SOUND_PARTY_13_LOOP_L,
+	SCRIPT_SOUND_STRIP_CLUB_LOOP_1_S,
+	SCRIPT_SOUND_STRIP_CLUB_LOOP_1_L,
+	SCRIPT_SOUND_STRIP_CLUB_LOOP_2_S,
+	SCRIPT_SOUND_STRIP_CLUB_LOOP_2_L,
+	SCRIPT_SOUND_WORK_SHOP_LOOP_S,
+	SCRIPT_SOUND_WORK_SHOP_LOOP_L,
+	SCRIPT_SOUND_SAWMILL_LOOP_S,
+	SCRIPT_SOUND_SAWMILL_LOOP_L,
+	SCRIPT_SOUND_38,
+	SCRIPT_SOUND_39,
+	SCRIPT_SOUND_LAUNDERETTE_LOOP_S,
+	SCRIPT_SOUND_LAUNDERETTE_LOOP_L,
+	SCRIPT_SOUND_CHINATOWN_RESTAURANT_S,
+	SCRIPT_SOUND_CHINATOWN_RESTAURANT_L,
+	SCRIPT_SOUND_CIPRIANI_RESAURANT_S,
+	SCRIPT_SOUND_CIPRIANI_RESAURANT_L,
+	SCRIPT_SOUND_46_S,
+	SCRIPT_SOUND_47_L,
+	SCRIPT_SOUND_MARCO_BISTRO_S,
+	SCRIPT_SOUND_MARCO_BISTRO_L,
+	SCRIPT_SOUND_AIRPORT_LOOP_S,
+	SCRIPT_SOUND_AIRPORT_LOOP_L,
+	SCRIPT_SOUND_SHOP_LOOP_S,
+	SCRIPT_SOUND_SHOP_LOOP_L,
+	SCRIPT_SOUND_CINEMA_LOOP_S,
+	SCRIPT_SOUND_CINEMA_LOOP_L,
+	SCRIPT_SOUND_DOCKS_LOOP_S,
+	SCRIPT_SOUND_DOCKS_LOOP_L,
+	SCRIPT_SOUND_HOME_LOOP_S,
+	SCRIPT_SOUND_HOME_LOOP_L,
+	SCRIPT_SOUND_FRANKIE_PIANO,
+	SCRIPT_SOUND_PARTY_1_LOOP,
+	SCRIPT_SOUND_PORN_CINEMA_1_S,
+	SCRIPT_SOUND_PORN_CINEMA_1_L,
+	SCRIPT_SOUND_PORN_CINEMA_2_S,
+	SCRIPT_SOUND_PORN_CINEMA_2_L,
+	SCRIPT_SOUND_PORN_CINEMA_3_S,
+	SCRIPT_SOUND_PORN_CINEMA_3_L,
+	SCRIPT_SOUND_BANK_ALARM_LOOP_S,
+	SCRIPT_SOUND_BANK_ALARM_LOOP_L,
+	SCRIPT_SOUND_POLICE_BALL_LOOP_S,
+	SCRIPT_SOUND_POLICE_BALL_LOOP_L,
+	SCRIPT_SOUND_RAVE_LOOP_INDUSTRIAL_S,
+	SCRIPT_SOUND_RAVE_LOOP_INDUSTRIAL_L,
+	SCRIPT_SOUND_74,
+	SCRIPT_SOUND_75,
+	SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_S,
+	SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_L,
+	SCRIPT_SOUND_INJURED_PED_MALE_OUCH_S,
+	SCRIPT_SOUND_INJURED_PED_MALE_OUCH_L,
+	SCRIPT_SOUND_INJURED_PED_FEMALE_OUCH_S,
+	SCRIPT_SOUND_INJURED_PED_FEMALE_OUCH_L,
+	SCRIPT_SOUND_EVIDENCE_PICKUP,
+	SCRIPT_SOUND_UNLOAD_GOLD,
+	SCRIPT_SOUND_RAVE_1_LOOP_S,
+	SCRIPT_SOUND_RAVE_1_LOOP_L,
+	SCRIPT_SOUND_RAVE_2_LOOP_S,
+	SCRIPT_SOUND_RAVE_2_LOOP_L,
+	SCRIPT_SOUND_RAVE_3_LOOP_S,
+	SCRIPT_SOUND_RAVE_3_LOOP_L,
+	SCRIPT_SOUND_MISTY_SEX_S,
+	SCRIPT_SOUND_MISTY_SEX_L,
+	SCRIPT_SOUND_GATE_START_CLUNK,
+	SCRIPT_SOUND_GATE_STOP_CLUNK,
+	SCRIPT_SOUND_PART_MISSION_COMPLETE,
+	SCRIPT_SOUND_CHUNKY_RUN_SHOUT,
+	SCRIPT_SOUND_SECURITY_GUARD_AWAY_SHOUT,
+	SCRIPT_SOUND_RACE_START_3,
+	SCRIPT_SOUND_RACE_START_2,
+	SCRIPT_SOUND_RACE_START_1,
+	SCRIPT_SOUND_RACE_START_GO,
+	SCRIPT_SOUND_SWAT_PED_SHOUT,
+	SCRIPT_SOUND_PRETEND_FIRE_LOOP,
+	SCRIPT_SOUND_AMMUNATION_CHAT_1,
+	SCRIPT_SOUND_AMMUNATION_CHAT_2,
+	SCRIPT_SOUND_AMMUNATION_CHAT_3,
+	SCRIPT_SOUND_BULLET_HIT_GROUND_1,
+	SCRIPT_SOUND_BULLET_HIT_GROUND_2,
+	SCRIPT_SOUND_BULLET_HIT_GROUND_3,
+	SCRIPT_SOUND_BULLET_HIT_WATER, // no sound
+	SCRIPT_SOUND_110,
+	SCRIPT_SOUND_111,
+	SCRIPT_SOUND_PAYPHONE_RINGING,
+	SCRIPT_SOUND_113,
+	SCRIPT_SOUND_GLASS_BREAK_L,
+	SCRIPT_SOUND_GLASS_BREAK_S,
+	SCRIPT_SOUND_GLASS_CRACK,
+	SCRIPT_SOUND_GLASS_LIGHT_BREAK,
+	SCRIPT_SOUND_BOX_DESTROYED_1,
+	SCRIPT_SOUND_BOX_DESTROYED_2,
+	SCRIPT_SOUND_METAL_COLLISION,
+	SCRIPT_SOUND_TIRE_COLLISION,
+	SCRIPT_SOUND_GUNSHELL_DROP,
+	SCRIPT_SOUND_GUNSHELL_DROP_SOFT,
+	SCRIPT_SOUND_TOTAL,
+	SCRIPT_SOUND_INVALID,
 };
diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp
index ee01b6c4..6fac3f9d 100644
--- a/src/control/Phones.cpp
+++ b/src/control/Phones.cpp
@@ -12,6 +12,7 @@
 #include "AudioScriptObject.h"
 #include "RpAnimBlend.h"
 #include "AnimBlendAssociation.h"
+#include "soundlist.h"
 #ifdef FIX_BUGS
 #include "Replay.h"
 #endif
@@ -97,7 +98,7 @@ CPhoneInfo::Update(void)
 					if (scratchTheCabinet) {
 						m_aPhones[phoneId].m_pEntity->GetUp().z = (CGeneral::GetRandomNumber() % 1024) / 16000.0f + 1.0f;
 						if (!phoneRings)
-							PlayOneShotScriptObject(_SCRSOUND_PHONE_RING, m_aPhones[phoneId].m_pEntity->GetPosition());
+						    PlayOneShotScriptObject(SCRIPT_SOUND_PAYPHONE_RINGING, m_aPhones[phoneId].m_pEntity->GetPosition());
 					} else {
 						m_aPhones[phoneId].m_pEntity->GetUp().z = 1.0f;
 					}
@@ -136,7 +137,7 @@ CPhoneInfo::Update(void)
 					if (scratchTheCabinet) {
 						m_aPhones[phoneId].m_pEntity->GetUp().z = (CGeneral::GetRandomNumber() % 1024) / 16000.0f + 1.0f;
 						if (!phoneRings)
-							PlayOneShotScriptObject(_SCRSOUND_PHONE_RING, m_aPhones[phoneId].m_pEntity->GetPosition());
+						    PlayOneShotScriptObject(SCRIPT_SOUND_PAYPHONE_RINGING, m_aPhones[phoneId].m_pEntity->GetPosition());
 					} else {
 						m_aPhones[phoneId].m_pEntity->GetUp().z = 1.0f;
 					}
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp
index a5896975..0107c75c 100644
--- a/src/objects/Object.cpp
+++ b/src/objects/Object.cpp
@@ -11,6 +11,7 @@
 #include "ObjectData.h"
 #include "World.h"
 #include "Floater.h"
+#include "soundlist.h"
 
 int16 CObject::nNoTempObjects;
 int16 CObject::nBodyCastHealth = 1000;
@@ -220,7 +221,7 @@ CObject::ObjectDamage(float amount)
 				int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 80);
 				CParticle::AddParticle(PARTICLE_CAR_DEBRIS, vecPos, vecDir, nil, fSize, randomColor, nRotationSpeed, 0, currentFrame, 0);
 			}
-			PlayOneShotScriptObject(_SCRSOUND_CARDBOARD_BOX_SMASH, vecPos);
+			PlayOneShotScriptObject(SCRIPT_SOUND_BOX_DESTROYED_2, vecPos);
 			break;
 		}
 		case DAMAGE_EFFECT_SMASH_WOODENBOX_COMPLETELY: {
@@ -243,7 +244,7 @@ CObject::ObjectDamage(float amount)
 				int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 80);
 				CParticle::AddParticle(PARTICLE_CAR_DEBRIS, vecPos, vecDir, nil, fSize, randomColor, nRotationSpeed, 0, currentFrame, 0);
 			}
-			PlayOneShotScriptObject(_SCRSOUND_WOODEN_BOX_SMASH, vecPos);
+			PlayOneShotScriptObject(SCRIPT_SOUND_BOX_DESTROYED_1, vecPos);
 			break;
 		}
 		case DAMAGE_EFFECT_SMASH_TRAFFICCONE_COMPLETELY: {
@@ -268,7 +269,7 @@ CObject::ObjectDamage(float amount)
 				int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 80);
 				CParticle::AddParticle(PARTICLE_CAR_DEBRIS, vecPos, vecDir, nil, fSize, color, nRotationSpeed, 0, currentFrame, 0);
 			}
-			PlayOneShotScriptObject(_SCRSOUND_TYRE_BUMP, vecPos);
+			PlayOneShotScriptObject(SCRIPT_SOUND_TIRE_COLLISION, vecPos);
 			break;
 		}
 		case DAMAGE_EFFECT_SMASH_BARPOST_COMPLETELY: {
@@ -293,7 +294,7 @@ CObject::ObjectDamage(float amount)
 				int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 80);
 				CParticle::AddParticle(PARTICLE_CAR_DEBRIS, vecPos, vecDir, nil, fSize, color, nRotationSpeed, 0, currentFrame, 0);
 			}
-			PlayOneShotScriptObject(_SCRSOUND_COL_CAR, vecPos);
+			PlayOneShotScriptObject(SCRIPT_SOUND_METAL_COLLISION, vecPos);
 			break;
 		}
 		}
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index ee54ea60..3fea499a 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -446,8 +446,8 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 	m_nPedType = pedType;
 	m_lastSoundStart = 0;
 	m_soundStart = 0;
-	m_lastQueuedSound = SOUND_TOTAL_PED_SOUNDS;
-	m_queuedSound = SOUND_TOTAL_PED_SOUNDS;
+	m_lastQueuedSound = SOUND_NO_SOUND;
+	m_queuedSound = SOUND_NO_SOUND;
 	m_objective = OBJECTIVE_NONE;
 	m_prevObjective = OBJECTIVE_NONE;
 	CharCreatedBy = RANDOM_CHAR;
@@ -5873,7 +5873,7 @@ CPed::PlayHitSound(CPed *hitTo)
 		S42 = SOUND_FIGHT_PUNCH_FROM_BEHIND_42,
 		S43 = SOUND_FIGHT_KNEE_OR_KICK_43,
 		S44 = SOUND_FIGHT_KICK_44,
-		NO_SND = SOUND_TOTAL_PED_SOUNDS
+		NO_SND = SOUND_NO_SOUND
 	};
 	uint16 hitSoundsByFightMoves[12][10] = {
 		{S39,S42,S43,S43,S39,S39,S39,S39,S39,S42},
@@ -16503,7 +16503,7 @@ CPed::ServiceTalking(void)
 		} else {
 			m_queuedSound = SOUND_PED_BOMBER;
 		}
-		if (m_queuedSound != SOUND_TOTAL_PED_SOUNDS) {
+		if (m_queuedSound != SOUND_NO_SOUND) {
 			if (m_queuedSound == SOUND_PED_DEATH)
 				m_soundStart = CTimer::GetTimeInMilliseconds() - 1;
 
@@ -16515,7 +16515,7 @@ CPed::ServiceTalking(void)
 					+ CTimer::GetTimeInMilliseconds()
 					+ CGeneral::GetRandomNumberInRange(0, CommentWaitTime[m_queuedSound - SOUND_PED_DEATH].m_nOverrideFixedDelayTime);
 				m_lastQueuedSound = m_queuedSound;
-				m_queuedSound = SOUND_TOTAL_PED_SOUNDS;
+				m_queuedSound = SOUND_NO_SOUND;
 			}
 		}
 	}
diff --git a/src/render/Glass.cpp b/src/render/Glass.cpp
index 6f17013c..ac892ddb 100644
--- a/src/render/Glass.cpp
+++ b/src/render/Glass.cpp
@@ -13,6 +13,7 @@
 #include "Shadows.h"
 #include "ModelIndices.h"
 #include "main.h"
+#include "soundlist.h"
 
 
 uint32 CGlass::NumGlassEntities;
@@ -101,7 +102,7 @@ CFallingGlassPane::Update(void)
 
 			pos = CVector(GetPosition().x, GetPosition().y, m_fGroundZ);
 
-			PlayOneShotScriptObject(_SCRSOUND_GLASS_SHARD, pos);
+			PlayOneShotScriptObject(SCRIPT_SOUND_GLASS_LIGHT_BREAK, pos);
 
 			RwRGBA color = { 255, 255, 255, 255 };
 
@@ -627,7 +628,7 @@ CGlass::WindowRespondsToCollision(CEntity *entity, float amount, CVector speed,
 
 	if ( amount > 300.0f )
 	{
-		PlayOneShotScriptObject(_SCRSOUND_GLASS_SMASH_1, object->GetPosition());
+		PlayOneShotScriptObject(SCRIPT_SOUND_GLASS_BREAK_L, object->GetPosition());
 
 		GeneratePanesForWindow(0,
 			CVector(minx,      miny,      minz),
@@ -637,7 +638,7 @@ CGlass::WindowRespondsToCollision(CEntity *entity, float amount, CVector speed,
 	}
 	else
 	{
-		PlayOneShotScriptObject(_SCRSOUND_GLASS_SMASH_2, object->GetPosition());
+		PlayOneShotScriptObject(SCRIPT_SOUND_GLASS_BREAK_S, object->GetPosition());
 
 		GeneratePanesForWindow(1,
 			CVector(minx,      miny,      minz),
@@ -659,7 +660,7 @@ CGlass::WindowRespondsToSoftCollision(CEntity *entity, float amount)
 
 	if ( amount > 50.0f && !object->bGlassCracked )
 	{
-		PlayOneShotScriptObject(_SCRSOUND_GLASS_CRACK, object->GetPosition());
+		PlayOneShotScriptObject(SCRIPT_SOUND_GLASS_CRACK, object->GetPosition());
 		object->bGlassCracked = true;
 	}
 }
@@ -675,7 +676,7 @@ CGlass::WasGlassHitByBullet(CEntity *entity, CVector point)
 	{
 		if ( !object->bGlassCracked )
 		{
-			PlayOneShotScriptObject(_SCRSOUND_GLASS_CRACK, object->GetPosition());
+			PlayOneShotScriptObject(SCRIPT_SOUND_GLASS_CRACK, object->GetPosition());
 			object->bGlassCracked = true;
 		}
 		else
diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp
index e73cd9a7..5f37bdc6 100644
--- a/src/render/Particle.cpp
+++ b/src/render/Particle.cpp
@@ -11,6 +11,7 @@
 #include "AudioScriptObject.h"
 #include "ParticleObject.h"
 #include "Particle.h"
+#include "soundlist.h"
 
 
 #define MAX_PARTICLES_ON_SCREEN   (1000)
@@ -1268,7 +1269,7 @@ void CParticle::Update()
 												nil,
 												particle->m_fSize, color, particle->m_nRotationStep, 0, 0, 0);
 									
-									PlayOneShotScriptObject(_SCRSOUND_BULLET_SHELL_HIT_GROUND_1, particle->m_vecPosition);
+									PlayOneShotScriptObject(SCRIPT_SOUND_GUNSHELL_DROP, particle->m_vecPosition);
 								}
 								break;
 							
@@ -1287,7 +1288,7 @@ void CParticle::Update()
 												nil,
 												particle->m_fSize, color, 0, 0, 0, 0);
 									
-									PlayOneShotScriptObject(_SCRSOUND_BULLET_SHELL_HIT_GROUND_2, particle->m_vecPosition);
+									PlayOneShotScriptObject(SCRIPT_SOUND_GUNSHELL_DROP_SOFT, particle->m_vecPosition);
 								}
 								break;