From 6846aadadf24772958fca86df5237c8f350f99a9 Mon Sep 17 00:00:00 2001
From: Stephen Anthony <sa666666@gmail.com>
Date: Mon, 20 Feb 2017 21:18:28 -0330
Subject: [PATCH] Fixed 'Maze Craze' NTSC ROMs to not use format autodetection.

---
 src/emucore/DefProps.hxx | 4 ++--
 src/emucore/stella.pro   | 3 ++-
 src/tools/merge_props.pl | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/emucore/DefProps.hxx b/src/emucore/DefProps.hxx
index 83ea04547..c9dfcb760 100644
--- a/src/emucore/DefProps.hxx
+++ b/src/emucore/DefProps.hxx
@@ -1713,7 +1713,7 @@ static const char* DefProps[DEF_PROPS_SIZE][21] = {
   { "8101efafcf0af32fedda4579c941e6f4", "", "", "Okie Dokie (4K) (PD)", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "81073d0377a2badef8d5e74fc44fc323", "Thomas Jentzsch", "", "Sadoom (TJ) (PAL60) (Hack)", "Hack of Kaboom!", "Hack", "", "", "", "", "", "", "PADDLES", "", "", "01 50", "PAL60", "", "", "", "" }, 
   { "8108162bc88b5a14adc3e031cf4175ad", "Quelle", "719.941 7", "Vom Himmel durch die Hoelle (1983) (Quelle) (PAL)", "AKA Parachute", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
-  { "8108ad2679bd055afec0a35a1dca46a4", "", "", "Maze Craze (Unknown)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "245", "", "" }, 
+  { "8108ad2679bd055afec0a35a1dca46a4", "", "", "Maze Craze (Unknown)", "", "", "", "", "", "", "", "", "", "", "", "", "NTSC", "", "", "", "" }, 
   { "810d8952af5a6036fca8d0c4e1b23db6", "Tiger Vision - Eram", "", "Keystone (Tiger Vision)", "AKA Keystone Kapers", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "81254ebce88fa46c4ff5a2f4d2bad538", "Atari, David Crane - Sears", "CX2653 - 6-99823, 49-75111", "Slot Machine (1979) (Atari) (4K)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "81341f00b61ab37d19d1529f483d496d", "", "", "Fu Kung! (V0.04) (10-01-2003) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
@@ -3207,7 +3207,7 @@ static const char* DefProps[DEF_PROPS_SIZE][21] = {
   { "f802fa61011dd9eb6f80b271bac479d0", "Suntek", "SS-023", "Mole Hunter (Suntek) (PAL)", "AKA Topy", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "f80cf77164079d774b9b0fae33dffca9", "", "", "Fu Kung! (V0.15) (Negative Version) (05-02-2003) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "f8240e62d8c0a64a61e19388414e3104", "Activision, Steve Cartwright", "AX-013", "Barnstorming (1982) (Activision)", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
-  { "f825c538481f9a7a46d1e9bc06200aaf", "Atari, Richard Maurer - Sears", "CX2635 - 49-75157", "Maze Craze (1980) (Atari)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
+  { "f825c538481f9a7a46d1e9bc06200aaf", "Atari, Richard Maurer - Sears", "CX2635 - 49-75157", "Maze Craze (1980) (Atari)", "", "", "", "", "", "", "", "", "", "", "", "", "NTSC", "", "", "", "" }, 
   { "f844f4c6f3baaaf5322657442d6f29eb", "Atari, Richard Dobbis, Nick 'Sandy Maiwald' Turner", "CX26111", "Snoopy and the Red Baron (1983) (Atari) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "f847fb8dba6c6d66d13724dbe5d95c4d", "Absolute Entertainment, David Crane", "AG-042-02, AG-042-04", "Skate Boardin' (1987) (Absolute)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "f8582bc6ca7046adb8e18164e8cecdbc", "", "", "Panda Chase (Unknown) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "256", "", "" }, 
diff --git a/src/emucore/stella.pro b/src/emucore/stella.pro
index e86f1db18..ff33e2e9a 100644
--- a/src/emucore/stella.pro
+++ b/src/emucore/stella.pro
@@ -10376,7 +10376,7 @@
 
 "Cartridge.MD5" "8108ad2679bd055afec0a35a1dca46a4"
 "Cartridge.Name" "Maze Craze (Unknown)"
-"Display.Height" "245"
+"Display.Format" "NTSC"
 ""
 
 "Cartridge.MD5" "810d8952af5a6036fca8d0c4e1b23db6"
@@ -19589,6 +19589,7 @@
 "Cartridge.Manufacturer" "Atari, Richard Maurer - Sears"
 "Cartridge.ModelNo" "CX2635 - 49-75157"
 "Cartridge.Name" "Maze Craze (1980) (Atari)"
+"Display.Format" "NTSC"
 ""
 
 "Cartridge.MD5" "f844f4c6f3baaaf5322657442d6f29eb"
diff --git a/src/tools/merge_props.pl b/src/tools/merge_props.pl
index 203819597..dd6dbc8d0 100755
--- a/src/tools/merge_props.pl
+++ b/src/tools/merge_props.pl
@@ -15,7 +15,7 @@ if (@ARGV != 2)
     usage();
   }
   # Saves me from having to type these paths *every single time*
-  $usr_file  = "$ENV{HOME}/.stella/stella.pro";
+  $usr_file  = "$ENV{HOME}/.config/stella/stella.pro";
   $sys_file = "src/emucore/stella.pro";
 }
 else