diff --git a/src/emucore/CartDetector.cxx b/src/emucore/CartDetector.cxx index d1f3af5d4..91cc73e5b 100644 --- a/src/emucore/CartDetector.cxx +++ b/src/emucore/CartDetector.cxx @@ -713,12 +713,13 @@ bool CartDetector::isProbablyFE(const ByteBuffer& image, size_t size) { // FE bankswitching is very weird, but always seems to include a // 'JSR $xxxx' - // These signatures are attributed to the MESS project - static constexpr uInt8 signature[4][5] = { - { 0x20, 0x00, 0xD0, 0xC6, 0xC5 }, // JSR $D000; DEC $C5 - { 0x20, 0xC3, 0xF8, 0xA5, 0x82 }, // JSR $F8C3; LDA $82 - { 0xD0, 0xFB, 0x20, 0x73, 0xFE }, // BNE $FB; JSR $FE73 - { 0x20, 0x00, 0xF0, 0x84, 0xD6 } // JSR $F000; $84, $D6 + // These signatures are (mostly) attributed to the MESS project + static constexpr uInt8 signature[5][5] = { + { 0x20, 0x00, 0xD0, 0xC6, 0xC5 }, // JSR $D000; DEC $C5 Decathlon + { 0x20, 0xC3, 0xF8, 0xA5, 0x82 }, // JSR $F8C3; LDA $82 Robot Tank + { 0xD0, 0xFB, 0x20, 0x73, 0xFE }, // BNE $FB; JSR $FE73 Space Shuttle (NTSC/PAL) + { 0xD0, 0xFB, 0x20, 0x68, 0xFE }, // BNE $FB; JSR $FE73 Space Shuttle (SECAM) + { 0x20, 0x00, 0xF0, 0x84, 0xD6 } // JSR $F000; $84, $D6 Thwocker }; for(const auto* const sig: signature) if(searchForBytes(image, size, sig, 5)) diff --git a/src/emucore/DefProps.hxx b/src/emucore/DefProps.hxx index 86db9c858..e0af9da96 100644 --- a/src/emucore/DefProps.hxx +++ b/src/emucore/DefProps.hxx @@ -1204,7 +1204,7 @@ static constexpr BSPF::array2D DefProps = {{ { "525f2dfc8b21b0186cff2568e0509bfc", "Activision, David Crane", "AG-930-04, AZ-030", "Decathlon (1983) (Activision) [fixed]", "", "", "", "", "", "{\"notes\":\"Decathlon & 100m dash share variation 1\",\"score_addresses\":[\"0x95\",\"0x96\"],\"variations_address\":\"0x80\",\"variations_bcd\":false,\"variations_count\":10,\"variations_zero_based\":true}", "", "", "", "", "", "", "", "", "PADDLES", "", "", "", "", "", "", "", "", "", "", "Activision Decathlon, The (USA)" }, { "52615ae358a68de6e76467e95eb404c7", "", "", "DJdsl-wopd (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, { "528400fad9a77fd5ad7fc5fdc2b7d69d", "Starpath Corporation, Stephen H. Landrum, Jon Leupp", "11 AR-4201", "Sword of Saros (1983) (Starpath)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "52a0003efb3b1c49fcde4dbc2c685d8f", "Atari, Alan Miller - Sears", "CX2641 - 99807, 49-75105", "Surround (1977) (Atari) (4K) [a]", "", "", "", "", "2K", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, + { "52a0003efb3b1c49fcde4dbc2c685d8f", "Atari, Alan Miller - Sears", "CX2641 - 99807, 49-75105", "Surround (1977) (Atari) (4K) [a]", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "52a207c2ac6b4dc87d5650f1d7bf5dfa", "", "", "Donkey Kong (Unknown) (Hack)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "52b448757081fd9fabf859f4e2f91f6b", "", "", "Worm War I (Unknown) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "52bae1726d2d7a531c9ca81e25377fc3", "", "", "Space Instigators (V1.8 Fixed) (20-10-2002) (Christopher Tumber)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -1328,7 +1328,7 @@ static constexpr BSPF::array2D DefProps = {{ { "5bbab3f3e4b47e3e23f9820765dbb45c", "", "", "Pitfall! (says 1985) [h1]", "", "", "", "", "", "{\"score_addresses\":[\"0xd5\",\"0xd6\",\"0xd7\"],\"score_digits\":6,\"variations_count\":1}", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "Pitfall! - Pitfall Harry's Jungle Adventure (USA)" }, { "5bbb75b49b2bccef9c91ff84bb249c80", "Thomas Jentzsch", "", "Missile Control - Atari Trak-Ball Hack v1.15 (NTSC) (Thomas Jentzsch)", "Uses Atari Trak-Ball Controller", "", "", "", "", "", "https://atariage.com/store/index.php?l=product_detail&p=1184", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "5bc9998b7e9a970e31d2cb60e8696cc4", "Jack Kortkamp", "", "Borgwars Asteroids (2003) (Jack Kortkamp) (Hack)", "Hack of Asteroids", "Hack", "", "", "", "{\"notes\":\"Variations > 32 differ by 1\",\"score_addresses\":[\"0xbd\",\"0xbe\"],\"score_bcd\":false,\"score_digits\":5,\"score_inverted\":true,\"score_trailing_zeroes\":1,\"variations_address\":\"0x80\",\"variations_bcd\":false,\"variations_count\":66}", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, - { "5bcc83677d68f7ef74c1b4a0697ba2a8", "Activision, Alan Miller", "AX-012, CAX-012, AX-012-04", "Ice Hockey (1981) (Activision) (16K)", "", "", "", "", "4K", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, + { "5bcc83677d68f7ef74c1b4a0697ba2a8", "Activision, Alan Miller", "AX-012, CAX-012, AX-012-04", "Ice Hockey (1981) (Activision) (16K)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "5bd79139a0c03b63f6f2cf00a7d385d2", "Marc de Smet", "", "An Exercise In Minimalism (V1) (1999) (Marc de Smet) (PD)", "", "Homebrew", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "5be03a1fe7b2c114725150be04b38704", "Atari, Alan Miller", "CX2642", "Hunt & Score (1978) (Atari) (PAL)", "Uses Keyboard Controllers", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "5c0227ad63300670a647fcebf595ea37", "Josh", "", "Battle for Naboo (Josh) (Hack)", "Hack of Atlantis", "Hack", "", "", "", "{\"score_addresses\":[\"0xa3\",\"0xa2\"],\"score_digits\":6,\"score_trailing_zeroes\":2,\"variations_address\":\"0x8d\",\"variations_count\":4,\"variations_zero_based\":true}", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, @@ -1344,7 +1344,7 @@ static constexpr BSPF::array2D DefProps = {{ { "5ced13931c21ef4fc77d3fe801a1cbfa", "CCE", "C-828", "Missile Command (1983) (CCE)", "", "", "", "", "", "{\"score_addresses\":[\"0xf3\",\"0xf1\",\"0xef\"],\"score_digits\":6,\"variations_address\":\"0xe9\",\"variations_count\":34}", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "", "" }, { "5d0e8a25cbd23e76f843c75a86b7e15b", "Coleco - Individeo, Ed Temple", "", "Cabbage Patch Kids (09-07-1984) (Coleco) (Prototype)", "Adventures in the Park", "Prototype", "", "", "", "", "http://www.atariprotos.com/2600/software/cpk/cpk.htm", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "Cabbage Patch Kids - Adventures in the Park (USA) (Proto)" }, { "5d132d121aabc5235dd039dfc46aa024", "", "", "Basketball (Unknown) (PAL) (Hack)", "Console ports are swapped", "Hack", "", "", "", "", "", "", "", "", "YES", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "5d25df9dc2cde746ceac48e834cf84a7", "Activision - Woodside Design Associates, Steve 'Jessica Stevens' Kitchen", "EAZ-033", "Space Shuttle (1983) (Activision) (SECAM)", "A Journey Into Space", "", "", "", "FE", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "Space Shuttle - A Journey Into Space (USA)" }, + { "5d25df9dc2cde746ceac48e834cf84a7", "Activision - Woodside Design Associates, Steve 'Jessica Stevens' Kitchen", "EAZ-033", "Space Shuttle (1983) (Activision) (SECAM)", "A Journey Into Space", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "Space Shuttle - A Journey Into Space (USA)" }, { "5d2cc33ca798783dee435eb29debf6d6", "Activision - Imagineering, Mike Reidel", "AK-043-04", "Commando (1988) (Activision)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "5d7293f1892b66c014e8d222e06f6165", "Atari - Axlon, Tod Frye - Heuristica, Agustin Ortiz Valdiviezo", "CX26169", "Shooting Arcade (03-07-1989) (Atari) (Prototype) [screen 2]", "Uses the Light Gun Controller (left only)", "Prototype", "", "", "", "", "http://www.atariprotos.com/2600/software/shootingarcade/shootingarcade.htm", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "5d799bfa9e1e7b6224877162accada0d", "Spectravision - Spectravideo - Sirius Software, David Lubar", "SA-206", "Challenge of.... Nexar, The (1982) (Spectravision)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, diff --git a/src/emucore/stella.pro b/src/emucore/stella.pro index 25b5f51d0..bc4bffd22 100644 --- a/src/emucore/stella.pro +++ b/src/emucore/stella.pro @@ -7507,7 +7507,6 @@ "Cart.Manufacturer" "Atari, Alan Miller - Sears" "Cart.ModelNo" "CX2641 - 99807, 49-75105" "Cart.Name" "Surround (1977) (Atari) (4K) [a]" -"Cart.Type" "2K" "" "Cart.MD5" "52a207c2ac6b4dc87d5650f1d7bf5dfa" @@ -8306,7 +8305,6 @@ "Cart.Manufacturer" "Activision, Alan Miller" "Cart.ModelNo" "AX-012, CAX-012, AX-012-04" "Cart.Name" "Ice Hockey (1981) (Activision) (16K)" -"Cart.Type" "4K" "" "Cart.MD5" "5bd79139a0c03b63f6f2cf00a7d385d2" @@ -8410,7 +8408,6 @@ "Cart.ModelNo" "EAZ-033" "Cart.Name" "Space Shuttle (1983) (Activision) (SECAM)" "Cart.Note" "A Journey Into Space" -"Cart.Type" "FE" "Bezel.Name" "Space Shuttle - A Journey Into Space (USA)" ""