data/Streams/_MakeScr.bat

@@ -1,5 +1,5 @@
 @echo Wav2XA(speech\%1\%3.wav, Temp\%2%3.Xa,18.9Khz,Mono);
-@echo Pack1ch(Ixa\%2%3.IXa,TRUE, Temp\%2%3.Xa,TRUE,1,4);
+@echo Pack1ch(Ixa\%2%3.IXa,TRUE, Temp\%2%3.Xa,TRUE,1,32);
 @echo #
 
 

data/translations/text.dat

@@ -592,7 +592,7 @@ eng=Six Clams Adventure Land
 [STR__CHAPTER_1_LEVEL_1]
 eng=Jelly Fields
 [STR__CHAPTER_1_LEVEL_2]
-eng=Sandy's Bio-Dome
+eng=Sandy's Tree Dome
 [STR__CHAPTER_1_LEVEL_3]
 eng=Fish Hooks Park
 [STR__CHAPTER_1_LEVEL_4]

source/sound/Bank0_Speech.h

@@ -4,26 +4,26 @@
 enum BANK0_SPEECH_ENUMS
 {
 SPEECH_001 = 0x0,
-SPEECH_002 = 0x39,
+SPEECH_002 = 0x55,
-SPEECH_003 = 0x6d,
+SPEECH_003 = 0xa5,
-SPEECH_004 = 0x86,
+SPEECH_004 = 0xda,
-SPEECH_005 = 0xa9,
+SPEECH_005 = 0x119,
-SPEECH_006 = 0xbc,
+SPEECH_006 = 0x148,
-SPEECH_007 = 0xd3,
+SPEECH_007 = 0x17b,
-SPEECH_008 = 0xfa,
+SPEECH_008 = 0x1be,
-SPEECH_009 = 0x12a,
+SPEECH_009 = 0x20a,
-SPEECH_010 = 0x134,
+SPEECH_010 = 0x230,
-SPEECH_011 = 0x14f,
+SPEECH_011 = 0x267,
-SPEECH_012 = 0x177,
+SPEECH_012 = 0x2ab,
-SPEECH_013 = 0x192,
+SPEECH_013 = 0x2e2,
-SPEECH_014 = 0x1a8,
+SPEECH_014 = 0x314,
-SPEECH_015 = 0x1d6,
+SPEECH_015 = 0x35e,
-SPEECH_016 = 0x1fe,
+SPEECH_016 = 0x3a2,
-SPEECH_017 = 0x215,
+SPEECH_017 = 0x3d5,
-SPEECH_018 = 0x22f,
+SPEECH_018 = 0x40b,
-SPEECH_019 = 0x258,
+SPEECH_019 = 0x450,
-SPEECH_020 = 0x28c,
+SPEECH_020 = 0x4a0,
-SPEECH_021 = 0x2a7,
+SPEECH_021 = 0x4d7,
-SPEECH_022 = 0x2ba,
+SPEECH_022 = 0x506,
 };
 #endif

source/sound/Bank1_Speech.h

@@ -4,25 +4,25 @@
 enum BANK1_SPEECH_ENUMS
 {
 SPEECH_023 = 0x10000,
-SPEECH_024 = 0x10015,
+SPEECH_024 = 0x10031,
-SPEECH_025 = 0x10073,
+SPEECH_025 = 0x100ab,
-SPEECH_026 = 0x1007d,
+SPEECH_026 = 0x100d1,
-SPEECH_027 = 0x100b9,
+SPEECH_027 = 0x10129,
-SPEECH_028 = 0x100cf,
+SPEECH_028 = 0x1015b,
-SPEECH_029 = 0x100ec,
+SPEECH_029 = 0x10194,
-SPEECH_030 = 0x100f5,
+SPEECH_030 = 0x101b9,
-SPEECH_031 = 0x10111,
+SPEECH_031 = 0x101f1,
-SPEECH_032 = 0x1014a,
+SPEECH_032 = 0x10246,
-SPEECH_033 = 0x10164,
+SPEECH_033 = 0x1027c,
-SPEECH_034 = 0x1018a,
+SPEECH_034 = 0x102be,
-SPEECH_035 = 0x101b0,
+SPEECH_035 = 0x10300,
-SPEECH_036 = 0x101c8,
+SPEECH_036 = 0x10334,
-SPEECH_037 = 0x101de,
+SPEECH_037 = 0x10366,
-SPEECH_038 = 0x101fe,
+SPEECH_038 = 0x103a2,
-SPEECH_039 = 0x1020a,
+SPEECH_039 = 0x103ca,
-SPEECH_040 = 0x10230,
+SPEECH_040 = 0x1040c,
-SPEECH_041 = 0x10253,
+SPEECH_041 = 0x1044b,
-SPEECH_042 = 0x10280,
+SPEECH_042 = 0x10494,
-SPEECH_043 = 0x102b4,
+SPEECH_043 = 0x104e4,
 };
 #endif

