diff --git a/docs/index.html b/docs/index.html
index e760290c9..2b87a90f8 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2657,9 +2657,9 @@ Ms Pac-Man (Stella extended codes):
F6SC | 16K Atari + ram |
F8 | 8K Atari |
F8SC | 8K Atari + ram |
- FASC | CBS RAM Plus |
+ FA | CBS RAM Plus |
FE | 8K Decathlon |
- MB | Dynacom Megaboy |
+ F0 | Dynacom Megaboy |
MC ¹² | C. Wilkson Megacart |
SB | 128-256k SUPERbanking |
UA | 8K UA Ltd. |
diff --git a/src/emucore/Cart.cxx b/src/emucore/Cart.cxx
index abec988c8..e5430226f 100644
--- a/src/emucore/Cart.cxx
+++ b/src/emucore/Cart.cxx
@@ -162,13 +162,13 @@ Cartridge* Cartridge::create(const uInt8* image, uInt32 size, string& md5,
cartridge = new CartridgeF8(image, true);
else if(type == "F8SC")
cartridge = new CartridgeF8SC(image);
- else if(type == "FASC")
+ else if(type == "FA" || type == "FASC")
cartridge = new CartridgeFASC(image);
else if(type == "FE")
cartridge = new CartridgeFE(image);
else if(type == "MC")
cartridge = new CartridgeMC(image, size);
- else if(type == "MB")
+ else if(type == "F0" || type == "MB")
cartridge = new CartridgeMB(image);
else if(type == "CV")
cartridge = new CartridgeCV(image, size);
@@ -317,7 +317,7 @@ string Cartridge::autodetectType(const uInt8* image, uInt32 size)
// 512 bytes of ROM and finds if either the lower 256 bytes or
// higher 256 bytes are all the same. For now, we assume that
// all carts of 12K are CBS RAM Plus/FASC.
- type = "FASC";
+ type = "FA";
}
else if(size == 16384) // 16K
{
@@ -360,7 +360,7 @@ string Cartridge::autodetectType(const uInt8* image, uInt32 size)
else if(isProbablyX07(image, size))
type = "X07";
else
- type = "MB";
+ type = "F0";
}
else if(size == 128*1024) // 128K
{
diff --git a/src/emucore/CartFASC.hxx b/src/emucore/CartFASC.hxx
index 269593a9e..c9b7d8c86 100644
--- a/src/emucore/CartFASC.hxx
+++ b/src/emucore/CartFASC.hxx
@@ -28,6 +28,11 @@ class System;
Cartridge class used for CBS' RAM Plus cartridges. There are
three 4K banks and 256 bytes of RAM.
+ Note that while the bankswitch type for this class has historically
+ been 'FASC', one must now use 'FA' to activate it.
+ This brings the bankswitch names in line with those used in z26 and
+ the various cart programming apps for KrokCart and Harmony/Melody.
+
@author Bradford W. Mott
@version $Id$
*/
@@ -117,7 +122,7 @@ class CartridgeFASC : public Cartridge
@return The name of the object
*/
- virtual string name() const { return "CartridgeFASC"; }
+ virtual string name() const { return "CartridgeFA"; }
public:
/**
diff --git a/src/emucore/CartMB.hxx b/src/emucore/CartMB.hxx
index 0de893ac9..82ee1ff7c 100644
--- a/src/emucore/CartMB.hxx
+++ b/src/emucore/CartMB.hxx
@@ -29,6 +29,11 @@ class System;
There are 16 4K banks.
Accessing $1FF0 switches to next bank.
+ Note that while the bankswitch type for this class has historically
+ been 'MB', one must now use 'F0' to activate it.
+ This brings the bankswitch names in line with those used in z26 and
+ the various cart programming apps for KrokCart and Harmony/Melody.
+
@author Eckhard Stolberg
@version $Id$
*/
@@ -118,7 +123,7 @@ class CartridgeMB : public Cartridge
@return The name of the object
*/
- virtual string name() const { return "CartridgeMB"; }
+ virtual string name() const { return "CartridgeF0"; }
public:
/**
diff --git a/src/gui/GameInfoDialog.cxx b/src/gui/GameInfoDialog.cxx
index 75fe63a98..ad9de6549 100644
--- a/src/gui/GameInfoDialog.cxx
+++ b/src/gui/GameInfoDialog.cxx
@@ -151,15 +151,15 @@ GameInfoDialog::GameInfoDialog(
items.push_back("E7 (16K M-network)", "E7" );
items.push_back("EF (64K H. Runner)", "EF" );
items.push_back("EFSC (64K H. Runner + ram)", "EFSC" );
+ items.push_back("F0 (Dynacom Megaboy)", "F0" );
items.push_back("F4 (32K Atari)", "F4" );
items.push_back("F4SC (32K Atari + ram)", "F4SC" );
items.push_back("F6 (16K Atari)", "F6" );
items.push_back("F6SC (16K Atari + ram)", "F6SC" );
items.push_back("F8 (8K Atari)", "F8" );
items.push_back("F8SC (8K Atari + ram)", "F8SC" );
- items.push_back("FASC (CBS RAM Plus)", "FASC" );
+ items.push_back("FA (CBS RAM Plus)", "FA" );
items.push_back("FE (8K Decathlon)", "FE" );
- items.push_back("MB (Dynacom Megaboy)", "MB" );
items.push_back("MC (C. Wilkson Megacart)", "MC" );
items.push_back("SB (128-256K SUPERbank)", "SB" );
items.push_back("UA (8K UA Ltd.)", "UA" );
diff --git a/src/gui/GlobalPropsDialog.cxx b/src/gui/GlobalPropsDialog.cxx
index e9b17b373..d769d96fb 100644
--- a/src/gui/GlobalPropsDialog.cxx
+++ b/src/gui/GlobalPropsDialog.cxx
@@ -82,15 +82,15 @@ GlobalPropsDialog::
items.push_back("E7 (16K M-network)", "E7" );
items.push_back("EF (64K H. Runner)", "EF" );
items.push_back("EFSC (64K H. Runner + ram)", "EFSC" );
+ items.push_back("F0 (Dynacom Megaboy)", "F0" );
items.push_back("F4 (32K Atari)", "F4" );
items.push_back("F4SC (32K Atari + ram)", "F4SC" );
items.push_back("F6 (16K Atari)", "F6" );
items.push_back("F6SC (16K Atari + ram)", "F6SC" );
items.push_back("F8 (8K Atari)", "F8" );
items.push_back("F8SC (8K Atari + ram)", "F8SC" );
- items.push_back("FASC (CBS RAM Plus)", "FASC" );
+ items.push_back("FA (CBS RAM Plus)", "FA" );
items.push_back("FE (8K Decathlon)", "FE" );
- items.push_back("MB (Dynacom Megaboy)", "MB" );
items.push_back("MC (C. Wilkson Megacart)", "MC" );
items.push_back("SB (128-256K SUPERbank)", "SB" );
items.push_back("UA (8K UA Ltd.)", "UA" );