From 582da14a14e45150d3b462f05c81a566b429ff1c Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Mon, 13 Mar 2017 08:15:36 -0400 Subject: [PATCH] Added an enumerated type and detection of Pitfall 2. --- .../Mac/Clock SignalTests/AtariStaticAnalyserTests.mm | 6 +++--- StaticAnalyser/Atari/StaticAnalyser.cpp | 3 +++ StaticAnalyser/StaticAnalyser.hpp | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/OSBindings/Mac/Clock SignalTests/AtariStaticAnalyserTests.mm b/OSBindings/Mac/Clock SignalTests/AtariStaticAnalyserTests.mm index 50e0712e9..37524a77f 100644 --- a/OSBindings/Mac/Clock SignalTests/AtariStaticAnalyserTests.mm +++ b/OSBindings/Mac/Clock SignalTests/AtariStaticAnalyserTests.mm @@ -347,9 +347,9 @@ static NSDictionary *romRecordsBySHA1 = @{ Record(@"483fc907471c5c358fb3e624097861a2fc9c1e45", None, NO) // Picnic Record(@"57774193081acea010bd935a0449bc8f53157128", None, NO) // Piece o' Cake Record(@"d08b30ca2e5e351cac3bd3fb760b87a1a30aa300", Atari8k, NO) // Pigs in Space - Record(@"920cfbd517764ad3fa6a7425c031bd72dc7d927c", None, NO) // Pitfall II - Record(@"d0ec08b88d032627701ad72337524d91b26c656b", None, NO) // Pitfall! (1982) (Activision) (PAL) [!] - Record(@"8d525480445d48cc48460dc666ebad78c8fb7b73", None, NO) // Pitfall! + Record(@"920cfbd517764ad3fa6a7425c031bd72dc7d927c", Pitfall2, NO) // Pitfall II + Record(@"d0ec08b88d032627701ad72337524d91b26c656b", None, NO) // Pitfall! (PAL) + Record(@"8d525480445d48cc48460dc666ebad78c8fb7b73", None, NO) // Pitfall! (NTSC) Record(@"dcca30e4ae58c85a070f0c6cfaa4d27be2970d61", None, NO) // Planet of the Apes Record(@"ccfcbf52815a441158977292b719f7c5ed80c515", None, NO) // Planet Patrol Record(@"103398dd35ebd39450c5cac760fa332aac3f9458", None, NO) // Plaque Attack diff --git a/StaticAnalyser/Atari/StaticAnalyser.cpp b/StaticAnalyser/Atari/StaticAnalyser.cpp index d4bee728f..ec4f9e470 100644 --- a/StaticAnalyser/Atari/StaticAnalyser.cpp +++ b/StaticAnalyser/Atari/StaticAnalyser.cpp @@ -142,6 +142,9 @@ static void DeterminePagingForCartridge(StaticAnalyser::Target &target, const St case 8192: DeterminePagingFor8kCartridge(target, segment, disassembly); break; + case 10495: + target.atari.paging_model = StaticAnalyser::Atari2600PagingModel::Pitfall2; + break; case 12288: target.atari.paging_model = StaticAnalyser::Atari2600PagingModel::CBSRamPlus; break; diff --git a/StaticAnalyser/StaticAnalyser.hpp b/StaticAnalyser/StaticAnalyser.hpp index 8c5bad7b4..c4471ce0c 100644 --- a/StaticAnalyser/StaticAnalyser.hpp +++ b/StaticAnalyser/StaticAnalyser.hpp @@ -36,7 +36,8 @@ enum class Atari2600PagingModel { Tigervision, CBSRamPlus, MNetwork, - Megaboy + Megaboy, + Pitfall2 }; /*!