source/sound/Bank2_Speech.h

@@ -4,27 +4,27 @@
 enum BANK2_SPEECH_ENUMS
 {
 SPEECH_044 = 0x20000,
-SPEECH_045 = 0x20044,
+SPEECH_045 = 0x20060,
-SPEECH_046 = 0x20069,
+SPEECH_046 = 0x200a1,
-SPEECH_047 = 0x20086,
+SPEECH_047 = 0x200da,
-SPEECH_048 = 0x200a8,
+SPEECH_048 = 0x20118,
-SPEECH_049 = 0x200c0,
+SPEECH_049 = 0x2014c,
-SPEECH_050 = 0x200c7,
+SPEECH_050 = 0x2016f,
-SPEECH_051 = 0x200ed,
+SPEECH_051 = 0x201b1,
-SPEECH_052 = 0x200fc,
+SPEECH_052 = 0x201dc,
-SPEECH_053 = 0x20124,
+SPEECH_053 = 0x20220,
-SPEECH_054 = 0x20144,
+SPEECH_054 = 0x2025c,
-SPEECH_055 = 0x20162,
+SPEECH_055 = 0x20296,
-SPEECH_056 = 0x20198,
+SPEECH_056 = 0x202e8,
-SPEECH_057 = 0x201b7,
+SPEECH_057 = 0x20323,
-SPEECH_058 = 0x201d0,
+SPEECH_058 = 0x20358,
-SPEECH_059 = 0x201e9,
+SPEECH_059 = 0x2038d,
-SPEECH_060 = 0x20205,
+SPEECH_060 = 0x203c5,
-SPEECH_061 = 0x20230,
+SPEECH_061 = 0x2040c,
-SPEECH_062 = 0x20244,
+SPEECH_062 = 0x2043c,
-SPEECH_063 = 0x20258,
+SPEECH_063 = 0x2046c,
-SPEECH_064 = 0x20284,
+SPEECH_064 = 0x204b4,
-SPEECH_065 = 0x20297,
+SPEECH_065 = 0x204e3,
-SPEECH_066 = 0x202cb,
+SPEECH_066 = 0x20533,
 };
 #endif

source/sound/Bank3_Speech.h

