Skip to content

Commit 9a87a0f

Browse files
nuke sameboy (#2934)
1 parent 09ccf0d commit 9a87a0f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+3
-13528
lines changed

Assets/dll/sameboy.wbx.gz

-75 KB
Binary file not shown.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ Sega Genesis | **Genplus-gx**
313313
Sega Master System | **SMSHawk**
314314
Sega Saturn | **Saturnus**
315315
SNES | **BSNES**, Faust, Snes9x
316-
Super Game Boy | **BSNES**, **Gambatte**, **SameBoy**
316+
Super Game Boy | **BSNES**, **Gambatte**
317317
TI-83 | **TI83Hawk**
318318
TurboGrafx | HyperNyma, **PCEHawk**, **TurboNyma**
319319
Uzebox | **Uzem**

src/BizHawk.Client.Common/config/Config.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class Config
2424
(new[] { "SNES" },
2525
new[] { CoreNames.Faust, CoreNames.Snes9X, CoreNames.Bsnes, CoreNames.Bsnes115 }),
2626
(new[] { "SGB" },
27-
new[] { CoreNames.Gambatte, CoreNames.SameBoy, CoreNames.Bsnes, CoreNames.Bsnes115}),
27+
new[] { CoreNames.Gambatte, CoreNames.Bsnes, CoreNames.Bsnes115}),
2828
(new[] { "GB", "GBC" },
2929
new[] { CoreNames.Gambatte, CoreNames.GbHawk, CoreNames.SubGbHawk }),
3030
(new[] { "DGB" },
@@ -322,7 +322,7 @@ public void ResolveDefaults()
322322
["GB"] = CoreNames.Gambatte,
323323
["GBC"] = CoreNames.Gambatte,
324324
["DGB"] = CoreNames.DualGambatte,
325-
["SGB"] = CoreNames.SameBoy,
325+
["SGB"] = CoreNames.Gambatte,
326326
["PCE"] = CoreNames.TurboNyma,
327327
["PCECD"] = CoreNames.TurboNyma,
328328
["SGX"] = CoreNames.TurboNyma

src/BizHawk.Client.EmuHawk/MainForm.Events.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1574,10 +1574,6 @@ private void GbCoreSettingsMenuItem_Click(object sender, EventArgs e)
15741574
{
15751575
GBPrefs.DoGBPrefsDialog(this, Config, Game, MovieSession, gb);
15761576
}
1577-
else // SameBoy
1578-
{
1579-
GenericCoreConfig.DoDialog(this, "Gameboy Settings");
1580-
}
15811577
}
15821578

15831579
private void GbGpuViewerMenuItem_Click(object sender, EventArgs e)

src/BizHawk.Client.EmuHawk/MainForm.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1997,7 +1997,6 @@ private void HandlePlatformMenus()
19971997
break;
19981998
case "GB":
19991999
case "GBC":
2000-
case "SGB" when Emulator is Sameboy:
20012000
case "SGB" when Emulator is Gameboy:
20022001
GBSubMenu.Visible = true;
20032002
break;

src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibSameboy.cs

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)