diff options
| author | Thanasis Antoniou | 2019-04-06 00:02:32 +0300 |
|---|---|---|
| committer | Thanasis Antoniou | 2019-04-06 00:02:32 +0300 |
| commit | 4e75b7e6b760f9fb3959b54ff0c7e3b8118023c4 (patch) | |
| tree | fe573288b4017476aa6b722b2b272f7588c2c931 | |
| parent | 5354c1b764ff16a1c7cb81fa5fba681a42a200f6 (diff) | |
| download | scummvm-rg350-4e75b7e6b760f9fb3959b54ff0c7e3b8118023c4.tar.gz scummvm-rg350-4e75b7e6b760f9fb3959b54ff0c7e3b8118023c4.tar.bz2 scummvm-rg350-4e75b7e6b760f9fb3959b54ff0c7e3b8118023c4.zip | |
BLADERUNNER: Cleanup for looping sounds
Completed Add, Adjust and Remove Looping_Sound(), Pending Ambient_Sounds_Add_Sound
107 files changed, 257 insertions, 257 deletions
diff --git a/engines/bladerunner/script/ai/luther.cpp b/engines/bladerunner/script/ai/luther.cpp index 78ac56a03f..f30763a0d9 100644 --- a/engines/bladerunner/script/ai/luther.cpp +++ b/engines/bladerunner/script/ai/luther.cpp @@ -91,7 +91,7 @@ bool AIScriptLuther::Update() { Scene_Loop_Set_Default(5); // UG16MainLoopNoComputerLight Scene_Loop_Start_Special(kSceneLoopModeOnce, 4, true); // UG16SparkLoop Ambient_Sounds_Play_Sound(kSfxCOMPDWN4, 50, 0, 0, 99); - Ambient_Sounds_Remove_Looping_Sound(516, 1); + Ambient_Sounds_Remove_Looping_Sound(kSfxELECLAB1, 1); return false; } diff --git a/engines/bladerunner/script/scene/ar01.cpp b/engines/bladerunner/script/scene/ar01.cpp index db44941425..43ccf74fd1 100644 --- a/engines/bladerunner/script/scene/ar01.cpp +++ b/engines/bladerunner/script/scene/ar01.cpp @@ -54,9 +54,9 @@ void SceneScriptAR01::InitializeScene() { if (Game_Flag_Query(kFlagSpinnerAtAR01)) { Scene_Exit_Add_2D_Exit(kAR01ExitSpinner, 0, 404, 99, 479, 2); } - Ambient_Sounds_Add_Looping_Sound( 54, 50, 1, 1); - Ambient_Sounds_Add_Looping_Sound( 81, 60, 100, 1); - Ambient_Sounds_Add_Looping_Sound(241, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRCAMBR1, 60, 100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxHCLOOP1, 50, 1, 1); Ambient_Sounds_Add_Sound(182, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(184, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(185, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ar02.cpp b/engines/bladerunner/script/scene/ar02.cpp index 7b7351bff3..6fdb1116ad 100644 --- a/engines/bladerunner/script/scene/ar02.cpp +++ b/engines/bladerunner/script/scene/ar02.cpp @@ -33,9 +33,9 @@ void SceneScriptAR02::InitializeScene() { } Scene_Exit_Add_2D_Exit(0, 0, 439, 212, 479, 2); Scene_Exit_Add_2D_Exit(1, 81, 202, 215, 406, 3); - Ambient_Sounds_Add_Looping_Sound(54, 50, 1, 1); - Ambient_Sounds_Add_Looping_Sound(81, 60, 100, 1); - Ambient_Sounds_Add_Looping_Sound(241, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRCAMBR1, 60, 100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxHCLOOP1, 50, 1, 1); Ambient_Sounds_Add_Sound(182, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(184, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(185, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/bb01.cpp b/engines/bladerunner/script/scene/bb01.cpp index 5c1b6abd65..9fce3cbb94 100644 --- a/engines/bladerunner/script/scene/bb01.cpp +++ b/engines/bladerunner/script/scene/bb01.cpp @@ -47,8 +47,8 @@ void SceneScriptBB01::InitializeScene() { Scene_Exit_Add_2D_Exit(2, 0, 311, 312, 479, 2); } - Ambient_Sounds_Add_Looping_Sound( 54, 50, 0, 1); - Ambient_Sounds_Add_Looping_Sound(105, 25, -100, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 25, -100, 0); Ambient_Sounds_Add_Sound( 82, 5, 60, 40, 60, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 83, 5, 60, 40, 65, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 84, 5, 60, 40, 60, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/bb02.cpp b/engines/bladerunner/script/scene/bb02.cpp index 082c5325fa..3d6ea8a5b6 100644 --- a/engines/bladerunner/script/scene/bb02.cpp +++ b/engines/bladerunner/script/scene/bb02.cpp @@ -46,8 +46,8 @@ void SceneScriptBB02::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 207, 291, 275, 443, 3); Scene_Exit_Add_2D_Exit(2, 303, 422, 639, 479, 2); - Ambient_Sounds_Add_Looping_Sound( 54, 20, 0, 1); - Ambient_Sounds_Add_Looping_Sound(103, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 20, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAINAWN1, 40, 0, 1); Ambient_Sounds_Add_Sound(443, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(444, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(445, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/bb03.cpp b/engines/bladerunner/script/scene/bb03.cpp index 65caf37cb0..09b7ccdf96 100644 --- a/engines/bladerunner/script/scene/bb03.cpp +++ b/engines/bladerunner/script/scene/bb03.cpp @@ -38,9 +38,9 @@ void SceneScriptBB03::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 167, 372, 439, 479, 2); Scene_Exit_Add_2D_Exit(2, 451, 115, 547, 320, 1); - Ambient_Sounds_Add_Looping_Sound( 54, 20, 0, 1); - Ambient_Sounds_Add_Looping_Sound(103, 40, 0, 1); - Ambient_Sounds_Add_Looping_Sound(105, 34, 100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 20, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAINAWN1, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 34, 100, 1); Ambient_Sounds_Add_Sound(443, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(444, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(445, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/bb04.cpp b/engines/bladerunner/script/scene/bb04.cpp index 4f7be021d1..f422550e9d 100644 --- a/engines/bladerunner/script/scene/bb04.cpp +++ b/engines/bladerunner/script/scene/bb04.cpp @@ -37,9 +37,9 @@ void SceneScriptBB04::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 218, 102, 360, 254, 1); Scene_Exit_Add_2D_Exit(1, 0, 334, 639, 479, 2); - Ambient_Sounds_Add_Looping_Sound( 54, 20, 0, 1); - Ambient_Sounds_Add_Looping_Sound(103, 40, 0, 1); - Ambient_Sounds_Add_Looping_Sound(105, 44, -100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 20, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAINAWN1, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 44, -100, 1); Ambient_Sounds_Add_Sound(443, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(444, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(445, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/bb05.cpp b/engines/bladerunner/script/scene/bb05.cpp index ef3e5ba6ac..03848ca795 100644 --- a/engines/bladerunner/script/scene/bb05.cpp +++ b/engines/bladerunner/script/scene/bb05.cpp @@ -40,9 +40,9 @@ void SceneScriptBB05::InitializeScene() { Scene_Exit_Add_2D_Exit(2, 589, 0, 639, 479, 1); Scene_Exit_Add_2D_Exit(3, 481, 113, 573, 307, 0); - Ambient_Sounds_Add_Looping_Sound( 54, 12, 0, 1); - Ambient_Sounds_Add_Looping_Sound(103, 28, 0, 1); - Ambient_Sounds_Add_Looping_Sound(105, 14, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 12, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAINAWN1, 28, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 14, 0, 1); Ambient_Sounds_Add_Sound(303, 5, 50, 17, 27, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(304, 5, 50, 17, 27, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(305, 5, 50, 17, 27, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/bb06.cpp b/engines/bladerunner/script/scene/bb06.cpp index d25b1fcfa0..025d61e97f 100644 --- a/engines/bladerunner/script/scene/bb06.cpp +++ b/engines/bladerunner/script/scene/bb06.cpp @@ -40,7 +40,7 @@ void SceneScriptBB06::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 425, 0, 639, 361, 0); Scene_Exit_Add_2D_Exit(3, 195, 164, 239, 280, 3); - Ambient_Sounds_Add_Looping_Sound(103, 28, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAINAWN1, 28, 0, 1); Ambient_Sounds_Add_Sound(303, 5, 50, 17, 27, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(304, 5, 50, 17, 27, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(443, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/bb07.cpp b/engines/bladerunner/script/scene/bb07.cpp index 590abdd5f2..b7edbfd82a 100644 --- a/engines/bladerunner/script/scene/bb07.cpp +++ b/engines/bladerunner/script/scene/bb07.cpp @@ -40,8 +40,8 @@ void SceneScriptBB07::InitializeScene() { Scene_2D_Region_Add(0, 308, 283, 354, 308); - Ambient_Sounds_Add_Looping_Sound(332, 44, 0, 1); - Ambient_Sounds_Add_Looping_Sound(331, 24, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1, 44, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxSTMLOOP7, 24, 0, 1); Ambient_Sounds_Add_Sound(443, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(444, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(445, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/bb08.cpp b/engines/bladerunner/script/scene/bb08.cpp index 7c856dba4f..bba755b559 100644 --- a/engines/bladerunner/script/scene/bb08.cpp +++ b/engines/bladerunner/script/scene/bb08.cpp @@ -34,7 +34,7 @@ void SceneScriptBB08::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 307, 0, 361, 238, 0); Scene_Exit_Add_2D_Exit(1, 117, 38, 214, 245, 0); - Ambient_Sounds_Add_Looping_Sound(105, 44, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 44, 0, 1); Ambient_Sounds_Add_Sound(291, 1, 20, 20, 25, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(292, 1, 20, 20, 25, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(293, 1, 20, 20, 25, -100, 100, -100, 100, 0, 0); diff --git a/engines/bladerunner/script/scene/bb09.cpp b/engines/bladerunner/script/scene/bb09.cpp index ffe0fd08f6..9c519460c2 100644 --- a/engines/bladerunner/script/scene/bb09.cpp +++ b/engines/bladerunner/script/scene/bb09.cpp @@ -37,9 +37,9 @@ void SceneScriptBB09::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 224, 213, 286, 353, 1); Scene_Exit_Add_2D_Exit(1, 75, 450, 480, 479, 2); - Ambient_Sounds_Add_Looping_Sound(54, 20, 100, 1); - Ambient_Sounds_Add_Looping_Sound(103, 40, 0, 1); - Ambient_Sounds_Add_Looping_Sound(105, 50, 55, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 20, 100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAINAWN1, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 50, 55, 1); Ambient_Sounds_Add_Sound(297, 5, 20, 20, 25, -100, -100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(298, 5, 20, 20, 25, -100, -100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(299, 5, 20, 20, 25, -100, -100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/bb10.cpp b/engines/bladerunner/script/scene/bb10.cpp index 8e0da6b032..5d588d4b0b 100644 --- a/engines/bladerunner/script/scene/bb10.cpp +++ b/engines/bladerunner/script/scene/bb10.cpp @@ -41,7 +41,7 @@ void SceneScriptBB10::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 58, 91, 193, 401, 3); Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); - Ambient_Sounds_Add_Looping_Sound(382, 76, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAINALY1, 76, 0, 1); Ambient_Sounds_Add_Sound(443, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(444, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(445, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/bb11.cpp b/engines/bladerunner/script/scene/bb11.cpp index b844e93234..c303805481 100644 --- a/engines/bladerunner/script/scene/bb11.cpp +++ b/engines/bladerunner/script/scene/bb11.cpp @@ -30,9 +30,9 @@ void SceneScriptBB11::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 280, 154, 388, 247, 2); } - Ambient_Sounds_Add_Looping_Sound(101, 90, 0, 1); - Ambient_Sounds_Add_Looping_Sound( 99, 45, 0, 1); - Ambient_Sounds_Add_Looping_Sound(100, 76, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxROOFRAN1, 90, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxROOFAIR1, 45, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxROOFRMB1, 76, 0, 1); Ambient_Sounds_Add_Sound( 68, 5, 180, 16, 25, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 69, 5, 180, 16, 25, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(375, 5, 180, 50, 100, 0, 0, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/bb12.cpp b/engines/bladerunner/script/scene/bb12.cpp index a51136c301..7c2980618b 100644 --- a/engines/bladerunner/script/scene/bb12.cpp +++ b/engines/bladerunner/script/scene/bb12.cpp @@ -38,7 +38,7 @@ void SceneScriptBB12::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 589, 0, 639, 479, 1); Scene_Exit_Add_2D_Exit(2, 377, 374, 533, 479, 2); - Ambient_Sounds_Add_Looping_Sound(103, 28, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAINAWN1, 28, 0, 1); Ambient_Sounds_Add_Sound(443, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(444, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(445, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/bb51.cpp b/engines/bladerunner/script/scene/bb51.cpp index d5d5630d36..4dd46f732d 100644 --- a/engines/bladerunner/script/scene/bb51.cpp +++ b/engines/bladerunner/script/scene/bb51.cpp @@ -31,7 +31,7 @@ void SceneScriptBB51::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 615, 0, 639, 479, 1); Scene_Exit_Add_2D_Exit(1, 0, 323, 241, 479, 2); - Ambient_Sounds_Add_Looping_Sound(103, 28, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAINAWN1, 28, 0, 1); Ambient_Sounds_Add_Sound(303, 5, 50, 17, 27, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(304, 5, 50, 17, 27, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(443, 2, 180, 14, 16, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ct01.cpp b/engines/bladerunner/script/scene/ct01.cpp index f9e9016d6c..9207274829 100644 --- a/engines/bladerunner/script/scene/ct01.cpp +++ b/engines/bladerunner/script/scene/ct01.cpp @@ -78,9 +78,9 @@ void SceneScriptCT01::InitializeScene() { if (Game_Flag_Query(kFlagSpinnerAtCT01)) { Scene_Exit_Add_2D_Exit(kCT01ExitSpinner, 0, 286, 158, 350, 2); } - Ambient_Sounds_Add_Looping_Sound(54, 50, 1, 1); - Ambient_Sounds_Add_Looping_Sound(55, 40, -100, 1); - Ambient_Sounds_Add_Looping_Sound(56, 40, 100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTAMBL1, 40, -100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTAMBR1, 40, 100, 1); Ambient_Sounds_Add_Sound(61, 10, 30, 16, 20, 0, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(62, 10, 30, 16, 20, 0, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(63, 10, 30, 16, 20, 0, 100, -101, -101, 0, 0); @@ -434,8 +434,8 @@ void SceneScriptCT01::PlayerWalkedIn() { void SceneScriptCT01::PlayerWalkedOut() { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); if (Game_Flag_Query(kFlagCT01toCT12)) { - Ambient_Sounds_Remove_Looping_Sound(55, true); - Ambient_Sounds_Remove_Looping_Sound(56, true); + Ambient_Sounds_Remove_Looping_Sound(kSfxCTAMBL1, true); + Ambient_Sounds_Remove_Looping_Sound(kSfxCTAMBR1, true); } else { Ambient_Sounds_Remove_All_Looping_Sounds(1); } diff --git a/engines/bladerunner/script/scene/ct02.cpp b/engines/bladerunner/script/scene/ct02.cpp index 4be9afa2df..e4cc82c1ae 100644 --- a/engines/bladerunner/script/scene/ct02.cpp +++ b/engines/bladerunner/script/scene/ct02.cpp @@ -50,9 +50,9 @@ void SceneScriptCT02::InitializeScene() { } else { Overlay_Play("ct02over", 0, true, false, 0); } - Ambient_Sounds_Add_Looping_Sound(96, 25, 0, 1); - Ambient_Sounds_Add_Looping_Sound(56, 38, 100, 1); - Ambient_Sounds_Add_Looping_Sound(95, 32, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxKTCHRAIN, 25, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTAMBR1, 38, 100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBOILPOT2, 32, 0, 1); Ambient_Sounds_Add_Sound(61, 10, 30, 8, 8, 100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(62, 10, 30, 7, 7, 100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(63, 10, 30, 8, 8, 100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ct03.cpp b/engines/bladerunner/script/scene/ct03.cpp index f674a8d8cb..4b9b142a6a 100644 --- a/engines/bladerunner/script/scene/ct03.cpp +++ b/engines/bladerunner/script/scene/ct03.cpp @@ -39,9 +39,9 @@ void SceneScriptCT03::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 0, 460, 639, 479, 2); Scene_Exit_Add_2D_Exit(1, 40, 40, 134, 302, 3); Scene_Exit_Add_2D_Exit(2, 390, 0, 539, 230, 1); - Ambient_Sounds_Add_Looping_Sound( 54, 50, 1, 1); - Ambient_Sounds_Add_Looping_Sound( 56, 22, -100, 1); - Ambient_Sounds_Add_Looping_Sound(105, 34, -100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTAMBR1, 22, -100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 34, -100, 1); Ambient_Sounds_Add_Sound(68, 10, 40, 33, 50, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(69, 10, 40, 33, 50, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(61, 3, 30, 8, 10, -100, 0, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ct04.cpp b/engines/bladerunner/script/scene/ct04.cpp index 5b074b3c31..0295439ca3 100644 --- a/engines/bladerunner/script/scene/ct04.cpp +++ b/engines/bladerunner/script/scene/ct04.cpp @@ -42,9 +42,9 @@ void SceneScriptCT04::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 590, 0, 639, 479, 1); Scene_Exit_Add_2D_Exit(1, 194, 84, 320, 274, 0); - Ambient_Sounds_Add_Looping_Sound(54, 50, 1, 1); - Ambient_Sounds_Add_Looping_Sound(56, 15, -100, 1); - Ambient_Sounds_Add_Looping_Sound(105, 34, 100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTAMBR1, 15, -100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 34, 100, 1); Ambient_Sounds_Add_Sound(68, 10, 40, 33, 50, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(69, 10, 40, 33, 50, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); diff --git a/engines/bladerunner/script/scene/ct05.cpp b/engines/bladerunner/script/scene/ct05.cpp index 99846897e9..0389c53336 100644 --- a/engines/bladerunner/script/scene/ct05.cpp +++ b/engines/bladerunner/script/scene/ct05.cpp @@ -40,9 +40,9 @@ void SceneScriptCT05::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 320, 458, 639, 479, 2); Scene_Exit_Add_2D_Exit(2, 380, 110, 542, 300, 0); - Ambient_Sounds_Add_Looping_Sound(106, 15, -100, 1); - Ambient_Sounds_Add_Looping_Sound(107, 15, 100, 1); - Ambient_Sounds_Add_Looping_Sound( 56, 13, -100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTROOFL1, 15, -100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTROOFR1, 15, 100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTAMBR1, 13, -100, 1); Ambient_Sounds_Add_Sound( 90, 5, 20, 8, 10, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 91, 5, 20, 8, 10, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(205, 5, 30, 18, 30, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ct06.cpp b/engines/bladerunner/script/scene/ct06.cpp index 22c0b939fb..7019921d63 100644 --- a/engines/bladerunner/script/scene/ct06.cpp +++ b/engines/bladerunner/script/scene/ct06.cpp @@ -40,8 +40,8 @@ void SceneScriptCT06::InitializeScene() { Actor_Set_At_XYZ(kActorZuben, 58.41f, -58.23f, -24.97f, 240); Actor_Retired_Here(kActorZuben, 72, 36, 1, kActorMcCoy); } - Ambient_Sounds_Add_Looping_Sound(381, 100, 1, 1); - Ambient_Sounds_Add_Looping_Sound(205, 20, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAIN10, 100, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTDRONE1, 20, 1, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); diff --git a/engines/bladerunner/script/scene/ct07.cpp b/engines/bladerunner/script/scene/ct07.cpp index d653afdb2c..1beb06a887 100644 --- a/engines/bladerunner/script/scene/ct07.cpp +++ b/engines/bladerunner/script/scene/ct07.cpp @@ -29,9 +29,9 @@ void SceneScriptCT07::InitializeScene() { Actor_Put_In_Set(kActorZuben, kSetCT07); Actor_Set_At_XYZ(kActorZuben, -9.68f, -58.23f, 11.14f, 250); - Ambient_Sounds_Add_Looping_Sound( 54, 30, 90, 1); - Ambient_Sounds_Add_Looping_Sound(205, 20, 1, 1); - Ambient_Sounds_Add_Looping_Sound( 56, 40, 100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 30, 90, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTDRONE1, 20, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTAMBR1, 40, 100, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); diff --git a/engines/bladerunner/script/scene/ct08.cpp b/engines/bladerunner/script/scene/ct08.cpp index 40f9699bba..80ff38a524 100644 --- a/engines/bladerunner/script/scene/ct08.cpp +++ b/engines/bladerunner/script/scene/ct08.cpp @@ -57,8 +57,8 @@ void SceneScriptCT08::InitializeScene() { Scene_2D_Region_Add(0, 185, 185, 230, 230); } - Ambient_Sounds_Add_Looping_Sound(381, 100, 1, 1); - Ambient_Sounds_Add_Looping_Sound(205, 20, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAIN10, 100, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTDRONE1, 20, 1, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); diff --git a/engines/bladerunner/script/scene/ct09.cpp b/engines/bladerunner/script/scene/ct09.cpp index bfb69bce9d..75ffdb08de 100644 --- a/engines/bladerunner/script/scene/ct09.cpp +++ b/engines/bladerunner/script/scene/ct09.cpp @@ -37,7 +37,7 @@ void SceneScriptCT09::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 0, 0, 15, 479, 3); Scene_Exit_Add_2D_Exit(2, 198, 177, 263, 311, 0); - Ambient_Sounds_Add_Looping_Sound(336, 28, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxFLORBUZZ, 28, 0, 1); Ambient_Sounds_Add_Sound(375, 6, 180, 33, 33, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(376, 5, 180, 33, 33, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(377, 5, 180, 33, 33, 0, 0, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ct10.cpp b/engines/bladerunner/script/scene/ct10.cpp index a3ffcd38dc..5ada2b4f45 100644 --- a/engines/bladerunner/script/scene/ct10.cpp +++ b/engines/bladerunner/script/scene/ct10.cpp @@ -30,7 +30,7 @@ void SceneScriptCT10::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 135, 74, 238, 340, 0); - Ambient_Sounds_Add_Looping_Sound(336, 28, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxFLORBUZZ, 28, 0, 1); Ambient_Sounds_Add_Sound(375, 6, 180, 33, 33, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(376, 5, 180, 33, 33, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(377, 5, 180, 33, 33, 0, 0, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ct11.cpp b/engines/bladerunner/script/scene/ct11.cpp index e5e772df15..dc2b86ba90 100644 --- a/engines/bladerunner/script/scene/ct11.cpp +++ b/engines/bladerunner/script/scene/ct11.cpp @@ -42,7 +42,7 @@ void SceneScriptCT11::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 97, 0, 155, 324, 0); Scene_Exit_Add_2D_Exit(2, 0, 0, 20, 479, 3); - Ambient_Sounds_Add_Looping_Sound(54, 50, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 0, 1); Ambient_Sounds_Add_Sound( 67, 5, 80, 16, 25, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 66, 5, 80, 16, 25, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(378, 5, 80, 50, 100, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ct12.cpp b/engines/bladerunner/script/scene/ct12.cpp index 282ad25cfd..96641bade3 100644 --- a/engines/bladerunner/script/scene/ct12.cpp +++ b/engines/bladerunner/script/scene/ct12.cpp @@ -49,9 +49,9 @@ void SceneScriptCT12::InitializeScene() { Scene_Exit_Add_2D_Exit(4, 324, 150, 435, 340, 0); } - Ambient_Sounds_Add_Looping_Sound(54, 33, 1, 1); - Ambient_Sounds_Add_Looping_Sound(55, 20, -100, 1); - Ambient_Sounds_Add_Looping_Sound(56, 20, -100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 33, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTAMBL1, 20, -100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTAMBR1, 20, -100, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); diff --git a/engines/bladerunner/script/scene/ct51.cpp b/engines/bladerunner/script/scene/ct51.cpp index 1bdf9a3117..4d9a12fbb8 100644 --- a/engines/bladerunner/script/scene/ct51.cpp +++ b/engines/bladerunner/script/scene/ct51.cpp @@ -30,7 +30,7 @@ void SceneScriptCT51::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 0, 0, 30, 479, 3); - Ambient_Sounds_Add_Looping_Sound(381, 100, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAIN10, 100, 1, 1); Ambient_Sounds_Add_Sound( 68, 60, 180, 16, 25, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 69, 60, 180, 16, 25, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(375, 60, 180, 50, 100, 0, 0, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/dr01.cpp b/engines/bladerunner/script/scene/dr01.cpp index af9198c1b9..b9d960cfa3 100644 --- a/engines/bladerunner/script/scene/dr01.cpp +++ b/engines/bladerunner/script/scene/dr01.cpp @@ -59,9 +59,9 @@ void SceneScriptDR01::InitializeScene() { } Ambient_Sounds_Remove_All_Non_Looping_Sounds(0); - Ambient_Sounds_Add_Looping_Sound( 54, 50, 0, 1); - Ambient_Sounds_Add_Looping_Sound(219, 12, 85, 1); - Ambient_Sounds_Add_Looping_Sound( 98, 14, 85, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxHUMMER3, 12, 85, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBIGFAN2, 14, 85, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); @@ -129,7 +129,7 @@ bool SceneScriptDR01::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -835.0f, -0.04f, -118.0f, 0, true, false, 0)) { Async_Actor_Walk_To_XYZ(kActorMcCoy, -911.0f, -0.04f, -118.0f, 0, false); - Ambient_Sounds_Adjust_Looping_Sound(112, 10, -100, 1); + Ambient_Sounds_Adjust_Looping_Sound(kSfxFACTAMB2, 10, -100, 1); Game_Flag_Set(kFlagDR01toDR02); Set_Enter(kSetDR01_DR02_DR04, kSceneDR02); } diff --git a/engines/bladerunner/script/scene/dr02.cpp b/engines/bladerunner/script/scene/dr02.cpp index ad473e6dda..8128d8bc19 100644 --- a/engines/bladerunner/script/scene/dr02.cpp +++ b/engines/bladerunner/script/scene/dr02.cpp @@ -43,9 +43,9 @@ void SceneScriptDR02::InitializeScene() { Ambient_Sounds_Remove_All_Non_Looping_Sounds(0); Ambient_Sounds_Remove_All_Looping_Sounds(0); - Ambient_Sounds_Add_Looping_Sound(54, 50, 0, 1); - Ambient_Sounds_Add_Looping_Sound(219, 27, 85, 1); - Ambient_Sounds_Add_Looping_Sound(98, 38, 85, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxHUMMER3, 27, 85, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBIGFAN2, 38, 85, 1); Ambient_Sounds_Add_Sound(378, 2, 50, 33, 100, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(379, 2, 50, 33, 100, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(380, 2, 50, 33, 100, -100, 100, -101, -101, 0, 0); @@ -125,8 +125,8 @@ bool SceneScriptDR02::ClickedOnExit(int exitId) { Game_Flag_Set(kFlagDR02toDR01); Set_Enter(kSetDR01_DR02_DR04, kSceneDR01); } - Ambient_Sounds_Adjust_Looping_Sound(219, 12, -101, 1); - Ambient_Sounds_Adjust_Looping_Sound(98, 14, -101, 1); + Ambient_Sounds_Adjust_Looping_Sound(kSfxHUMMER3, 12, -101, 1); + Ambient_Sounds_Adjust_Looping_Sound(kSfxBIGFAN2, 14, -101, 1); return true; } diff --git a/engines/bladerunner/script/scene/dr03.cpp b/engines/bladerunner/script/scene/dr03.cpp index 4c6ad5b27f..82892e1365 100644 --- a/engines/bladerunner/script/scene/dr03.cpp +++ b/engines/bladerunner/script/scene/dr03.cpp @@ -43,9 +43,9 @@ void SceneScriptDR03::InitializeScene() { } Ambient_Sounds_Remove_All_Looping_Sounds(1); - Ambient_Sounds_Add_Looping_Sound(110, 7, 0, 1); - Ambient_Sounds_Add_Looping_Sound(109, 50, 0, 1); - Ambient_Sounds_Add_Looping_Sound( 95, 20, 70, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRESPRTR1, 7, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBRBED3, 50, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBOILPOT2, 20, 70, 1); } void SceneScriptDR03::SceneLoaded() { diff --git a/engines/bladerunner/script/scene/dr04.cpp b/engines/bladerunner/script/scene/dr04.cpp index f71b62febf..80d7cbeb8f 100644 --- a/engines/bladerunner/script/scene/dr04.cpp +++ b/engines/bladerunner/script/scene/dr04.cpp @@ -50,9 +50,9 @@ void SceneScriptDR04::InitializeScene() { Scene_Exit_Add_2D_Exit(2, 222, 110, 269, 207, 0); Ambient_Sounds_Remove_All_Non_Looping_Sounds(0); - Ambient_Sounds_Add_Looping_Sound( 54, 50, 1, 1); - Ambient_Sounds_Add_Looping_Sound(288, 55, -100, 1); - Ambient_Sounds_Add_Looping_Sound(217, 28, -100, 100); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxFIREBD1, 55, -100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxHUMMER1, 28, -100, 100); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1); diff --git a/engines/bladerunner/script/scene/dr05.cpp b/engines/bladerunner/script/scene/dr05.cpp index 65ba400b45..b8292c4e2e 100644 --- a/engines/bladerunner/script/scene/dr05.cpp +++ b/engines/bladerunner/script/scene/dr05.cpp @@ -36,7 +36,7 @@ void SceneScriptDR05::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 0, 38, 80, 467, 3); - Ambient_Sounds_Add_Looping_Sound(383, 25, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxSKINBED1, 25, 0, 1); if (!Game_Flag_Query(kFlagDR05BombExploded)) { Overlay_Play("DR05OVER", 0, true, false, 0); diff --git a/engines/bladerunner/script/scene/dr06.cpp b/engines/bladerunner/script/scene/dr06.cpp index ef1e83d074..3e007d1b44 100644 --- a/engines/bladerunner/script/scene/dr06.cpp +++ b/engines/bladerunner/script/scene/dr06.cpp @@ -38,13 +38,13 @@ void SceneScriptDR06::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 0, 272, 46, 477, 2); } - Ambient_Sounds_Add_Looping_Sound(383, 25, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxSKINBED1, 25, 0, 1); Ambient_Sounds_Add_Sound(73, 5, 60, 20, 20, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(74, 5, 60, 20, 20, -100, 100, -101, -101, 0, 0); if (Game_Flag_Query(kFlagDR06JesterActive)) { Overlay_Play("DR06over", 1, true, false, 0); - Ambient_Sounds_Add_Looping_Sound(300, 47, -75, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxJESTMOV1, 47, -75, 0); } else { Overlay_Play("DR06over", 0, true, false, 0); } @@ -76,11 +76,11 @@ bool SceneScriptDR06::ClickedOn3DObject(const char *objectName, bool a2) { Actor_Face_Object(kActorMcCoy, "BOX16", true); if (!Game_Flag_Query(kFlagDR06JesterActive)) { Overlay_Play("DR06over", 1, true, true, 0); - Ambient_Sounds_Add_Looping_Sound(300, 47, -75, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxJESTMOV1, 47, -75, 0); Game_Flag_Set(kFlagDR06JesterActive); } else { Overlay_Play("DR06over", 0, true, true, 0); - Ambient_Sounds_Remove_Looping_Sound(300, false); + Ambient_Sounds_Remove_Looping_Sound(kSfxJESTMOV1, false); Game_Flag_Reset(kFlagDR06JesterActive); } return true; diff --git a/engines/bladerunner/script/scene/hc01.cpp b/engines/bladerunner/script/scene/hc01.cpp index 899d02953a..667cc5c83f 100644 --- a/engines/bladerunner/script/scene/hc01.cpp +++ b/engines/bladerunner/script/scene/hc01.cpp @@ -40,8 +40,8 @@ void SceneScriptHC01::InitializeScene() { } Scene_Exit_Add_2D_Exit(2, 117, 0, 286, 319, 0); - Ambient_Sounds_Add_Looping_Sound(103, 50, 50, 0); - Ambient_Sounds_Add_Looping_Sound(241, 50, 50, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxRAINAWN1, 50, 50, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxHCLOOP1, 50, 50, 0); Ambient_Sounds_Add_Sound(242, 3, 30, 16, 16, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(243, 3, 30, 16, 16, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(244, 3, 30, 16, 16, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/hc02.cpp b/engines/bladerunner/script/scene/hc02.cpp index e713f03663..4146ff9fc5 100644 --- a/engines/bladerunner/script/scene/hc02.cpp +++ b/engines/bladerunner/script/scene/hc02.cpp @@ -35,8 +35,8 @@ void SceneScriptHC02::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 589, 255, 639, 479, 1); Scene_Exit_Add_2D_Exit(1, 505, 0, 639, 170, 0); - Ambient_Sounds_Add_Looping_Sound(103, 50, 50, 0); - Ambient_Sounds_Add_Looping_Sound(280, 50, 50, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxRAINAWN1, 50, 50, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxBARAMB1, 50, 50, 0); Ambient_Sounds_Add_Sound(252, 3, 60, 33, 33, -60, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(254, 3, 60, 33, 33, -60, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(255, 3, 60, 33, 33, -60, 0, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/hc03.cpp b/engines/bladerunner/script/scene/hc03.cpp index b3be29bc5b..b0150845be 100644 --- a/engines/bladerunner/script/scene/hc03.cpp +++ b/engines/bladerunner/script/scene/hc03.cpp @@ -51,8 +51,8 @@ void SceneScriptHC03::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 400, 275, 515, 375, 2); } - Ambient_Sounds_Add_Looping_Sound(103, 50, 50, 0); - Ambient_Sounds_Add_Looping_Sound(241, 50, 50, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxRAINAWN1, 50, 50, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxHCLOOP1, 50, 50, 0); Ambient_Sounds_Add_Sound(242, 3, 30, 16, 16, -100, -70, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(243, 3, 30, 16, 16, -100, -70, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(244, 3, 30, 16, 16, -100, -70, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/hc04.cpp b/engines/bladerunner/script/scene/hc04.cpp index f457bbd378..e9db624a37 100644 --- a/engines/bladerunner/script/scene/hc04.cpp +++ b/engines/bladerunner/script/scene/hc04.cpp @@ -39,9 +39,9 @@ void SceneScriptHC04::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 539, 51, 639, 309, 0); Scene_Exit_Add_2D_Exit(1, 0, 456, 639, 479, 2); - Ambient_Sounds_Add_Looping_Sound(103, 50, 50, 0); - Ambient_Sounds_Add_Looping_Sound(329, 16, 16, 0); - Ambient_Sounds_Add_Looping_Sound(330, 40, 40, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxRAINAWN1, 50, 50, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxMAMASNG1, 16, 16, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxROTIS2, 40, 40, 0); Ambient_Sounds_Add_Sound(182, 5, 70, 14, 16, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(184, 5, 70, 14, 16, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(185, 5, 70, 14, 16, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/hf01.cpp b/engines/bladerunner/script/scene/hf01.cpp index 6c6442c538..607269e1be 100644 --- a/engines/bladerunner/script/scene/hf01.cpp +++ b/engines/bladerunner/script/scene/hf01.cpp @@ -54,9 +54,9 @@ void SceneScriptHF01::InitializeScene() { } } - Ambient_Sounds_Add_Looping_Sound( 54, 50, 0, 1); - Ambient_Sounds_Add_Looping_Sound(340, 25, 0, 1); - Ambient_Sounds_Add_Looping_Sound( 81, 60, 100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxARCBED1, 25, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRCAMBR1, 60, 100, 1); Ambient_Sounds_Add_Sound(182, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(184, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(185, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/hf02.cpp b/engines/bladerunner/script/scene/hf02.cpp index 08baa223ec..88a4b7d420 100644 --- a/engines/bladerunner/script/scene/hf02.cpp +++ b/engines/bladerunner/script/scene/hf02.cpp @@ -37,8 +37,8 @@ void SceneScriptHF02::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 0, 0, 30, 479, 3); Scene_Exit_Add_2D_Exit(1, 207, 66, 272, 207, 3); - Ambient_Sounds_Add_Looping_Sound(340, 28, -100, 1); - Ambient_Sounds_Add_Looping_Sound(341, 33, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxARCBED1, 28, -100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCIRCUS1, 33, 0, 1); Ambient_Sounds_Add_Sound(181, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(182, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(183, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/hf03.cpp b/engines/bladerunner/script/scene/hf03.cpp index 2201bbafa3..c017a0a3d6 100644 --- a/engines/bladerunner/script/scene/hf03.cpp +++ b/engines/bladerunner/script/scene/hf03.cpp @@ -35,7 +35,7 @@ void SceneScriptHF03::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 589, 0, 639, 479, 1); Scene_Exit_Add_2D_Exit(2, 323, 110, 380, 166, 0); - Ambient_Sounds_Add_Looping_Sound(340, 50, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxARCBED1, 50, 0, 1); Ambient_Sounds_Add_Sound(182, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(184, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(185, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/hf04.cpp b/engines/bladerunner/script/scene/hf04.cpp index 09d717d53d..22033a8352 100644 --- a/engines/bladerunner/script/scene/hf04.cpp +++ b/engines/bladerunner/script/scene/hf04.cpp @@ -37,8 +37,8 @@ void SceneScriptHF04::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 602, 104, 639, 177, 1); - Ambient_Sounds_Add_Looping_Sound( 70, 35, 0, 1); - Ambient_Sounds_Add_Looping_Sound(109, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBOOLOOP2, 35, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBRBED3, 40, 0, 1); Ambient_Sounds_Add_Sound( 72, 6, 70, 14, 20, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 73, 3, 70, 14, 20, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 74, 5, 70, 14, 20, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/hf05.cpp b/engines/bladerunner/script/scene/hf05.cpp index 501804c98a..c5d18d8424 100644 --- a/engines/bladerunner/script/scene/hf05.cpp +++ b/engines/bladerunner/script/scene/hf05.cpp @@ -46,7 +46,7 @@ void SceneScriptHF05::InitializeScene() { } Scene_Exit_Add_2D_Exit(2, 589, 0, 639, 479, 1); - Ambient_Sounds_Add_Looping_Sound(103, 40, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAINAWN1, 40, 1, 1); if (Game_Flag_Query(kFlagHF05Hole)) { Scene_Loop_Set_Default(kHF05LoopMainLoopHole); diff --git a/engines/bladerunner/script/scene/hf06.cpp b/engines/bladerunner/script/scene/hf06.cpp index 89b8055c58..844edd7e8f 100644 --- a/engines/bladerunner/script/scene/hf06.cpp +++ b/engines/bladerunner/script/scene/hf06.cpp @@ -29,9 +29,9 @@ void SceneScriptHF06::InitializeScene() { Game_Flag_Reset(kFlagHF05toHF06); Scene_Exit_Add_2D_Exit(0, 195, 197, 271, 237, 2); - Ambient_Sounds_Add_Looping_Sound( 54, 50, 0, 1); - Ambient_Sounds_Add_Looping_Sound( 99, 40, -100, 1); - Ambient_Sounds_Add_Looping_Sound(100, 40, 100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxROOFAIR1, 40, -100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxROOFRMB1, 40, 100, 1); Ambient_Sounds_Add_Sound( 68, 10, 100, 25, 50, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 69, 10, 100, 25, 50, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(375, 10, 70, 50, 100, 0, 0, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/hf07.cpp b/engines/bladerunner/script/scene/hf07.cpp index f4e8cee557..3d468f6397 100644 --- a/engines/bladerunner/script/scene/hf07.cpp +++ b/engines/bladerunner/script/scene/hf07.cpp @@ -34,8 +34,8 @@ void SceneScriptHF07::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 289, 136, 344, 305, 0); Scene_Exit_Add_2D_Exit(1, 69, 264, 132, 303, 2); - Ambient_Sounds_Add_Looping_Sound(108, 100, 0, 1); - Ambient_Sounds_Add_Looping_Sound(112, 32, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxDRAMB4, 100, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxFACTAMB2, 32, 0, 1); Ambient_Sounds_Add_Sound(303, 5, 40, 20, 33, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(304, 5, 40, 20, 33, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(305, 5, 40, 20, 33, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/kp01.cpp b/engines/bladerunner/script/scene/kp01.cpp index ab432a30e3..5eab0d154c 100644 --- a/engines/bladerunner/script/scene/kp01.cpp +++ b/engines/bladerunner/script/scene/kp01.cpp @@ -44,9 +44,9 @@ void SceneScriptKP01::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 150, 0, 200, 276, 0); Scene_Exit_Add_2D_Exit(2, 589, 0, 639, 479, 1); - Ambient_Sounds_Add_Looping_Sound(464, 34, 1, 1); - Ambient_Sounds_Add_Looping_Sound(383, 27, 1, 1); - Ambient_Sounds_Add_Looping_Sound(384, 90, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxKPAMB1, 34, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxSKINBED1, 27, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRUMLOOP1, 90, 1, 1); Ambient_Sounds_Add_Sound(440, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(441, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(442, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/kp02.cpp b/engines/bladerunner/script/scene/kp02.cpp index 50dd9c438b..4e4501b6d8 100644 --- a/engines/bladerunner/script/scene/kp02.cpp +++ b/engines/bladerunner/script/scene/kp02.cpp @@ -35,9 +35,9 @@ void SceneScriptKP02::InitializeScene() { // exit 0 is missing the game, no way back Scene_Exit_Add_2D_Exit(1, 0, 0, 30, 479, 3); - Ambient_Sounds_Add_Looping_Sound(464, 34, 1, 1); - Ambient_Sounds_Add_Looping_Sound(383, 27, 1, 1); - Ambient_Sounds_Add_Looping_Sound(384, 90, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxKPAMB1, 34, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxSKINBED1, 27, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRUMLOOP1, 90, 1, 1); Ambient_Sounds_Add_Sound(440, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(441, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/kp03.cpp b/engines/bladerunner/script/scene/kp03.cpp index 2ccd520b52..4eb6e9ce32 100644 --- a/engines/bladerunner/script/scene/kp03.cpp +++ b/engines/bladerunner/script/scene/kp03.cpp @@ -41,7 +41,7 @@ void SceneScriptKP03::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 0, 0, 30, 479, 3); Scene_Exit_Add_2D_Exit(1, 287, 104, 367, 255, 0); - Ambient_Sounds_Add_Looping_Sound(381, 100, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAIN10, 100, 1, 1); Ambient_Sounds_Add_Sound( 68, 60, 180, 16, 25, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 69, 60, 180, 16, 25, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(375, 60, 180, 50, 100, 0, 0, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/kp04.cpp b/engines/bladerunner/script/scene/kp04.cpp index a921066f98..bfc3738c48 100644 --- a/engines/bladerunner/script/scene/kp04.cpp +++ b/engines/bladerunner/script/scene/kp04.cpp @@ -33,9 +33,9 @@ void SceneScriptKP04::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 0, 455, 639, 479, 2); Scene_Exit_Add_2D_Exit(1, 475, 247, 514, 416, 1); - Ambient_Sounds_Add_Looping_Sound(464, 34, 1, 1); - Ambient_Sounds_Add_Looping_Sound(383, 27, 1, 1); - Ambient_Sounds_Add_Looping_Sound(384, 90, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxKPAMB1, 34, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxSKINBED1, 27, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRUMLOOP1, 90, 1, 1); Ambient_Sounds_Add_Sound(440, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(441, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(442, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/kp05.cpp b/engines/bladerunner/script/scene/kp05.cpp index 91cfa0752b..06843e465a 100644 --- a/engines/bladerunner/script/scene/kp05.cpp +++ b/engines/bladerunner/script/scene/kp05.cpp @@ -37,9 +37,9 @@ void SceneScriptKP05::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 0, 0, 30, 479, 3); Scene_Exit_Add_2D_Exit(2, 0, 0, 257, 204, 0); - Ambient_Sounds_Add_Looping_Sound(464, 34, 1, 1); - Ambient_Sounds_Add_Looping_Sound(383, 27, 1, 1); - Ambient_Sounds_Add_Looping_Sound(384, 90, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxKPAMB1, 34, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxSKINBED1, 27, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRUMLOOP1, 90, 1, 1); Ambient_Sounds_Add_Sound(440, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(441, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(442, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/kp06.cpp b/engines/bladerunner/script/scene/kp06.cpp index f9ce2a7d1f..e47f0dfe0c 100644 --- a/engines/bladerunner/script/scene/kp06.cpp +++ b/engines/bladerunner/script/scene/kp06.cpp @@ -34,9 +34,9 @@ void SceneScriptKP06::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 270, 445, 639, 479, 2); Scene_Exit_Add_2D_Exit(1, 320, 158, 352, 220, 0); - Ambient_Sounds_Add_Looping_Sound(464, 34, 1, 1); - Ambient_Sounds_Add_Looping_Sound(383, 27, 1, 1); - Ambient_Sounds_Add_Looping_Sound(384, 90, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxKPAMB1, 34, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxSKINBED1, 27, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRUMLOOP1, 90, 1, 1); Ambient_Sounds_Add_Sound(440, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(441, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(442, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/kp07.cpp b/engines/bladerunner/script/scene/kp07.cpp index 89cf64929c..ef5b3f8322 100644 --- a/engines/bladerunner/script/scene/kp07.cpp +++ b/engines/bladerunner/script/scene/kp07.cpp @@ -81,9 +81,9 @@ void SceneScriptKP07::InitializeScene() { } } - Ambient_Sounds_Add_Looping_Sound(585, 7, 1, 1); - Ambient_Sounds_Add_Looping_Sound(586, 52, 1, 1); - Ambient_Sounds_Add_Looping_Sound(109, 38, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCOMPBED1, 7, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxMOONBED2, 52, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBRBED3, 38, 1, 1); if (Game_Flag_Query(kFlagKP07BusActive)) { Scene_Loop_Set_Default(2); diff --git a/engines/bladerunner/script/scene/ma01.cpp b/engines/bladerunner/script/scene/ma01.cpp index 70e093fc87..0e89cb05ba 100644 --- a/engines/bladerunner/script/scene/ma01.cpp +++ b/engines/bladerunner/script/scene/ma01.cpp @@ -50,9 +50,9 @@ void SceneScriptMA01::InitializeScene() { Scene_Exit_Add_2D_Exit(kMA01ExitSpinner, 234, 240, 398, 328, 2); } - Ambient_Sounds_Add_Looping_Sound(101, 90, 0, 1); - Ambient_Sounds_Add_Looping_Sound( 99, 40, -100, 1); - Ambient_Sounds_Add_Looping_Sound(100, 40, 100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxROOFRAN1, 90, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxROOFAIR1, 40, -100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxROOFRMB1, 40, 100, 1); Ambient_Sounds_Add_Sound( 68, 10, 100, 25, 50, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 69, 10, 100, 25, 50, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(375, 10, 70, 50, 100, 0, 0, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ma02.cpp b/engines/bladerunner/script/scene/ma02.cpp index ecda102bbf..70dee2ee72 100644 --- a/engines/bladerunner/script/scene/ma02.cpp +++ b/engines/bladerunner/script/scene/ma02.cpp @@ -53,8 +53,8 @@ void SceneScriptMA02::InitializeScene() { Actor_Retired_Here(kActorMaggie, 24, 24, 1, -1); } - Ambient_Sounds_Add_Looping_Sound(104, 12, 0, 1); - Ambient_Sounds_Add_Looping_Sound(71, 25, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxAPRTAMB5, 12, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBRBED5, 25, 0, 1); Ambient_Sounds_Add_Sound( 72, 5, 30, 5, 5, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 73, 5, 30, 5, 5, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 74, 5, 30, 5, 5, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ma04.cpp b/engines/bladerunner/script/scene/ma04.cpp index 12f83c9390..fb39e10d86 100644 --- a/engines/bladerunner/script/scene/ma04.cpp +++ b/engines/bladerunner/script/scene/ma04.cpp @@ -61,9 +61,9 @@ void SceneScriptMA04::InitializeScene() { Scene_Exit_Add_2D_Exit(kMA04ExitKitchen, 248, 98, 314, 284, 1); Scene_2D_Region_Add(kMA04RegionPhone, 343, 97, 353, 190); Scene_2D_Region_Add(kMA04RegionBed, 0, 340, 116, 479); - Ambient_Sounds_Add_Looping_Sound(408, 30, 0, 1); - Ambient_Sounds_Add_Looping_Sound(103, 30, -80, 1); - Ambient_Sounds_Add_Looping_Sound(104, 12, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxAPRTFAN1, 30, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAINAWN1, 30, -80, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxAPRTAMB5, 12, 0, 1); Ambient_Sounds_Add_Sound(72, 5, 30, 11, 11, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(73, 5, 30, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(74, 5, 30, 12, 12, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ma05.cpp b/engines/bladerunner/script/scene/ma05.cpp index 8985abed70..a6be0ef389 100644 --- a/engines/bladerunner/script/scene/ma05.cpp +++ b/engines/bladerunner/script/scene/ma05.cpp @@ -41,9 +41,9 @@ void SceneScriptMA05::InitializeScene() { Setup_Scene_Information(-7207.0f, 956.17f, 1564.0f, 0); } Scene_Exit_Add_2D_Exit(kMA05ExitMA04, 432, 21, 471, 226, 1); - Ambient_Sounds_Add_Looping_Sound(101, 90, 0, 1); - Ambient_Sounds_Add_Looping_Sound(99, 40, -100, 1); - Ambient_Sounds_Add_Looping_Sound(103, 50, 60, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxROOFRAN1, 90, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxROOFAIR1, 40, -100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAINAWN1, 50, 60, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1); Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1); diff --git a/engines/bladerunner/script/scene/ma06.cpp b/engines/bladerunner/script/scene/ma06.cpp index f702ee8b9b..219cda58ce 100644 --- a/engines/bladerunner/script/scene/ma06.cpp +++ b/engines/bladerunner/script/scene/ma06.cpp @@ -34,8 +34,8 @@ enum kMA06Loops { void SceneScriptMA06::InitializeScene() { Setup_Scene_Information(40.0f, 1.0f, -20.0f, 400); - Ambient_Sounds_Add_Looping_Sound(210, 50, 0, 1); - Ambient_Sounds_Add_Looping_Sound(408, 33, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxELEAMB3, 50, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxAPRTFAN1, 33, 0, 1); Scene_Loop_Start_Special(kSceneLoopModeLoseControl, kMA06LoopDoorOpen, false); Scene_Loop_Set_Default(kMA06LoopMain); diff --git a/engines/bladerunner/script/scene/ma07.cpp b/engines/bladerunner/script/scene/ma07.cpp index 3f5c467d00..fdb9aa8f40 100644 --- a/engines/bladerunner/script/scene/ma07.cpp +++ b/engines/bladerunner/script/scene/ma07.cpp @@ -35,7 +35,7 @@ void SceneScriptMA07::InitializeScene() { Setup_Scene_Information( 104.0f, -162.16f, 56.0f, 519); } - Ambient_Sounds_Add_Looping_Sound(381, 100, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAIN10, 100, 1, 1); Ambient_Sounds_Add_Sound(374, 100, 300, 16, 25, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 68, 60, 180, 16, 25, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 69, 60, 180, 16, 25, 0, 0, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ma08.cpp b/engines/bladerunner/script/scene/ma08.cpp index 8e68edc1b7..2156f7e8bc 100644 --- a/engines/bladerunner/script/scene/ma08.cpp +++ b/engines/bladerunner/script/scene/ma08.cpp @@ -26,7 +26,7 @@ namespace BladeRunner { void SceneScriptMA08::InitializeScene() { Setup_Scene_Information(0, 0, 0, 0); - Ambient_Sounds_Add_Looping_Sound(381, 100, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAIN10, 100, 1, 1); Ambient_Sounds_Add_Sound(68, 60, 180, 16, 25, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(69, 60, 180, 16, 25, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(375, 60, 180, 50, 100, 0, 0, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/nr01.cpp b/engines/bladerunner/script/scene/nr01.cpp index 7e0ce8c804..9307ad460f 100644 --- a/engines/bladerunner/script/scene/nr01.cpp +++ b/engines/bladerunner/script/scene/nr01.cpp @@ -59,8 +59,8 @@ void SceneScriptNR01::InitializeScene() { Scene_Exit_Add_2D_Exit(3, 320, 445, 639, 479, 2); } - Ambient_Sounds_Add_Looping_Sound(54, 50, 0, 1); - Ambient_Sounds_Add_Looping_Sound(362, 22, 55, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxMUSBLEED, 22, 55, 1); Ambient_Sounds_Add_Sound(361, 10, 10, 20, 20, -70, -70, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(182, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(184, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/nr03.cpp b/engines/bladerunner/script/scene/nr03.cpp index 479ab7315e..f3dec8817d 100644 --- a/engines/bladerunner/script/scene/nr03.cpp +++ b/engines/bladerunner/script/scene/nr03.cpp @@ -45,7 +45,7 @@ void SceneScriptNR03::InitializeScene() { Scene_2D_Region_Add(0, 331, 73, 375, 114); - Ambient_Sounds_Add_Looping_Sound(280, 50, 38, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxBARAMB1, 50, 38, 0); Ambient_Sounds_Add_Sound(252, 3, 60, 25, 25, 0, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(254, 3, 60, 25, 25, 0, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(255, 3, 60, 25, 25, 0, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/nr04.cpp b/engines/bladerunner/script/scene/nr04.cpp index ffea441df8..717491fa1a 100644 --- a/engines/bladerunner/script/scene/nr04.cpp +++ b/engines/bladerunner/script/scene/nr04.cpp @@ -35,8 +35,8 @@ void SceneScriptNR04::InitializeScene() { Scene_2D_Region_Add(1, 62, 327, 92, 479); Scene_2D_Region_Add(2, 93, 343, 239, 479); - Ambient_Sounds_Add_Looping_Sound(408, 16, 0, 1); - Ambient_Sounds_Add_Looping_Sound(384, 16, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxAPRTFAN1, 16, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRUMLOOP1, 16, 0, 1); Ambient_Sounds_Add_Sound(259, 3, 60, 9, 9, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(260, 3, 60, 9, 9, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(261, 3, 60, 9, 9, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/nr05.cpp b/engines/bladerunner/script/scene/nr05.cpp index fcf12b62c3..7b69ee1550 100644 --- a/engines/bladerunner/script/scene/nr05.cpp +++ b/engines/bladerunner/script/scene/nr05.cpp @@ -47,7 +47,7 @@ void SceneScriptNR05::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 0, 0, 30, 479, 3); } - Ambient_Sounds_Add_Looping_Sound(280, 50, 38, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxBARAMB1, 50, 38, 0); Ambient_Sounds_Add_Sound(252, 3, 60, 20, 20, -30, 30, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(254, 3, 60, 20, 20, -30, 30, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(255, 3, 60, 20, 20, -30, 30, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/nr06.cpp b/engines/bladerunner/script/scene/nr06.cpp index 4f1cb7688b..144c19c92d 100644 --- a/engines/bladerunner/script/scene/nr06.cpp +++ b/engines/bladerunner/script/scene/nr06.cpp @@ -35,7 +35,7 @@ void SceneScriptNR06::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 533, 234, 592, 414, 1); Scene_Exit_Add_2D_Exit(1, 238, 137, 337, 322, 0); - Ambient_Sounds_Add_Looping_Sound(111, 25, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxDRAMB5, 25, 0, 1); Ambient_Sounds_Add_Sound(252, 3, 60, 8, 12, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(254, 3, 60, 8, 8, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(255, 3, 60, 8, 8, 0, 0, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/nr07.cpp b/engines/bladerunner/script/scene/nr07.cpp index 02224d0b09..88490092f0 100644 --- a/engines/bladerunner/script/scene/nr07.cpp +++ b/engines/bladerunner/script/scene/nr07.cpp @@ -29,7 +29,7 @@ void SceneScriptNR07::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 429, 137, 506, 251, 0); - Ambient_Sounds_Add_Looping_Sound(111, 25, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxDRAMB5, 25, 0, 1); } void SceneScriptNR07::SceneLoaded() { diff --git a/engines/bladerunner/script/scene/nr08.cpp b/engines/bladerunner/script/scene/nr08.cpp index 52a5b95b62..87dcf04256 100644 --- a/engines/bladerunner/script/scene/nr08.cpp +++ b/engines/bladerunner/script/scene/nr08.cpp @@ -54,7 +54,7 @@ void SceneScriptNR08::InitializeScene() { Scene_Exit_Add_2D_Exit(2, 520, 330, 556, 386, 0); } - Ambient_Sounds_Add_Looping_Sound(280, 50, 38, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxBARAMB1, 50, 38, 0); Ambient_Sounds_Add_Sound(252, 3, 60, 14, 14, 60, 90, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(254, 3, 60, 14, 14, 60, 90, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(255, 3, 60, 14, 14, 60, 90, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/nr09.cpp b/engines/bladerunner/script/scene/nr09.cpp index d06c99082f..78805f3fda 100644 --- a/engines/bladerunner/script/scene/nr09.cpp +++ b/engines/bladerunner/script/scene/nr09.cpp @@ -27,13 +27,13 @@ namespace BladeRunner { void SceneScriptNR09::InitializeScene() { if (Game_Flag_Query(kFlagNR10toNR09)) { if (!Game_Flag_Query(kFlagNR10CameraDestroyed)) { - Ambient_Sounds_Adjust_Looping_Sound(452, 22, 100, 2); + Ambient_Sounds_Adjust_Looping_Sound(kSfx35MM, 22, 100, 2); } Game_Flag_Reset(kFlagNR10toNR09); Setup_Scene_Information(-556.07f, 0.35f, 399.04f, 440); } else { if (!Game_Flag_Query(kFlagNR10CameraDestroyed)) { - Ambient_Sounds_Add_Looping_Sound(452, 22, 100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfx35MM, 22, 100, 1); } Setup_Scene_Information(-704.07f, 0.35f, 663.04f, 0); } @@ -41,8 +41,8 @@ void SceneScriptNR09::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 400, 100, 440, 280, 1); Scene_Exit_Add_2D_Exit(1, 0, 0, 30, 479, 3); - Ambient_Sounds_Add_Looping_Sound(205, 22, 0, 1); - Ambient_Sounds_Add_Looping_Sound( 71, 33, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTDRONE1, 22, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBRBED5, 33, 0, 1); Ambient_Sounds_Add_Sound(303, 2, 50, 7, 17, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(304, 2, 50, 7, 17, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(305, 2, 50, 7, 17, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/nr10.cpp b/engines/bladerunner/script/scene/nr10.cpp index 61e886a321..b636e0dc31 100644 --- a/engines/bladerunner/script/scene/nr10.cpp +++ b/engines/bladerunner/script/scene/nr10.cpp @@ -36,8 +36,8 @@ void SceneScriptNR10::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 144, 163, 194, 318, 3); Scene_Exit_Add_2D_Exit(1, 475, 95, 568, 230, 0); - Ambient_Sounds_Add_Looping_Sound(205, 22, 0, 1); - Ambient_Sounds_Add_Looping_Sound( 71, 33, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTDRONE1, 22, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBRBED5, 33, 0, 1); Ambient_Sounds_Add_Sound(303, 2, 50, 7, 17, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(304, 2, 50, 7, 17, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(305, 2, 50, 7, 17, -100, 100, -101, -101, 0, 0); @@ -48,7 +48,7 @@ void SceneScriptNR10::InitializeScene() { if (Game_Flag_Query(kFlagNR10CameraDestroyed)) { Scene_Loop_Set_Default(0); } else { - Ambient_Sounds_Adjust_Looping_Sound(452, 31, 0, 1); + Ambient_Sounds_Adjust_Looping_Sound(kSfx35MM, 31, 0, 1); Scene_Loop_Set_Default(2); } } @@ -74,7 +74,7 @@ bool SceneScriptNR10::ClickedOn3DObject(const char *objectName, bool combatMode) Game_Flag_Reset(kFlagNR10McCoyBlinded); Actor_Set_Invisible(kActorMcCoy, false); Actor_Set_Invisible(kActorDektora, false); - Ambient_Sounds_Remove_Looping_Sound(452, true); + Ambient_Sounds_Remove_Looping_Sound(kSfx35MM, true); Sound_Play(kSfx35MMBRK1, 52, 0, 0, 50); Scene_Loop_Set_Default(0); Scene_Loop_Start_Special(kSceneLoopModeOnce, 0, true); diff --git a/engines/bladerunner/script/scene/nr11.cpp b/engines/bladerunner/script/scene/nr11.cpp index 40b7f13942..e0128f40eb 100644 --- a/engines/bladerunner/script/scene/nr11.cpp +++ b/engines/bladerunner/script/scene/nr11.cpp @@ -37,11 +37,11 @@ void SceneScriptNR11::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 450, 305, 565, 345, 2); if (!Game_Flag_Query(kFlagNR10CameraDestroyed)) { - Ambient_Sounds_Adjust_Looping_Sound(452, 22, 0, 1); + Ambient_Sounds_Adjust_Looping_Sound(kSfx35MM, 22, 0, 1); } - Ambient_Sounds_Add_Looping_Sound(205, 22, 0, 1); - Ambient_Sounds_Add_Looping_Sound( 71, 33, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTDRONE1, 22, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBRBED5, 33, 0, 1); Ambient_Sounds_Add_Sound(303, 2, 50, 7, 17, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(304, 2, 50, 7, 17, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(305, 2, 50, 7, 17, -100, 100, -101, -101, 0, 0); @@ -51,10 +51,10 @@ void SceneScriptNR11::InitializeScene() { if (Game_Flag_Query(kFlagNR01DektoraFall)) { Scene_Loop_Set_Default(kNR11LoopMainLoopFires); - Ambient_Sounds_Add_Looping_Sound(381, 83, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAIN10, 83, 0, 1); } else if (Game_Flag_Query(kFlagNR11BurnedUp)) { Scene_Loop_Set_Default(kNR11LoopMainLoopBurnedUp); - Ambient_Sounds_Add_Looping_Sound(381, 83, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAIN10, 83, 0, 1); } else { Scene_Loop_Set_Default(kNR11LoopMainLoop); Overlay_Play("NR11OVER", 0, true, false, 0); diff --git a/engines/bladerunner/script/scene/ps01.cpp b/engines/bladerunner/script/scene/ps01.cpp index 453e085651..df5114600d 100644 --- a/engines/bladerunner/script/scene/ps01.cpp +++ b/engines/bladerunner/script/scene/ps01.cpp @@ -38,7 +38,7 @@ void SceneScriptPS01::InitializeScene() { if (Game_Flag_Query(kFlagSpinnerAtPS01)) { Scene_Exit_Add_2D_Exit(1, 344, 288, 584, 384, 2); } - Ambient_Sounds_Add_Looping_Sound(381, 100, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAIN10, 100, 1, 1); Ambient_Sounds_Add_Sound( 68, 60, 180, 16, 25, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 69, 60, 180, 16, 25, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(375, 60, 180, 50, 100, 0, 0, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ps02.cpp b/engines/bladerunner/script/scene/ps02.cpp index d3d97648fa..3329374686 100644 --- a/engines/bladerunner/script/scene/ps02.cpp +++ b/engines/bladerunner/script/scene/ps02.cpp @@ -31,8 +31,8 @@ void SceneScriptPS02::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 0, 0, 240, 479, 3); Ambient_Sounds_Remove_All_Non_Looping_Sounds(0); - Ambient_Sounds_Add_Looping_Sound(386, 20, 1, 1); - Ambient_Sounds_Add_Looping_Sound(210, 20, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxESPLOOP1, 20, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxELEAMB3, 20, 1, 1); Ambient_Sounds_Add_Sound(0, 3, 20, 12, 16, 0, 0, -101, -101, 0, 0); Scene_Loop_Start_Special(kSceneLoopModeLoseControl, 0, false); diff --git a/engines/bladerunner/script/scene/ps03.cpp b/engines/bladerunner/script/scene/ps03.cpp index 480f44123e..36f0dc3389 100644 --- a/engines/bladerunner/script/scene/ps03.cpp +++ b/engines/bladerunner/script/scene/ps03.cpp @@ -42,7 +42,7 @@ void SceneScriptPS03::InitializeScene() { Scene_Exit_Add_2D_Exit(2, 358, 245, 411, 288, 0); } Ambient_Sounds_Remove_All_Non_Looping_Sounds(0); - Ambient_Sounds_Add_Looping_Sound(45, 35, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxPSAMB6, 35, 0, 1); Ambient_Sounds_Add_Sound(90, 5, 50, 7, 7, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(91, 5, 50, 7, 7, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(92, 5, 60, 33, 33, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ps04.cpp b/engines/bladerunner/script/scene/ps04.cpp index 466978c24c..045e678fe3 100644 --- a/engines/bladerunner/script/scene/ps04.cpp +++ b/engines/bladerunner/script/scene/ps04.cpp @@ -37,8 +37,8 @@ void SceneScriptPS04::InitializeScene() { } Scene_Exit_Add_2D_Exit(0, 347, 113, 469, 302, 0); Ambient_Sounds_Remove_All_Non_Looping_Sounds(0); - Ambient_Sounds_Add_Looping_Sound(45, 16, 1, 1); - Ambient_Sounds_Add_Looping_Sound(46, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxPSAMB6, 16, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRTONE3, 50, 1, 1); Ambient_Sounds_Add_Sound(47, 9, 40, 20, 20, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(48, 9, 40, 20, 20, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(49, 9, 40, 20, 20, 0, 0, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ps05.cpp b/engines/bladerunner/script/scene/ps05.cpp index 612ad75cf1..82f40b8993 100644 --- a/engines/bladerunner/script/scene/ps05.cpp +++ b/engines/bladerunner/script/scene/ps05.cpp @@ -37,8 +37,8 @@ void SceneScriptPS05::InitializeScene() { Scene_Exit_Add_2D_Exit(2, 476, 96, 524, 240, 1); Scene_2D_Region_Add(0, 519, 107, 537, 122); Ambient_Sounds_Remove_All_Non_Looping_Sounds(0); - Ambient_Sounds_Add_Looping_Sound(384, 50, 1, 1); - Ambient_Sounds_Add_Looping_Sound(141, 80, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRUMLOOP1, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxLABAMB3, 80, 0, 1); Ambient_Sounds_Add_Sound(385, 5, 50, 8, 8, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(156, 5, 20, 30, 30, -70, 70, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(157, 5, 20, 30, 30, -70, 70, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ps06.cpp b/engines/bladerunner/script/scene/ps06.cpp index 3f37ffa8ed..d0624ef6a6 100644 --- a/engines/bladerunner/script/scene/ps06.cpp +++ b/engines/bladerunner/script/scene/ps06.cpp @@ -30,7 +30,7 @@ void SceneScriptPS06::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 610, 0, 639, 479, 1); Ambient_Sounds_Remove_All_Non_Looping_Sounds(false); - Ambient_Sounds_Add_Looping_Sound(388, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxESPLOOP3, 50, 1, 1); } void SceneScriptPS06::SceneLoaded() { diff --git a/engines/bladerunner/script/scene/ps07.cpp b/engines/bladerunner/script/scene/ps07.cpp index 3ce7d4254a..33e3063b8b 100644 --- a/engines/bladerunner/script/scene/ps07.cpp +++ b/engines/bladerunner/script/scene/ps07.cpp @@ -28,7 +28,7 @@ void SceneScriptPS07::InitializeScene() { Setup_Scene_Information(609.07f, 0.22f, -598.67f, 768); Scene_Exit_Add_2D_Exit(0, 610, 0, 639, 479, 1); Ambient_Sounds_Remove_All_Non_Looping_Sounds(false); - Ambient_Sounds_Add_Looping_Sound(141, 80, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxLABAMB3, 80, 0, 1); Ambient_Sounds_Add_Sound(142, 5, 20, 5, 10, -70, 70, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(146, 5, 30, 5, 10, -70, 70, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(147, 2, 20, 5, 10, -70, 70, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ps09.cpp b/engines/bladerunner/script/scene/ps09.cpp index 832883f039..3fa41c2cc4 100644 --- a/engines/bladerunner/script/scene/ps09.cpp +++ b/engines/bladerunner/script/scene/ps09.cpp @@ -34,9 +34,9 @@ void SceneScriptPS09::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 0, 0, 30, 479, 3); Ambient_Sounds_Remove_All_Non_Looping_Sounds(0); - Ambient_Sounds_Add_Looping_Sound(138, 50, 0, 0); - Ambient_Sounds_Add_Looping_Sound(137, 30, 0, 0); - Ambient_Sounds_Add_Looping_Sound(124, 30, 0, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxBRBED5X, 50, 0, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxPRISAMB1, 30, 0, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxPRISAMB3, 30, 0, 0); Ambient_Sounds_Add_Sound(125, 15, 60, 7, 10, 100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(126, 25, 60, 7, 10, 100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(127, 25, 60, 7, 10, 100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ps11.cpp b/engines/bladerunner/script/scene/ps11.cpp index 1331f4cf4f..23980e60db 100644 --- a/engines/bladerunner/script/scene/ps11.cpp +++ b/engines/bladerunner/script/scene/ps11.cpp @@ -723,8 +723,8 @@ void SceneScriptPS11::SceneLoaded() { Police_Maze_Target_Track_Add(kItemPS11Target16, -800.0f, -9.23f, -75.0f, -740.0f, -9.23f, -75.0f, 15, getPoliceMazePS11TrackData27(), false); Ambient_Sounds_Remove_All_Non_Looping_Sounds(0); - Ambient_Sounds_Add_Looping_Sound(387, 50, 1, 1); - Ambient_Sounds_Add_Looping_Sound( 54, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxESPLOOP2, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 1, 1); Ambient_Sounds_Add_Sound( 1, 10, 50, 16, 25, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(389, 5, 50, 16, 25, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(390, 6, 50, 16, 25, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ps12.cpp b/engines/bladerunner/script/scene/ps12.cpp index e3262f0bdf..d7df990c3d 100644 --- a/engines/bladerunner/script/scene/ps12.cpp +++ b/engines/bladerunner/script/scene/ps12.cpp @@ -776,8 +776,8 @@ void SceneScriptPS12::SceneLoaded() { Police_Maze_Target_Track_Add(kItemPS12Target17, -580.0f, -80.0f, 925.0f, -580.0f, -8.0f, 925.0f, 10, getPoliceMazePS12TrackData45(), false); Ambient_Sounds_Remove_All_Non_Looping_Sounds(0); - Ambient_Sounds_Add_Looping_Sound(387, 50, 1, 1); - Ambient_Sounds_Add_Looping_Sound( 54, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxESPLOOP2, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 1, 1); Ambient_Sounds_Add_Sound( 1, 10, 50, 16, 25, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(389, 5, 50, 16, 25, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(390, 6, 50, 16, 25, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ps13.cpp b/engines/bladerunner/script/scene/ps13.cpp index 084e144b92..3c4cf5de43 100644 --- a/engines/bladerunner/script/scene/ps13.cpp +++ b/engines/bladerunner/script/scene/ps13.cpp @@ -46,8 +46,8 @@ void SceneScriptPS13::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 0, 0, 20, 479, 3); Ambient_Sounds_Remove_All_Non_Looping_Sounds(0); - Ambient_Sounds_Add_Looping_Sound(387, 50, 1, 1); - Ambient_Sounds_Add_Looping_Sound( 54, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxESPLOOP2, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 1, 1); Ambient_Sounds_Add_Sound( 1, 10, 50, 16, 25, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(389, 5, 50, 16, 25, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(390, 6, 50, 16, 25, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ps14.cpp b/engines/bladerunner/script/scene/ps14.cpp index 4bbfa3ad78..439d4ee310 100644 --- a/engines/bladerunner/script/scene/ps14.cpp +++ b/engines/bladerunner/script/scene/ps14.cpp @@ -35,7 +35,7 @@ void SceneScriptPS14::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 610, 0, 639, 479, 1); Scene_Exit_Add_2D_Exit(1, 46, 51, 125, 192, 0); - Ambient_Sounds_Add_Looping_Sound(381, 100, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAIN10, 100, 1, 1); Ambient_Sounds_Add_Sound(374, 100, 300, 16, 25, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 68, 60, 180, 16, 25, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound( 69, 60, 180, 16, 25, 0, 0, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ps15.cpp b/engines/bladerunner/script/scene/ps15.cpp index 63abb75b5d..915c019d7b 100644 --- a/engines/bladerunner/script/scene/ps15.cpp +++ b/engines/bladerunner/script/scene/ps15.cpp @@ -28,8 +28,8 @@ void SceneScriptPS15::InitializeScene() { Setup_Scene_Information(-360.0f, -113.43f, 50.0f, 0); Scene_Exit_Add_2D_Exit(0, 0, 0, 20, 479, 3); Scene_Exit_Add_2D_Exit(1, 620, 0, 639, 479, 1); - Ambient_Sounds_Add_Looping_Sound(384, 20, 1, 1); - Ambient_Sounds_Add_Looping_Sound(141, 80, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRUMLOOP1, 20, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxLABAMB3, 80, 0, 1); Ambient_Sounds_Add_Sound(385, 5, 50, 8, 8, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(156, 5, 20, 30, 30, -70, 70, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(157, 5, 20, 30, 30, -70, 70, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/rc01.cpp b/engines/bladerunner/script/scene/rc01.cpp index d2d8c2be7b..b5136b0368 100644 --- a/engines/bladerunner/script/scene/rc01.cpp +++ b/engines/bladerunner/script/scene/rc01.cpp @@ -76,7 +76,7 @@ void SceneScriptRC01::InitializeScene() { } Ambient_Sounds_Remove_All_Non_Looping_Sounds(false); - Ambient_Sounds_Add_Looping_Sound(54, 30, 0, 1); // CTRAIN1.AUD + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 30, 0, 1); if (!Game_Flag_Query(kFlagRC01PoliceDone)) { Ambient_Sounds_Add_Sound(181, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); // 67_0470R.AUD @@ -95,7 +95,7 @@ void SceneScriptRC01::InitializeScene() { Ambient_Sounds_Add_Sound(195, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); // 67_1160R.AUD } - Ambient_Sounds_Add_Looping_Sound(81, 60, 100, 1); // RCAMBR1.AUD + Ambient_Sounds_Add_Looping_Sound(kSfxRCAMBR1, 60, 100, 1); Ambient_Sounds_Add_Sound(82, 5, 30, 30, 50, -100, 100, -101, -101, 0, 0); // RCCARBY1.AUD Ambient_Sounds_Add_Sound(83, 5, 30, 30, 55, -100, 100, -101, -101, 0, 0); // RCCARBY2.AUD Ambient_Sounds_Add_Sound(84, 5, 30, 30, 50, -100, 100, -101, -101, 0, 0); // RCCARBY3.AUD diff --git a/engines/bladerunner/script/scene/rc02.cpp b/engines/bladerunner/script/scene/rc02.cpp index 4079d60080..b7ac2e4594 100644 --- a/engines/bladerunner/script/scene/rc02.cpp +++ b/engines/bladerunner/script/scene/rc02.cpp @@ -40,9 +40,9 @@ void SceneScriptRC02::InitializeScene() { Scene_Exit_Add_2D_Exit(kRC02ExitRC51, 265, 58, 346, 154, 0); } Ambient_Sounds_Remove_All_Non_Looping_Sounds(0); - Ambient_Sounds_Add_Looping_Sound( 71, 50, 1, 1); - Ambient_Sounds_Add_Looping_Sound( 75, 75, 1, 1); - Ambient_Sounds_Add_Looping_Sound(105, 30, 100, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBRBED5, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxWINDLOP8, 75, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 30, 100, 1); Ambient_Sounds_Add_Sound(73, 5, 20, 10, 10, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(74, 5, 20, 10, 10, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(76, 5, 40, 6, 6, -100, 100, -101, -101, 0, 0); @@ -343,9 +343,9 @@ bool SceneScriptRC02::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -71.51f, -1238.89f, 108587.15f, 0, true, false, 0)) { Game_Flag_Set(kFlagRC02toRC01); Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); - Ambient_Sounds_Remove_Looping_Sound(71, true); - Ambient_Sounds_Remove_Looping_Sound(75, true); - Ambient_Sounds_Adjust_Looping_Sound(85, 100, -101, 1); + Ambient_Sounds_Remove_Looping_Sound(kSfxBRBED5, true); + Ambient_Sounds_Remove_Looping_Sound(kSfxWINDLOP8, true); + Ambient_Sounds_Adjust_Looping_Sound(kSfxRCRAIN1, 100, -101, 1); Actor_Set_Goal_Number(kActorRunciter, kGoalRunciterDefault); Set_Enter(kSetRC01, kSceneRC01); } diff --git a/engines/bladerunner/script/scene/rc03.cpp b/engines/bladerunner/script/scene/rc03.cpp index 253b1faccb..9eb39a0669 100644 --- a/engines/bladerunner/script/scene/rc03.cpp +++ b/engines/bladerunner/script/scene/rc03.cpp @@ -51,7 +51,7 @@ void SceneScriptRC03::InitializeScene() { Scene_Exit_Add_2D_Exit(3, 85, 255, 112, 315, 0); Scene_Exit_Add_2D_Exit(4, 428, 260, 453, 324, 0); - Ambient_Sounds_Add_Looping_Sound(54, 50, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 0, 1); Ambient_Sounds_Add_Sound(82, 5, 30, 40, 70, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(83, 5, 30, 40, 75, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(84, 5, 30, 40, 70, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/rc04.cpp b/engines/bladerunner/script/scene/rc04.cpp index 9287d7a098..eb95baafe6 100644 --- a/engines/bladerunner/script/scene/rc04.cpp +++ b/engines/bladerunner/script/scene/rc04.cpp @@ -38,7 +38,7 @@ void SceneScriptRC04::InitializeScene() { Actor_Change_Animation_Mode(kActorBulletBob, 88); } - Ambient_Sounds_Add_Looping_Sound(381, 100, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRAIN10, 100, 1, 1); Ambient_Sounds_Add_Sound(82, 5, 30, 10, 20, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(83, 5, 30, 10, 20, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(84, 5, 30, 10, 20, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/tb02.cpp b/engines/bladerunner/script/scene/tb02.cpp index 493c3c7950..adda3a4b94 100644 --- a/engines/bladerunner/script/scene/tb02.cpp +++ b/engines/bladerunner/script/scene/tb02.cpp @@ -41,14 +41,14 @@ void SceneScriptTB02::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 0, 455, 639, 479, 2); } - Ambient_Sounds_Add_Looping_Sound(211, 20, 0, 1); - Ambient_Sounds_Add_Sound(212, 2, 15, 16, 20, 0, 0, -101, -101, 0, 0); - Ambient_Sounds_Add_Sound(213, 2, 15, 16, 20, 0, 0, -101, -101, 0, 0); - Ambient_Sounds_Add_Sound(214, 2, 20, 16, 20, 0, 0, -101, -101, 0, 0); - Ambient_Sounds_Add_Sound(215, 2, 15, 16, 20, 0, 0, -101, -101, 0, 0); - Ambient_Sounds_Add_Sound(216, 2, 15, 16, 20, 0, 0, -101, -101, 0, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxFOUNTAIN, 20, 0, 1); + Ambient_Sounds_Add_Sound(kSfxBELLY1, 2, 15, 16, 20, 0, 0, -101, -101, 0, 0); + Ambient_Sounds_Add_Sound(kSfxBELLY2, 2, 15, 16, 20, 0, 0, -101, -101, 0, 0); + Ambient_Sounds_Add_Sound(kSfxBELLY3, 2, 20, 16, 20, 0, 0, -101, -101, 0, 0); + Ambient_Sounds_Add_Sound(kSfxBELLY4, 2, 15, 16, 20, 0, 0, -101, -101, 0, 0); + Ambient_Sounds_Add_Sound(kSfxBELLY5, 2, 15, 16, 20, 0, 0, -101, -101, 0, 0); if (Global_Variable_Query(kVariableChapter) <= 3) { - Ambient_Sounds_Add_Looping_Sound(45, 35, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxPSAMB6, 35, 0, 1); Ambient_Sounds_Add_Sound(181, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(182, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(183, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/tb03.cpp b/engines/bladerunner/script/scene/tb03.cpp index 27ac0f01b3..e01c5e3991 100644 --- a/engines/bladerunner/script/scene/tb03.cpp +++ b/engines/bladerunner/script/scene/tb03.cpp @@ -34,14 +34,14 @@ void SceneScriptTB03::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 25, 227, 81, 300, 0); Scene_Exit_Add_2D_Exit(1, 298, 0, 639, 305, 0); - Ambient_Sounds_Add_Looping_Sound(211, 16, 0, 1); - Ambient_Sounds_Add_Sound(212, 2, 15, 16, 20, 0, 0, -101, -101, 0, 0); - Ambient_Sounds_Add_Sound(213, 2, 15, 16, 20, 0, 0, -101, -101, 0, 0); - Ambient_Sounds_Add_Sound(214, 2, 20, 16, 20, 0, 0, -101, -101, 0, 0); - Ambient_Sounds_Add_Sound(215, 2, 15, 16, 20, 0, 0, -101, -101, 0, 0); - Ambient_Sounds_Add_Sound(216, 2, 15, 16, 20, 0, 0, -101, -101, 0, 0); + Ambient_Sounds_Add_Looping_Sound(kSfxFOUNTAIN, 16, 0, 1); + Ambient_Sounds_Add_Sound(kSfxBELLY1, 2, 15, 16, 20, 0, 0, -101, -101, 0, 0); + Ambient_Sounds_Add_Sound(kSfxBELLY2, 2, 15, 16, 20, 0, 0, -101, -101, 0, 0); + Ambient_Sounds_Add_Sound(kSfxBELLY3, 2, 20, 16, 20, 0, 0, -101, -101, 0, 0); + Ambient_Sounds_Add_Sound(kSfxBELLY4, 2, 15, 16, 20, 0, 0, -101, -101, 0, 0); + Ambient_Sounds_Add_Sound(kSfxBELLY5, 2, 15, 16, 20, 0, 0, -101, -101, 0, 0); if (Global_Variable_Query(kVariableChapter) <= 3) { - Ambient_Sounds_Add_Looping_Sound(45, 25, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxPSAMB6, 25, 0, 1); Ambient_Sounds_Add_Sound(181, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(182, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(183, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/tb05.cpp b/engines/bladerunner/script/scene/tb05.cpp index af405833b9..52925207cd 100644 --- a/engines/bladerunner/script/scene/tb05.cpp +++ b/engines/bladerunner/script/scene/tb05.cpp @@ -34,8 +34,8 @@ void SceneScriptTB05::InitializeScene() { } Scene_Exit_Add_2D_Exit(0, 62, 193, 206, 419, 0); Scene_Exit_Add_2D_Exit(1, 0, 455, 639, 479, 2); - Ambient_Sounds_Add_Looping_Sound(236, 100, 0, 1); - Ambient_Sounds_Add_Looping_Sound(237, 100, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxTB5LOOP1, 100, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxTB5LOOP2, 100, 0, 1); Ambient_Sounds_Add_Sound(217, 5, 30, 25, 33, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(218, 5, 30, 25, 33, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(219, 5, 30, 25, 33, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/tb06.cpp b/engines/bladerunner/script/scene/tb06.cpp index 9305504528..b9ac39c5e1 100644 --- a/engines/bladerunner/script/scene/tb06.cpp +++ b/engines/bladerunner/script/scene/tb06.cpp @@ -27,9 +27,9 @@ namespace BladeRunner { void SceneScriptTB06::InitializeScene() { Setup_Scene_Information(-16.0f, 149.0f, -466.0f, 990); Scene_Exit_Add_2D_Exit(0, 330, 195, 417, 334, 0); - Ambient_Sounds_Add_Looping_Sound(236, 50, 0, 1); - Ambient_Sounds_Add_Looping_Sound(237, 50, 0, 1); - Ambient_Sounds_Add_Looping_Sound(285, 66, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxTB5LOOP1, 50, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxTB5LOOP2, 50, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxTBLOOP1, 66, 0, 1); if (!Game_Flag_Query(kFlagNotUsed103)) { Actor_Put_In_Set(kActorMarcus, kSetTB06); Actor_Set_At_XYZ(kActorMarcus, 135.0f, 151.0f, -671.0f, 800); diff --git a/engines/bladerunner/script/scene/tb07.cpp b/engines/bladerunner/script/scene/tb07.cpp index b76128dbdf..5205aab82f 100644 --- a/engines/bladerunner/script/scene/tb07.cpp +++ b/engines/bladerunner/script/scene/tb07.cpp @@ -35,7 +35,7 @@ void SceneScriptTB07::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 383, 445, 639, 479, 2); - Ambient_Sounds_Add_Looping_Sound(109, 20, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBRBED3, 20, 0, 1); Ambient_Sounds_Add_Sound(363, 2, 55, 14, 14, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(364, 2, 55, 14, 14, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(365, 2, 55, 14, 14, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ug01.cpp b/engines/bladerunner/script/scene/ug01.cpp index 5ee9623281..e4519689b9 100644 --- a/engines/bladerunner/script/scene/ug01.cpp +++ b/engines/bladerunner/script/scene/ug01.cpp @@ -37,9 +37,9 @@ void SceneScriptUG01::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 144, 0, 210, 104, 0); Scene_Exit_Add_2D_Exit(2, 0, 173, 139, 402, 3); - Ambient_Sounds_Add_Looping_Sound(331, 28, 0, 1); - Ambient_Sounds_Add_Looping_Sound(332, 40, 0, 1); - Ambient_Sounds_Add_Looping_Sound(333, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxSTMLOOP7, 28, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED2, 40, 0, 1); Ambient_Sounds_Add_Sound(291, 2, 20, 20, 25, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(293, 2, 20, 20, 25, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(402, 2, 120, 10, 11, 20, 100, 0, 100, 0, 0); diff --git a/engines/bladerunner/script/scene/ug02.cpp b/engines/bladerunner/script/scene/ug02.cpp index 74b421fb44..e5f83025c4 100644 --- a/engines/bladerunner/script/scene/ug02.cpp +++ b/engines/bladerunner/script/scene/ug02.cpp @@ -34,8 +34,8 @@ void SceneScriptUG02::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 529, 130, 607, 277, 0); Scene_Exit_Add_2D_Exit(1, 305, 36, 335, 192, 0); - Ambient_Sounds_Add_Looping_Sound(332, 43, 0, 1); - Ambient_Sounds_Add_Looping_Sound(333, 43, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1, 43, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED2, 43, 0, 1); Ambient_Sounds_Add_Sound(303, 5, 50, 17, 37, 100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(304, 5, 50, 17, 37, 100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(123, 2, 50, 17, 37, -50, -20, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ug03.cpp b/engines/bladerunner/script/scene/ug03.cpp index a11e768b0c..d9bf53784d 100644 --- a/engines/bladerunner/script/scene/ug03.cpp +++ b/engines/bladerunner/script/scene/ug03.cpp @@ -37,9 +37,9 @@ void SceneScriptUG03::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 46, 137, 131, 296, 0); Scene_Exit_Add_2D_Exit(1, 559, 141, 639, 380, 1); - Ambient_Sounds_Add_Looping_Sound(331, 15, 0, 1); - Ambient_Sounds_Add_Looping_Sound(332, 40, 0, 1); - Ambient_Sounds_Add_Looping_Sound(333, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxSTMLOOP7, 15, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED2, 40, 0, 1); Ambient_Sounds_Add_Sound(402, 2, 120, 10, 11, 0, 100, 0, 100, 0, 0); Ambient_Sounds_Add_Sound(370, 2, 120, 10, 11, 0, 100, 0, 100, 0, 0); Ambient_Sounds_Add_Sound(396, 2, 120, 10, 11, 0, 100, 0, 100, 0, 0); diff --git a/engines/bladerunner/script/scene/ug04.cpp b/engines/bladerunner/script/scene/ug04.cpp index b825869995..488564973f 100644 --- a/engines/bladerunner/script/scene/ug04.cpp +++ b/engines/bladerunner/script/scene/ug04.cpp @@ -41,9 +41,9 @@ void SceneScriptUG04::InitializeScene() { } Scene_Exit_Add_2D_Exit(2, 344, 298, 451, 390, 1); - Ambient_Sounds_Add_Looping_Sound(331, 25, 0, 1); - Ambient_Sounds_Add_Looping_Sound(332, 40, 0, 1); - Ambient_Sounds_Add_Looping_Sound(333, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxSTMLOOP7, 25, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED2, 40, 0, 1); Ambient_Sounds_Add_Sound(234, 2, 190, 12, 16, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(224, 2, 190, 12, 16, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(225, 2, 190, 12, 16, -100, 100, -100, 100, 0, 0); diff --git a/engines/bladerunner/script/scene/ug05.cpp b/engines/bladerunner/script/scene/ug05.cpp index a4b88eec49..3e48b2339b 100644 --- a/engines/bladerunner/script/scene/ug05.cpp +++ b/engines/bladerunner/script/scene/ug05.cpp @@ -48,9 +48,9 @@ void SceneScriptUG05::InitializeScene() { Scene_Exit_Add_2D_Exit(2, 352, 256, 393, 344, 0); } - Ambient_Sounds_Add_Looping_Sound(105, 28, 0, 1); - Ambient_Sounds_Add_Looping_Sound(332, 40, 0, 1); - Ambient_Sounds_Add_Looping_Sound(333, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 28, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED2, 40, 0, 1); Ambient_Sounds_Add_Sound(234, 2, 190, 12, 16, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(225, 2, 190, 12, 16, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(226, 2, 190, 12, 16, -100, 100, -100, 100, 0, 0); diff --git a/engines/bladerunner/script/scene/ug06.cpp b/engines/bladerunner/script/scene/ug06.cpp index 3209d4b707..bd4f8a5d65 100644 --- a/engines/bladerunner/script/scene/ug06.cpp +++ b/engines/bladerunner/script/scene/ug06.cpp @@ -47,9 +47,9 @@ void SceneScriptUG06::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 0, 0, 30, 479, 3); Scene_Exit_Add_2D_Exit(1, 294, 68, 544, 236, 0); - Ambient_Sounds_Add_Looping_Sound(288, 18, 0, 1); - Ambient_Sounds_Add_Looping_Sound(332, 40, 0, 1); - Ambient_Sounds_Add_Looping_Sound(333, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxFIREBD1, 18, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED2, 40, 0, 1); Ambient_Sounds_Add_Sound(234, 2, 190, 12, 16, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(235, 2, 190, 12, 16, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(401, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0); diff --git a/engines/bladerunner/script/scene/ug07.cpp b/engines/bladerunner/script/scene/ug07.cpp index 8b8a70a5d1..d1db05598f 100644 --- a/engines/bladerunner/script/scene/ug07.cpp +++ b/engines/bladerunner/script/scene/ug07.cpp @@ -41,9 +41,9 @@ void SceneScriptUG07::InitializeScene() { } Scene_Exit_Add_2D_Exit(2, 60, 440, 460, 479, 2); - Ambient_Sounds_Add_Looping_Sound(105, 90, -45, 1); - Ambient_Sounds_Add_Looping_Sound(332, 40, 0, 1); - Ambient_Sounds_Add_Looping_Sound(333, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 90, -45, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED2, 40, 0, 1); Ambient_Sounds_Add_Sound(368, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(402, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(369, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0); diff --git a/engines/bladerunner/script/scene/ug08.cpp b/engines/bladerunner/script/scene/ug08.cpp index 492b3d3998..f89b97f5bf 100644 --- a/engines/bladerunner/script/scene/ug08.cpp +++ b/engines/bladerunner/script/scene/ug08.cpp @@ -41,9 +41,9 @@ void SceneScriptUG08::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 125, 220, 157, 303, 3); Scene_Exit_Add_2D_Exit(1, 353, 145, 552, 309, 1); - Ambient_Sounds_Add_Looping_Sound(331, 28, 0, 1); - Ambient_Sounds_Add_Looping_Sound(332, 40, 0, 1); - Ambient_Sounds_Add_Looping_Sound(333, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxSTMLOOP7, 28, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED2, 40, 0, 1); Ambient_Sounds_Add_Sound(368, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(401, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(369, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0); diff --git a/engines/bladerunner/script/scene/ug09.cpp b/engines/bladerunner/script/scene/ug09.cpp index 678190d129..c668900c6b 100644 --- a/engines/bladerunner/script/scene/ug09.cpp +++ b/engines/bladerunner/script/scene/ug09.cpp @@ -36,9 +36,9 @@ void SceneScriptUG09::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 204, 159, 392, 360, 0); Scene_Exit_Add_2D_Exit(1, 0, 455, 639, 479, 2); - Ambient_Sounds_Add_Looping_Sound(105, 71, 0, 1); - Ambient_Sounds_Add_Looping_Sound( 95, 45, 0, 1); - Ambient_Sounds_Add_Looping_Sound(332, 76, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 71, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBOILPOT2, 45, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1, 76, 0, 1); Ambient_Sounds_Add_Sound(291, 2, 20, 25, 33, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(292, 2, 20, 25, 33, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(294, 2, 20, 25, 33, -100, 100, -100, 100, 0, 0); diff --git a/engines/bladerunner/script/scene/ug10.cpp b/engines/bladerunner/script/scene/ug10.cpp index 373c2b8038..69aa77e3f2 100644 --- a/engines/bladerunner/script/scene/ug10.cpp +++ b/engines/bladerunner/script/scene/ug10.cpp @@ -43,9 +43,9 @@ void SceneScriptUG10::InitializeScene() { Scene_2D_Region_Add(0, 349, 311, 382, 364); - Ambient_Sounds_Add_Looping_Sound(105, 71, 0, 1); - Ambient_Sounds_Add_Looping_Sound( 95, 45, 0, 1); - Ambient_Sounds_Add_Looping_Sound(332, 76, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 71, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBOILPOT2, 45, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1, 76, 0, 1); Ambient_Sounds_Add_Sound(291, 2, 20, 25, 33, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(293, 2, 20, 25, 33, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(295, 2, 20, 25, 33, -100, 100, -100, 100, 0, 0); diff --git a/engines/bladerunner/script/scene/ug12.cpp b/engines/bladerunner/script/scene/ug12.cpp index 58d2e8e7f4..76c97fabdd 100644 --- a/engines/bladerunner/script/scene/ug12.cpp +++ b/engines/bladerunner/script/scene/ug12.cpp @@ -38,9 +38,9 @@ void SceneScriptUG12::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 334, 176, 426, 266, 0); } - Ambient_Sounds_Add_Looping_Sound(105, 47, 60, 1); - Ambient_Sounds_Add_Looping_Sound(332, 40, 0, 1); - Ambient_Sounds_Add_Looping_Sound(333, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 47, 60, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED2, 40, 0, 1); Ambient_Sounds_Add_Sound(291, 2, 20, 20, 25, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(292, 2, 20, 20, 25, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(368, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0); diff --git a/engines/bladerunner/script/scene/ug14.cpp b/engines/bladerunner/script/scene/ug14.cpp index d850df0eb5..9c4b74fc0e 100644 --- a/engines/bladerunner/script/scene/ug14.cpp +++ b/engines/bladerunner/script/scene/ug14.cpp @@ -37,9 +37,9 @@ void SceneScriptUG14::InitializeScene() { Scene_Exit_Add_2D_Exit(1, 175, 44, 228, 115, 0); Scene_Exit_Add_2D_Exit(2, 537, 0, 639, 190, 1); - Ambient_Sounds_Add_Looping_Sound(331, 28, 0, 1); - Ambient_Sounds_Add_Looping_Sound(332, 40, 0, 1); - Ambient_Sounds_Add_Looping_Sound(333, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxSTMLOOP7, 28, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1, 40, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED2, 40, 0, 1); Ambient_Sounds_Add_Sound(291, 2, 20, 20, 25, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(292, 2, 20, 20, 25, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(401, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0); diff --git a/engines/bladerunner/script/scene/ug15.cpp b/engines/bladerunner/script/scene/ug15.cpp index fc60598d2e..6cd5a2c18b 100644 --- a/engines/bladerunner/script/scene/ug15.cpp +++ b/engines/bladerunner/script/scene/ug15.cpp @@ -62,9 +62,9 @@ void SceneScriptUG15::InitializeScene() { Scene_Exit_Add_2D_Exit(3, 0, 0, 30, 479, 3); } - Ambient_Sounds_Add_Looping_Sound(105, 71, 0, 1); - Ambient_Sounds_Add_Looping_Sound( 95, 45, 0, 1); - Ambient_Sounds_Add_Looping_Sound(332, 76, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 71, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBOILPOT2, 45, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1, 76, 0, 1); Ambient_Sounds_Add_Sound(291, 2, 20, 25, 33, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(292, 2, 20, 25, 33, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(293, 2, 20, 25, 33, -100, 100, -100, 100, 0, 0); diff --git a/engines/bladerunner/script/scene/ug17.cpp b/engines/bladerunner/script/scene/ug17.cpp index 3d41e2ac74..f0853b9de3 100644 --- a/engines/bladerunner/script/scene/ug17.cpp +++ b/engines/bladerunner/script/scene/ug17.cpp @@ -35,8 +35,8 @@ void SceneScriptUG17::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 610, 0, 639, 479, 1); Scene_Exit_Add_2D_Exit(1, 551, 347, 594, 386, 0); - Ambient_Sounds_Add_Looping_Sound(589, 100, 1, 1); - Ambient_Sounds_Add_Looping_Sound(384, 50, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxWINDLOOP, 100, 1, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxRUMLOOP1, 50, 1, 1); Ambient_Sounds_Add_Sound(72, 5, 80, 10, 11, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(73, 5, 80, 10, 11, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(74, 5, 80, 10, 11, -100, 100, -101, -101, 0, 0); diff --git a/engines/bladerunner/script/scene/ug19.cpp b/engines/bladerunner/script/scene/ug19.cpp index d8ae2817b2..745fa73af6 100644 --- a/engines/bladerunner/script/scene/ug19.cpp +++ b/engines/bladerunner/script/scene/ug19.cpp @@ -34,8 +34,8 @@ void SceneScriptUG19::InitializeScene() { Scene_Exit_Add_2D_Exit(0, 351, 0, 491, 347, 0); Scene_Exit_Add_2D_Exit(1, 548, 124, 639, 369, 1); - Ambient_Sounds_Add_Looping_Sound( 95, 45, 0, 1); - Ambient_Sounds_Add_Looping_Sound(332, 76, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxBOILPOT2, 45, 0, 1); + Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1, 76, 0, 1); Ambient_Sounds_Add_Sound(291, 2, 20, 25, 33, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(292, 2, 20, 25, 33, -100, 100, -100, 100, 0, 0); Ambient_Sounds_Add_Sound(293, 2, 20, 25, 33, -100, 100, -100, 100, 0, 0); |