@@ -4,41 +4,41 @@
 enum BANK3_SPEECH_ENUMS
 {
 SPEECH_067 = 0x30000,
-SPEECH_068 = 0x3001b,
+SPEECH_068 = 0x30037,
-SPEECH_069 = 0x3003b,
+SPEECH_069 = 0x30073,
-SPEECH_070 = 0x30047,
+SPEECH_070 = 0x3009b,
-SPEECH_071 = 0x3006b,
+SPEECH_071 = 0x300db,
-SPEECH_072 = 0x30088,
+SPEECH_072 = 0x30114,
-SPEECH_073 = 0x300a5,
+SPEECH_073 = 0x3014d,
-SPEECH_074 = 0x300bd,
+SPEECH_074 = 0x30181,
-SPEECH_075 = 0x300fb,
+SPEECH_075 = 0x301db,
-SPEECH_076 = 0x3010f,
+SPEECH_076 = 0x3020b,
-SPEECH_077 = 0x3011f,
+SPEECH_077 = 0x30237,
-SPEECH_078 = 0x3012b,
+SPEECH_078 = 0x3025f,
-SPEECH_079 = 0x30134,
+SPEECH_079 = 0x30284,
-SPEECH_080 = 0x30142,
+SPEECH_080 = 0x302ae,
-SPEECH_081 = 0x30152,
+SPEECH_081 = 0x302da,
-SPEECH_082 = 0x30161,
+SPEECH_082 = 0x30305,
-SPEECH_083 = 0x3016e,
+SPEECH_083 = 0x3032e,
-SPEECH_084 = 0x3017b,
+SPEECH_084 = 0x30357,
-SPEECH_085 = 0x30187,
+SPEECH_085 = 0x3037f,
-SPEECH_086 = 0x301cd,
+SPEECH_086 = 0x303e1,
-SPEECH_087 = 0x301df,
+SPEECH_087 = 0x3040f,
-SPEECH_088 = 0x301ea,
+SPEECH_088 = 0x30436,
-SPEECH_089 = 0x301f8,
+SPEECH_089 = 0x30460,
-SPEECH_090 = 0x30205,
+SPEECH_090 = 0x30489,
-SPEECH_091 = 0x3020e,
+SPEECH_091 = 0x304ae,
-SPEECH_092 = 0x3022d,
+SPEECH_092 = 0x304e9,
-SPEECH_093 = 0x3023b,
+SPEECH_093 = 0x30513,
-SPEECH_094 = 0x30253,
+SPEECH_094 = 0x30547,
-SPEECH_095 = 0x3025f,
+SPEECH_095 = 0x3056f,
-SPEECH_096 = 0x3026e,
+SPEECH_096 = 0x3059a,
-SPEECH_097 = 0x3027a,
+SPEECH_097 = 0x305c2,
-SPEECH_098 = 0x30283,
+SPEECH_098 = 0x305e7,
-SPEECH_099 = 0x30296,
+SPEECH_099 = 0x30616,
-SPEECH_100 = 0x302a8,
+SPEECH_100 = 0x30644,
-SPEECH_101 = 0x302b5,
+SPEECH_101 = 0x3066d,
-SPEECH_102 = 0x302c5,
+SPEECH_102 = 0x30699,
-SPEECH_103 = 0x302d6,
+SPEECH_103 = 0x306c6,
 };
 #endif

source/sound/Bank4_Speech.h

@@ -4,39 +4,39 @@
 enum BANK4_SPEECH_ENUMS
 {
 SPEECH_104 = 0x40000,
-SPEECH_105 = 0x40015,
+SPEECH_105 = 0x40031,
-SPEECH_106 = 0x4001e,
+SPEECH_106 = 0x40056,
-SPEECH_107 = 0x40026,
+SPEECH_107 = 0x4007a,
-SPEECH_108 = 0x40032,
+SPEECH_108 = 0x400a2,
-SPEECH_109 = 0x4003f,
+SPEECH_109 = 0x400cb,
-SPEECH_110 = 0x40058,
+SPEECH_110 = 0x40100,
-SPEECH_111 = 0x40066,
+SPEECH_111 = 0x4012a,
-SPEECH_112 = 0x40073,
+SPEECH_112 = 0x40153,
-SPEECH_113 = 0x40086,
+SPEECH_113 = 0x40182,
-SPEECH_114 = 0x4008e,
+SPEECH_114 = 0x401a6,
-SPEECH_115 = 0x4009e,
+SPEECH_115 = 0x401d2,
-SPEECH_116 = 0x400a7,
+SPEECH_116 = 0x401f7,
-SPEECH_117 = 0x400b9,
+SPEECH_117 = 0x40225,
-SPEECH_118 = 0x400c1,
+SPEECH_118 = 0x40249,
-SPEECH_119 = 0x400d4,
+SPEECH_119 = 0x40278,
-SPEECH_120 = 0x400ff,
+SPEECH_120 = 0x402bf,
-SPEECH_121 = 0x40111,
+SPEECH_121 = 0x402ed,
-SPEECH_122 = 0x4012f,
+SPEECH_122 = 0x40327,
-SPEECH_123 = 0x4013d,
+SPEECH_123 = 0x40351,
-SPEECH_124 = 0x40148,
+SPEECH_124 = 0x40378,
-SPEECH_125 = 0x40151,
+SPEECH_125 = 0x4039d,
-SPEECH_126 = 0x4016d,
+SPEECH_126 = 0x403d5,
-SPEECH_127 = 0x40178,
+SPEECH_127 = 0x403fc,
-SPEECH_128 = 0x40183,
+SPEECH_128 = 0x40423,
-SPEECH_129 = 0x401ad,
+SPEECH_129 = 0x40469,
-SPEECH_130 = 0x401b8,
+SPEECH_130 = 0x40490,
-SPEECH_131 = 0x401c4,
+SPEECH_131 = 0x404b8,
-SPEECH_132 = 0x401ed,
+SPEECH_132 = 0x404fd,
-SPEECH_133 = 0x40200,
+SPEECH_133 = 0x4052c,
-SPEECH_134 = 0x4020f,
+SPEECH_134 = 0x40557,
-SPEECH_135 = 0x40262,
+SPEECH_135 = 0x405c6,
-SPEECH_136 = 0x4027d,
+SPEECH_136 = 0x405fd,
-SPEECH_137 = 0x4028d,
+SPEECH_137 = 0x40629,
-SPEECH_138 = 0x40298,
+SPEECH_138 = 0x40650,
 };
 #endif

