diff --git a/Assets/dll/libgambatte.dll b/Assets/dll/libgambatte.dll
index 894ebf93a6..654f402698 100644
Binary files a/Assets/dll/libgambatte.dll and b/Assets/dll/libgambatte.dll differ
diff --git a/Assets/dll/libgcc_s_seh-1.dll b/Assets/dll/libgcc_s_seh-1.dll
index 12a362ad9d..df7e7815d0 100644
Binary files a/Assets/dll/libgcc_s_seh-1.dll and b/Assets/dll/libgcc_s_seh-1.dll differ
diff --git a/Assets/dll/libstdc++-6.dll b/Assets/dll/libstdc++-6.dll
index 65fe81f0da..53193c267f 100644
Binary files a/Assets/dll/libstdc++-6.dll and b/Assets/dll/libstdc++-6.dll differ
diff --git a/Assets/dll/libwinpthread-1.dll b/Assets/dll/libwinpthread-1.dll
index e25834ad64..d452132fe3 100644
Binary files a/Assets/dll/libwinpthread-1.dll and b/Assets/dll/libwinpthread-1.dll differ
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
index 4fd8d8a93c..ab1d916c65 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
@@ -195,15 +195,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
InitMemoryDomains();
- var mbcBuf = new byte[32];
+ var mbcBuf = new byte[32 + 1];
LibGambatte.gambatte_pakinfo(GambatteState, mbcBuf, out var rambanks, out var rombanks, out var crc, out var headerchecksumok);
- var romNameBuf = new byte[32];
+ var romNameBuf = new byte[16 + 1];
LibGambatte.gambatte_romtitle(GambatteState, romNameBuf);
- var romname = Encoding.ASCII.GetString(romNameBuf).TrimEnd();
+ var romname = Encoding.ASCII.GetString(romNameBuf).TrimEnd('\0');
RomDetails = $"{game.Name}\r\n{SHA1Checksum.ComputePrefixedHex(file)}\r\n{MD5Checksum.ComputePrefixedHex(file)}\r\n\r\n";
- BoardName = Encoding.ASCII.GetString(mbcBuf).TrimEnd();
+ BoardName = Encoding.ASCII.GetString(mbcBuf).TrimEnd('\0');
RomDetails += $"Core reported Header Name: {romname}\r\n";
RomDetails += $"Core reported RAM Banks: {rambanks}\r\n";
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibGambatte.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibGambatte.cs
index d9777446a4..a78c0f9729 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibGambatte.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibGambatte.cs
@@ -411,7 +411,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
/// Pakinfo of currently loaded ROM image.
///
/// opaque state pointer
- /// enough room for 25 ascii chars plus terminator
+ /// enough room for 32 ascii chars plus terminator
/// number of rambanks
/// number of rombanks
/// core reported crc32
diff --git a/submodules/gambatte b/submodules/gambatte
index e35e24de89..0838651ca7 160000
--- a/submodules/gambatte
+++ b/submodules/gambatte
@@ -1 +1 @@
-Subproject commit e35e24de89f06642852f622d7d4159ba6a4abea2
+Subproject commit 0838651ca7c06d8c236834dcf5aa307092b2a82e