diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
index d12a75d6dc..2eed6763c6 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
@@ -108,9 +108,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 				else
 				{
 					var builtinBios = (biosSystemId, biosId) switch {
-						("GB", "World") => Resources.SameboyDmgBoot,
-						("GBC", "World") => Resources.SameboyCgbBoot,
-						("GBC", "AGB") => Resources.SameboyAgbBoot,
+						("GB", "World") => Resources.FastDmgBoot,
+						("GBC", "World") => Resources.FastCgbBoot,
+						("GBC", "AGB") => Resources.FastAgbBoot,
 						(_, _) => throw new Exception("Internal GB Error (BIOS??)"),
 					};
 					bios = BizHawk.Common.Util.DecompressGzipFile(new MemoryStream(builtinBios.Value, false));
diff --git a/src/BizHawk.Emulation.Cores/Properties/Resources.cs b/src/BizHawk.Emulation.Cores/Properties/Resources.cs
index 4bcb534912..caf84ab094 100644
--- a/src/BizHawk.Emulation.Cores/Properties/Resources.cs
+++ b/src/BizHawk.Emulation.Cores/Properties/Resources.cs
@@ -15,9 +15,12 @@ namespace BizHawk.Emulation.Cores.Properties {
 		internal static readonly Lazy<byte[]> CPC_BASIC_1_1_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_BASIC_1.1.ROM.gz"));
 		internal static readonly Lazy<byte[]> CPC_OS_6128_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_OS_6128.ROM.gz"));
 		internal static readonly Lazy<byte[]> OS_464_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("OS_464.ROM.gz"));
-		internal static readonly Lazy<byte[]> SameboyCgbBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("cgb_boot.rom.gz"));
-		internal static readonly Lazy<byte[]> SameboyAgbBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("agb_boot.rom.gz"));
-		internal static readonly Lazy<byte[]> SameboyDmgBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("dmg_boot.rom.gz"));
+		internal static readonly Lazy<byte[]> FastCgbBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("cgb_boot.rom.gz"));
+		internal static readonly Lazy<byte[]> FastAgbBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("agb_boot.rom.gz"));
+		internal static readonly Lazy<byte[]> FastDmgBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("dmg_boot.rom.gz"));
+		internal static readonly Lazy<byte[]> SameboyCgbBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("sameboy_cgb_boot.rom.gz"));
+		internal static readonly Lazy<byte[]> SameboyAgbBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("sameboy_agb_boot.rom.gz"));
+		internal static readonly Lazy<byte[]> SameboyDmgBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("sameboy_dmg_boot.rom.gz"));
 		internal static readonly Lazy<byte[]> SgbCartPresent_SPC = new Lazy<byte[]>(() => ReadEmbeddedByteArray("sgb-cart-present.spc.gz"));
 		internal static readonly Lazy<byte[]> ZX_128_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("128.ROM.gz"));
 		internal static readonly Lazy<byte[]> ZX_48_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("48.ROM.gz"));
diff --git a/src/BizHawk.Emulation.Cores/Resources/agb_boot.rom.gz b/src/BizHawk.Emulation.Cores/Resources/agb_boot.rom.gz
index 1a778e92d7..75482e6663 100644
Binary files a/src/BizHawk.Emulation.Cores/Resources/agb_boot.rom.gz and b/src/BizHawk.Emulation.Cores/Resources/agb_boot.rom.gz differ
diff --git a/src/BizHawk.Emulation.Cores/Resources/cgb_boot.rom.gz b/src/BizHawk.Emulation.Cores/Resources/cgb_boot.rom.gz
index 586e102999..1586c5c5a8 100644
Binary files a/src/BizHawk.Emulation.Cores/Resources/cgb_boot.rom.gz and b/src/BizHawk.Emulation.Cores/Resources/cgb_boot.rom.gz differ
diff --git a/src/BizHawk.Emulation.Cores/Resources/dmg_boot.rom.gz b/src/BizHawk.Emulation.Cores/Resources/dmg_boot.rom.gz
index 6096a5745b..4e8a5c2350 100644
Binary files a/src/BizHawk.Emulation.Cores/Resources/dmg_boot.rom.gz and b/src/BizHawk.Emulation.Cores/Resources/dmg_boot.rom.gz differ
diff --git a/src/BizHawk.Emulation.Cores/Resources/sameboy_agb_boot.rom.gz b/src/BizHawk.Emulation.Cores/Resources/sameboy_agb_boot.rom.gz
new file mode 100644
index 0000000000..b6a6e0c1d4
Binary files /dev/null and b/src/BizHawk.Emulation.Cores/Resources/sameboy_agb_boot.rom.gz differ
diff --git a/src/BizHawk.Emulation.Cores/Resources/sameboy_cgb_boot.rom.gz b/src/BizHawk.Emulation.Cores/Resources/sameboy_cgb_boot.rom.gz
new file mode 100644
index 0000000000..774f2800fc
Binary files /dev/null and b/src/BizHawk.Emulation.Cores/Resources/sameboy_cgb_boot.rom.gz differ
diff --git a/src/BizHawk.Emulation.Cores/Resources/sameboy_dmg_boot.rom.gz b/src/BizHawk.Emulation.Cores/Resources/sameboy_dmg_boot.rom.gz
new file mode 100644
index 0000000000..831acd61f7
Binary files /dev/null and b/src/BizHawk.Emulation.Cores/Resources/sameboy_dmg_boot.rom.gz differ