ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added '2in1' bankswitch type, and updated properties for a ROM that uses 

this BS scheme.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1841 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2009-07-17 11:25:14 +00:00
parent a568aaa007
commit 64bec23f72
6 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/index.html
View File

@ -10,7 +10,7 @@
<br><br>
<center><h2><b>A multi-platform Atari 2600 VCS emulator</b></h2></center>
<center><h4><b>Release 2.8.4</b></h4></center>
<center><h4><b>Release 3.0</b></h4></center>
<br><br>
<center><h2><b>User's Guide</b></h2></center>
@ -2635,6 +2635,7 @@ Ms Pac-Man (Stella extended codes):
<table cellpadding="2" border="1">
<tr><th>&nbsp;Type&nbsp;</th><th>Description</th></tr>
<tr><td>0840 </td><td>8K ECONObanking </td></tr>
<tr><td>2IN1 &#185;</td><td>4-32K Multicart (2 games) </td></tr>
<tr><td>4IN1 &#185;</td><td>8-32K Multicart (4 games) </td></tr>
<tr><td>8IN1 &#185;</td><td>16-64K Multicart (8 games) </td></tr>
<tr><td>32IN1 &#185;</td><td>64-128K Multicart (32 games) </td></tr>

12
src/emucore/Cart.cxx
View File

@ -87,7 +87,17 @@ Cartridge* Cartridge::create(const uInt8* image, uInt32 size, string& md5,
buf << type << autodetect;
// Check for multicart first; if found, get the correct part of the image
if(type == "4IN1")
if(type == "2IN1")
{
// Make sure we have a valid sized image
if(size == 2*2048 || size == 2*4096 || size == 2*8192 || size == 2*16384)
{
type = createFromMultiCart(image, size, 2, md5, id, settings);
buf << id;
}
}
else if(type == "4IN1")
{
// Make sure we have a valid sized image
if(size == 4*2048 || size == 4*4096 || size == 4*8192)

3
src/emucore/DefProps.hxx
View File

@ -26,7 +26,7 @@
regenerated and the application recompiled.
*/
#define DEF_PROPS_SIZE 3220
#define DEF_PROPS_SIZE 3221
static const char* DefProps[DEF_PROPS_SIZE][20] = {
{ "000509d1ed2b8d30a9d94be1b3b5febb", "Greg Zumwalt", "", "Jungle Jane (2003) (Greg Zumwalt) (Hack)", "Hack of Pitfall!", "Hack", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
@ -1976,6 +1976,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = {
{ "9bd4e0d5f28ba6da417c26649171f8e4", "", "", "Hangman Pac-Man Original Words (Hack)", "Hack of Hangman", "Hack", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "9be58a14e055b0e7581fc4d6c2f6b31d", "", "", "Adventure (Color Scrolling) (Hack)", "Hack of Adventure", "Hack", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "9c27ef3bd01c611cdb80182a59463a82", "Starpath Corporation, Kevin Norman", "AR-4103", "Killer Satellites (1983) (Starpath) [a]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "9c40bf810f761ffc9c1b69c4647a8b84", "", "", "2 in 1 - Frostbite, River Raid (Unknown)", "", "", "", "2IN1", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "9c6d65bd3b477aace0376f705b354d68", "", "", "RPG Kernal (18-04-2003) (Paul Slocum) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" },
{ "9c6faa4ff7f2ae549bbcb14f582b70e4", "U.S. Games Corporation, Garry Kitchen - Vidtec", "VC1002", "Sneak 'n Peek (1982) (U.S. Games)", "", "", "", "", "", "", "", "", "", "", "", "", "30", "218", "", "" },
{ "9c6fd6ed3599978ab7b6f900484b9be6", "Andrew Wallace", "", "Laseresal 2002 (PAL60) (PD)", "", "New Release", "", "", "", "", "", "", "", "", "", "PAL60", "", "", "", "" },

5
src/emucore/stella.pro
View File

@ -19448,3 +19448,8 @@
"Cartridge.Name" "Gingerbread Man (Fred Quimby)"
"Cartridge.Rarity" "New Release"
""
"Cartridge.MD5" "9c40bf810f761ffc9c1b69c4647a8b84"
"Cartridge.Name" "2 in 1 - Frostbite, River Raid (Unknown)"
"Cartridge.Type" "2IN1"
""

1
src/gui/GameInfoDialog.cxx
View File

@ -135,6 +135,7 @@ GameInfoDialog::GameInfoDialog(
items.clear();
items.push_back("Auto-detect", "AUTO-DETECT");
items.push_back("0840 (8K ECONObank)", "0840" );
items.push_back("2IN1 Multicart (4-32K)", "2IN1" );
items.push_back("4IN1 Multicart (8-32K)", "4IN1" );
items.push_back("8IN1 Multicart (16-64K)", "8IN1" );
items.push_back("32IN1 Multicart (64-128K)", "32IN1");

1
src/gui/GlobalPropsDialog.cxx
View File

@ -66,6 +66,7 @@ GlobalPropsDialog::
items.push_back("Default", "DEFAULT");
items.push_back("Auto-detect", "AUTO-DETECT");
items.push_back("0840 (8K ECONObank)", "0840" );
items.push_back("2IN1 Multicart (4-32K)", "2IN1" );
items.push_back("4IN1 Multicart (8-32K)", "4IN1" );
items.push_back("8IN1 Multicart (16-64K)", "8IN1" );
items.push_back("32IN1 Multicart (64-128K)", "32IN1");