Merge pull request #49 from raz0red/006

006
raz0red · Aug 10, 2023 · 75bd7bf · 75bd7bf
2 parents 2379907 + 0f7cb36
commit 75bd7bf
Show file tree

Hide file tree

Showing 18 changed files with 15 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -45,6 +45,11 @@ For information on the ["cartridge list"](https://github.com/raz0red/js7800/wiki
 
 ## Change log
 
+### 08/10/23 (0.0.6)
+    - Updated palettes (contributed by Trebor @ AtariAge)
+    - YM-2151 default volume level adjustment
+    - Cartridge header fix for television type
+
 ### 07/30/23 (0.0.5)
     - Banksets support
     - Maria background color fix (Keystone Koppers)

diff --git a/site/deploy/roms/BlockemSockem.a78 b/site/deploy/roms/BlockemSockem.a78
diff --git a/site/deploy/roms/romlist-homebrew-highscore.json b/site/deploy/roms/romlist-homebrew-highscore.json
@@ -29,6 +29,10 @@
             "name": "Beef Drop",
             "path": "BeefDrop.a78"
         },
+        {
+            "name": "Block'Em Sock'Em",
+            "path": "BlockemSockem.a78"
+        },
         {
             "name": "Crazy Brix",
             "path": "CrazyBrix.a78"

diff --git a/site/deploy/roms/romlist-homebrew-released.json b/site/deploy/roms/romlist-homebrew-released.json
@@ -45,6 +45,10 @@
             "name": "BlocDrop",
             "path": "BlocDrop.a78"
         },
+        {
+            "name": "Block'Em Sock'Em",
+            "path": "BlockemSockem.a78"
+        },
         {
             "name": "Crazy Brix",
             "path": "CrazyBrix.a78"

diff --git a/src/js/3rdparty/ym2151.js b/src/js/3rdparty/ym2151.js
@@ -1355,7 +1355,7 @@ var FM;
           this.MixSub(s, h)
         }
 
-        t[n++] = ((h[1] + h[3] + h[2] + h[3])/(2*128));
+        t[n++] = ((h[1] + h[3] + h[2] + h[3])/(2*128)) * .33; // RAZ: reduce volume
       }
     };
     i.prototype.Intr = function (t) { };

diff --git a/src/js/prosystem/Cartridge.js b/src/js/prosystem/Cartridge.js
@@ -303,7 +303,7 @@ function cartridge_ReadHeader(header) {
 
   cartridge_controller[0] = header[55];
   cartridge_controller[1] = header[56];
-  cartridge_region = header[57];
+  cartridge_region = header[57] & 0x1;
   cartridge_flags = 0;
   // banksets changes (check for 0x08, ym2151)
   cartridge_xm = (header[63] & 1) || ((header[53] & 0x08) == 0x08) ? true : false;

diff --git a/src/palettes/NTSC/JS7800_NTSC_257_Cool-DK.pal b/src/palettes/NTSC/JS7800_NTSC_257_Cool-DK.pal
diff --git a/src/palettes/NTSC/JS7800_NTSC_257_Cool-LT.pal b/src/palettes/NTSC/JS7800_NTSC_257_Cool-LT.pal
diff --git a/src/palettes/NTSC/JS7800_NTSC_267_Warm-DK.pal b/src/palettes/NTSC/JS7800_NTSC_267_Warm-DK.pal
diff --git a/src/palettes/NTSC/JS7800_NTSC_267_Warm-LT.pal b/src/palettes/NTSC/JS7800_NTSC_267_Warm-LT.pal
diff --git a/src/palettes/NTSC/JS7800_NTSC_277_Hot-DK.pal b/src/palettes/NTSC/JS7800_NTSC_277_Hot-DK.pal
diff --git a/src/palettes/NTSC/JS7800_NTSC_277_Hot-LT.pal b/src/palettes/NTSC/JS7800_NTSC_277_Hot-LT.pal
diff --git a/src/palettes/PAL/JS7800_PAL_257_Cool-DK.pal b/src/palettes/PAL/JS7800_PAL_257_Cool-DK.pal
diff --git a/src/palettes/PAL/JS7800_PAL_257_Cool-LT.pal b/src/palettes/PAL/JS7800_PAL_257_Cool-LT.pal
diff --git a/src/palettes/PAL/JS7800_PAL_267_Warm-DK.pal b/src/palettes/PAL/JS7800_PAL_267_Warm-DK.pal
diff --git a/src/palettes/PAL/JS7800_PAL_267_Warm-LT.pal b/src/palettes/PAL/JS7800_PAL_267_Warm-LT.pal
diff --git a/src/palettes/PAL/JS7800_PAL_277_Hot-DK.pal b/src/palettes/PAL/JS7800_PAL_277_Hot-DK.pal
diff --git a/src/palettes/PAL/JS7800_PAL_277_Hot-LT.pal b/src/palettes/PAL/JS7800_PAL_277_Hot-LT.pal