diff --git a/README.md b/README.md index f02185ca..3d7c2561 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ +
diff --git a/src/GPU2D_Soft.cpp b/src/GPU2D_Soft.cpp index cf168f82..6ad2cd3e 100644 --- a/src/GPU2D_Soft.cpp +++ b/src/GPU2D_Soft.cpp @@ -1507,7 +1507,7 @@ void SoftRenderer::ApplySpriteMosaicX() u32* objLine = OBJLine[CurUnit->Num]; - u8* curOBJXMosaicTable = MosaicTable[CurUnit->OBJMosaicSize[1]].data(); + u8* curOBJXMosaicTable = MosaicTable[CurUnit->OBJMosaicSize[0]].data(); u32 lastcolor = objLine[0]; diff --git a/src/NDS.cpp b/src/NDS.cpp index 031abbb5..7ef6602c 100644 --- a/src/NDS.cpp +++ b/src/NDS.cpp @@ -1541,7 +1541,7 @@ void NDS::NocashPrint(u32 ncpu, u32 addr) } output[ptr] = '\0'; - Log(LogLevel::Debug, "%s", output); + Log(LogLevel::Debug, "%s\n", output); } void NDS::MonitorARM9Jump(u32 addr) diff --git a/src/frontend/qt_sdl/EmuInstance.cpp b/src/frontend/qt_sdl/EmuInstance.cpp index 73bba4d8..8c041c3c 100644 --- a/src/frontend/qt_sdl/EmuInstance.cpp +++ b/src/frontend/qt_sdl/EmuInstance.cpp @@ -1172,7 +1172,7 @@ bool EmuInstance::updateConsole(UpdateConsoleNDSArgs&& _ndsargs, UpdateConsoleGB } - if ((!nds) || (consoletype != consoleType)) + if ((!nds) || (consoletype != nds->ConsoleType)) { NDS::Current = nullptr; if (nds) delete nds; @@ -1191,6 +1191,7 @@ bool EmuInstance::updateConsole(UpdateConsoleNDSArgs&& _ndsargs, UpdateConsoleGB nds->SetARM9BIOS(*args->ARM9BIOS); nds->SetFirmware(std::move(args->Firmware)); nds->SetNDSCart(std::move(args->NDSROM)); + nds->SetGBACart(std::move(args->GBAROM)); nds->SetJITArgs(args->JIT); // TODO GDB stub shit nds->SPU.SetInterpolation(args->Interpolation);