source/sound/Bank5_Speech.h

@@ -4,25 +4,25 @@
 enum BANK5_SPEECH_ENUMS
 {
 SPEECH_139 = 0x50000,
-SPEECH_140 = 0x5000e,
+SPEECH_140 = 0x5002a,
-SPEECH_141 = 0x5001d,
+SPEECH_141 = 0x50055,
-SPEECH_142 = 0x50031,
+SPEECH_142 = 0x50085,
-SPEECH_143 = 0x5004f,
+SPEECH_143 = 0x500bf,
-SPEECH_144 = 0x50063,
+SPEECH_144 = 0x500ef,
-SPEECH_145 = 0x5006d,
+SPEECH_145 = 0x50115,
-SPEECH_146 = 0x5007a,
+SPEECH_146 = 0x5013e,
-SPEECH_147 = 0x50084,
+SPEECH_147 = 0x50164,
-SPEECH_148 = 0x5009a,
+SPEECH_148 = 0x50196,
-SPEECH_149 = 0x500ab,
+SPEECH_149 = 0x501c3,
-SPEECH_150 = 0x5014e,
+SPEECH_150 = 0x50282,
-SPEECH_151 = 0x50158,
+SPEECH_151 = 0x502a8,
-SPEECH_152 = 0x50178,
+SPEECH_152 = 0x502e4,
-SPEECH_153 = 0x5019f,
+SPEECH_153 = 0x50327,
-SPEECH_154 = 0x501cf,
+SPEECH_154 = 0x50373,
-SPEECH_155 = 0x501eb,
+SPEECH_155 = 0x503ab,
-SPEECH_156 = 0x50202,
+SPEECH_156 = 0x503de,
-SPEECH_157 = 0x5021a,
+SPEECH_157 = 0x50412,
-SPEECH_158 = 0x50234,
+SPEECH_158 = 0x50448,
-SPEECH_159 = 0x50244,
+SPEECH_159 = 0x50474,
 };
 #endif

source/sound/cdxa.cpp

@@ -47,7 +47,6 @@ int CXAStream::s_masterVolumeL=XA_DEFAULT_VOL;
 int CXAStream::s_masterVolumeR=XA_DEFAULT_VOL;
 
 
-
 /*****************************************************************************/
 /*****************************************************************************/
 /*****************************************************************************/
@@ -60,6 +59,7 @@ sXAStream	&ThisStream=CXAStream::Stream[CXAStream::CurrentStream];
 
 	CXAStream::Status=Intr;
 	if (CXAStream::Mode==XA_MODE_IDLE)	return;
+//	if (CXAStream::Mode!=XA_MODE_PLAY)	return;
 
 	switch (Intr)
     	{
@@ -192,6 +192,8 @@ void	CXAStream::Pause()
 {
 		Mode=XA_MODE_PAUSE;
 		PauseFlag=1;
+		SetVolumeOff();
+		CdControlF(CdlPause,0);
 }
 
 /*****************************************************************************/