Skip to content

Update bsnes from upstream and skip CX4 firmware check #4854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AkiteruSDA wants to merge 3 commits into
base: master
Choose a base branch
from
+9 −7
Open

Update bsnes from upstream and skip CX4 firmware check #4854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2516538
bsnes: update from upstream
AkiteruSDA Oct 7, 2026
a6063d6
bsnes: skip firmware check for CX4
AkiteruSDA Oct 7, 2026
15d2e51
bsnes: suppress cx4 missing firmware message
AkiteruSDA Oct 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Assets/dll/bsnes.wbx.zst
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesCore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,11 @@ private string snes_path_request(int slot, string hint, bool required)
string ret = "";
FirmwareID fwid = new(firmwareSystem, firmwareId);
const string MISSING_FIRMWARE_MSG = "Game may function incorrectly without the requested firmware.";
// core falls back on built-in cx4 data rom if not provided, so no need to warn here
string msg = hint == "cx4" ? null : MISSING_FIRMWARE_MSG;
byte[] data = required
? CoreComm.CoreFileProvider.GetFirmwareOrThrow(fwid, MISSING_FIRMWARE_MSG)
: CoreComm.CoreFileProvider.GetFirmware(fwid, MISSING_FIRMWARE_MSG);
: CoreComm.CoreFileProvider.GetFirmware(fwid, msg);
if (data != null)
{
ret = hint;
Expand Down
2 changes: 1 addition & 1 deletion waterbox/bsnescore/bsnes/processor/hg51b/hg51b.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ auto HG51B::halt() -> void {
auto HG51B::wait(uint24 address) -> uint {
if(isROM(address)) return 1 + io.wait.rom;
if(isRAM(address)) return 1 + io.wait.ram;
return 1;
return 0;
}

auto HG51B::main() -> void {
Expand Down
6 changes: 3 additions & 3 deletions waterbox/bsnescore/bsnes/sfc/ppu-fast/background.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ auto PPU::Line::renderBackground(PPU::IO::Background& self, uint8 source) -> voi
if(offsetPerTileMode) {
uint validBit = 0x2000 << source;
uint offsetX = x + (hscroll & 7);
if(offsetX >= 8) { //first column is exempt
uint hlookup = getTile(io.bg3, (offsetX - 8) + (io.bg3.hoffset & ~7), io.bg3.voffset + 0);
if(offsetX >= (1 << tileWidth)) { //first column is exempt
uint hlookup = getTile(io.bg3, offsetX - (1 << tileWidth) + ((io.bg3.hoffset & ~7) << hires), io.bg3.voffset + 0);
if(io.bgMode == 4) {
if(hlookup & validBit) {
if(!(hlookup & 0x8000)) {
Expand All @@ -60,7 +60,7 @@ auto PPU::Line::renderBackground(PPU::IO::Background& self, uint8 source) -> voi
}
}
} else {
uint vlookup = getTile(io.bg3, (offsetX - 8) + (io.bg3.hoffset & ~7), io.bg3.voffset + 8);
uint vlookup = getTile(io.bg3, offsetX - (1 << tileWidth) + ((io.bg3.hoffset & ~7) << hires), io.bg3.voffset + 8);
if(hlookup & validBit) {
hoffset = offsetX + (hlookup & ~7);
}
Expand Down
4 changes: 2 additions & 2 deletions waterbox/bsnescore/bsnes/sfc/ppu/background.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,14 @@ auto PPU::Background::fetchNameTable() -> void {
auto PPU::Background::fetchOffset(uint y) -> void {
if(ppu.vcounter() == 0) return;

uint characterIndex = ppu.hcounter() >> 5 << hires();
uint characterIndex = ppu.hcounter() >> 5;
uint x = characterIndex << 3;

uint hoffset = x + (io.hoffset & ~7);
uint voffset = y + (io.voffset);

uint vtiles = 3 + io.tileSize;
uint htiles = !hires() ? vtiles : 4;
uint htiles = !hires() ? vtiles : 3;

uint htile = hoffset >> htiles;
uint vtile = voffset >> vtiles;
Expand Down
Loading