diff --git a/README.md b/README.md index 944dfcb..2bc4a67 100644 --- 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 new file mode 100644 index 0000000..4ddcc8c Binary files /dev/null and b/site/deploy/roms/BlockemSockem.a78 differ diff --git a/site/deploy/roms/romlist-homebrew-highscore.json b/site/deploy/roms/romlist-homebrew-highscore.json index 2f5c414..9b99136 100644 --- 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 index 968191f..eee8723 100644 --- 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 index 538a40c..9eca034 100644 --- 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 index ac8bb49..a910ac4 100644 --- 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 index 130d0aa..e257b4a 100644 Binary files a/src/palettes/NTSC/JS7800_NTSC_257_Cool-DK.pal and b/src/palettes/NTSC/JS7800_NTSC_257_Cool-DK.pal differ diff --git a/src/palettes/NTSC/JS7800_NTSC_257_Cool-LT.pal b/src/palettes/NTSC/JS7800_NTSC_257_Cool-LT.pal index 2e81ef9..5816022 100644 Binary files a/src/palettes/NTSC/JS7800_NTSC_257_Cool-LT.pal and b/src/palettes/NTSC/JS7800_NTSC_257_Cool-LT.pal differ diff --git a/src/palettes/NTSC/JS7800_NTSC_267_Warm-DK.pal b/src/palettes/NTSC/JS7800_NTSC_267_Warm-DK.pal index ffbdd7d..ff37a5c 100644 Binary files a/src/palettes/NTSC/JS7800_NTSC_267_Warm-DK.pal and b/src/palettes/NTSC/JS7800_NTSC_267_Warm-DK.pal differ diff --git a/src/palettes/NTSC/JS7800_NTSC_267_Warm-LT.pal b/src/palettes/NTSC/JS7800_NTSC_267_Warm-LT.pal index ef6420a..f4bd6a7 100644 Binary files a/src/palettes/NTSC/JS7800_NTSC_267_Warm-LT.pal and b/src/palettes/NTSC/JS7800_NTSC_267_Warm-LT.pal differ diff --git a/src/palettes/NTSC/JS7800_NTSC_277_Hot-DK.pal b/src/palettes/NTSC/JS7800_NTSC_277_Hot-DK.pal index 9aafbc3..a823df7 100644 Binary files a/src/palettes/NTSC/JS7800_NTSC_277_Hot-DK.pal and b/src/palettes/NTSC/JS7800_NTSC_277_Hot-DK.pal differ diff --git a/src/palettes/NTSC/JS7800_NTSC_277_Hot-LT.pal b/src/palettes/NTSC/JS7800_NTSC_277_Hot-LT.pal index b0bf534..08ee7d4 100644 Binary files a/src/palettes/NTSC/JS7800_NTSC_277_Hot-LT.pal and b/src/palettes/NTSC/JS7800_NTSC_277_Hot-LT.pal differ diff --git a/src/palettes/PAL/JS7800_PAL_257_Cool-DK.pal b/src/palettes/PAL/JS7800_PAL_257_Cool-DK.pal index a94a895..a63a146 100644 Binary files a/src/palettes/PAL/JS7800_PAL_257_Cool-DK.pal and b/src/palettes/PAL/JS7800_PAL_257_Cool-DK.pal differ diff --git a/src/palettes/PAL/JS7800_PAL_257_Cool-LT.pal b/src/palettes/PAL/JS7800_PAL_257_Cool-LT.pal index b3b6d69..a72f642 100644 Binary files a/src/palettes/PAL/JS7800_PAL_257_Cool-LT.pal and b/src/palettes/PAL/JS7800_PAL_257_Cool-LT.pal differ diff --git a/src/palettes/PAL/JS7800_PAL_267_Warm-DK.pal b/src/palettes/PAL/JS7800_PAL_267_Warm-DK.pal index 3510ccd..b1526a7 100644 Binary files a/src/palettes/PAL/JS7800_PAL_267_Warm-DK.pal and b/src/palettes/PAL/JS7800_PAL_267_Warm-DK.pal differ diff --git a/src/palettes/PAL/JS7800_PAL_267_Warm-LT.pal b/src/palettes/PAL/JS7800_PAL_267_Warm-LT.pal index b11e50a..359c057 100644 Binary files a/src/palettes/PAL/JS7800_PAL_267_Warm-LT.pal and b/src/palettes/PAL/JS7800_PAL_267_Warm-LT.pal differ diff --git a/src/palettes/PAL/JS7800_PAL_277_Hot-DK.pal b/src/palettes/PAL/JS7800_PAL_277_Hot-DK.pal index f501844..08f406d 100644 Binary files a/src/palettes/PAL/JS7800_PAL_277_Hot-DK.pal and b/src/palettes/PAL/JS7800_PAL_277_Hot-DK.pal differ diff --git a/src/palettes/PAL/JS7800_PAL_277_Hot-LT.pal b/src/palettes/PAL/JS7800_PAL_277_Hot-LT.pal index e4e9622..314231f 100644 Binary files a/src/palettes/PAL/JS7800_PAL_277_Hot-LT.pal and b/src/palettes/PAL/JS7800_PAL_277_Hot-LT.pal differ