From 41e3401765468965e52ffedd84462d585395a488 Mon Sep 17 00:00:00 2001
From: rogerman <rogerman@users.noreply.github.com>
Date: Wed, 2 Aug 2023 13:23:18 -0700
Subject: [PATCH] Cocoa Port: In the Cheat Database Viewer, add the option to
 ignore any game compatibility checks when adding new cheats. - At their own
 risk, this option allows the user to add any cheat from the database to any
 game that they want, regardless of any potential dangers that may arise from
 doing so. Use this option responsibly.

---
 .../English.lproj/CheatDatabaseViewer.xib     | 580 ++++++++++--------
 .../CheatDatabaseWindowController.h           |   4 +
 .../CheatDatabaseWindowController.mm          |  39 +-
 .../userinterface/EmuControllerDelegate.mm    |   8 +
 4 files changed, 383 insertions(+), 248 deletions(-)

diff --git a/desmume/src/frontend/cocoa/translations/English.lproj/CheatDatabaseViewer.xib b/desmume/src/frontend/cocoa/translations/English.lproj/CheatDatabaseViewer.xib
index bca64a637..f18057cd5 100644
--- a/desmume/src/frontend/cocoa/translations/English.lproj/CheatDatabaseViewer.xib
+++ b/desmume/src/frontend/cocoa/translations/English.lproj/CheatDatabaseViewer.xib
@@ -95,7 +95,7 @@
             <object class="NSButton" id="275077974">
               <reference key="NSNextResponder" ref="159388527"/>
               <int key="NSvFlags">292</int>
-              <string key="NSFrame">{{43, 3}, {114, 32}}</string>
+              <string key="NSFrame">{{44, 3}, {110, 32}}</string>
               <reference key="NSSuperview" ref="159388527"/>
               <reference key="NSWindow"/>
               <bool key="NSEnabled">YES</bool>
@@ -121,7 +121,7 @@
             <object class="NSButton" id="555551858">
               <reference key="NSNextResponder" ref="159388527"/>
               <int key="NSvFlags">292</int>
-              <string key="NSFrame">{{157, 3}, {114, 32}}</string>
+              <string key="NSFrame">{{149, 3}, {110, 32}}</string>
               <reference key="NSSuperview" ref="159388527"/>
               <reference key="NSWindow"/>
               <bool key="NSEnabled">YES</bool>
@@ -351,101 +351,101 @@
               <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
               <int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
             </object>
-            <object class="NSTextField" id="172165376">
+            <object class="NSTextField" id="705145350">
               <reference key="NSNextResponder" ref="159388527"/>
               <int key="NSvFlags">268</int>
               <string key="NSFrame">{{17, 414}, {90, 14}}</string>
               <reference key="NSSuperview" ref="159388527"/>
               <reference key="NSWindow"/>
               <bool key="NSEnabled">YES</bool>
-              <object class="NSTextFieldCell" key="NSCell" id="517968163">
+              <object class="NSTextFieldCell" key="NSCell" id="294310296">
                 <int key="NSCellFlags">68157504</int>
                 <int key="NSCellFlags2">4326400</int>
                 <string key="NSContents">Game Search:</string>
                 <reference key="NSSupport" ref="27"/>
-                <reference key="NSControlView" ref="172165376"/>
+                <reference key="NSControlView" ref="705145350"/>
                 <reference key="NSBackgroundColor" ref="971658850"/>
                 <reference key="NSTextColor" ref="127174373"/>
               </object>
               <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
               <int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
             </object>
-            <object class="NSTextField" id="268359891">
+            <object class="NSTextField" id="909659489">
               <reference key="NSNextResponder" ref="159388527"/>
               <int key="NSvFlags">265</int>
               <string key="NSFrame">{{303, 412}, {36, 14}}</string>
               <reference key="NSSuperview" ref="159388527"/>
               <reference key="NSWindow"/>
               <bool key="NSEnabled">YES</bool>
-              <object class="NSTextFieldCell" key="NSCell" id="243984579">
+              <object class="NSTextFieldCell" key="NSCell" id="999454646">
                 <int key="NSCellFlags">68157504</int>
                 <int key="NSCellFlags2">71435264</int>
                 <string key="NSContents">CRC:</string>
-                <object class="NSFont" key="NSSupport" id="564619978">
+                <object class="NSFont" key="NSSupport" id="139116697">
                   <string key="NSName">LucidaGrande-Bold</string>
                   <double key="NSSize">11</double>
                   <int key="NSfFlags">16</int>
                 </object>
-                <reference key="NSControlView" ref="268359891"/>
+                <reference key="NSControlView" ref="909659489"/>
                 <reference key="NSBackgroundColor" ref="971658850"/>
                 <reference key="NSTextColor" ref="127174373"/>
               </object>
               <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
               <int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
             </object>
-            <object class="NSTextField" id="877276886">
+            <object class="NSTextField" id="364388804">
               <reference key="NSNextResponder" ref="159388527"/>
               <int key="NSvFlags">265</int>
               <string key="NSFrame">{{294, 430}, {45, 14}}</string>
               <reference key="NSSuperview" ref="159388527"/>
               <reference key="NSWindow"/>
               <bool key="NSEnabled">YES</bool>
-              <object class="NSTextFieldCell" key="NSCell" id="840761679">
+              <object class="NSTextFieldCell" key="NSCell" id="405398834">
                 <int key="NSCellFlags">68157504</int>
                 <int key="NSCellFlags2">71435264</int>
                 <string key="NSContents">Serial:</string>
-                <reference key="NSSupport" ref="564619978"/>
-                <reference key="NSControlView" ref="877276886"/>
+                <reference key="NSSupport" ref="139116697"/>
+                <reference key="NSControlView" ref="364388804"/>
                 <reference key="NSBackgroundColor" ref="971658850"/>
                 <reference key="NSTextColor" ref="127174373"/>
               </object>
               <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
               <int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
             </object>
-            <object class="NSTextField" id="932095923">
+            <object class="NSTextField" id="981990192">
               <reference key="NSNextResponder" ref="159388527"/>
               <int key="NSvFlags">265</int>
               <string key="NSFrame">{{340, 412}, {83, 14}}</string>
               <reference key="NSSuperview" ref="159388527"/>
               <reference key="NSWindow"/>
               <bool key="NSEnabled">YES</bool>
-              <object class="NSTextFieldCell" key="NSCell" id="945509678">
+              <object class="NSTextFieldCell" key="NSCell" id="952567138">
                 <int key="NSCellFlags">70254657</int>
                 <int key="NSCellFlags2">4330496</int>
                 <string key="NSContents"/>
                 <reference key="NSSupport" ref="26"/>
                 <string key="NSPlaceholderString">CRC</string>
-                <reference key="NSControlView" ref="932095923"/>
+                <reference key="NSControlView" ref="981990192"/>
                 <reference key="NSBackgroundColor" ref="971658850"/>
                 <reference key="NSTextColor" ref="127174373"/>
               </object>
               <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
               <int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
             </object>
-            <object class="NSTextField" id="43717111">
+            <object class="NSTextField" id="3598026">
               <reference key="NSNextResponder" ref="159388527"/>
               <int key="NSvFlags">265</int>
               <string key="NSFrame">{{340, 430}, {83, 14}}</string>
               <reference key="NSSuperview" ref="159388527"/>
               <reference key="NSWindow"/>
               <bool key="NSEnabled">YES</bool>
-              <object class="NSTextFieldCell" key="NSCell" id="866854571">
+              <object class="NSTextFieldCell" key="NSCell" id="290099627">
                 <int key="NSCellFlags">70254657</int>
                 <int key="NSCellFlags2">4330496</int>
                 <string key="NSContents"/>
                 <reference key="NSSupport" ref="26"/>
                 <string key="NSPlaceholderString">gameCode</string>
-                <reference key="NSControlView" ref="43717111"/>
+                <reference key="NSControlView" ref="3598026"/>
                 <reference key="NSBackgroundColor" ref="971658850"/>
                 <reference key="NSTextColor" ref="127174373"/>
               </object>
@@ -499,7 +499,7 @@
             <object class="NSButton" id="229010576">
               <reference key="NSNextResponder" ref="159388527"/>
               <int key="NSvFlags">292</int>
-              <string key="NSFrame">{{11, 7}, {27, 27}}</string>
+              <string key="NSFrame">{{12, 7}, {27, 27}}</string>
               <reference key="NSSuperview" ref="159388527"/>
               <reference key="NSWindow"/>
               <bool key="NSEnabled">YES</bool>
@@ -511,7 +511,7 @@
                 <reference key="NSControlView" ref="229010576"/>
                 <int key="NSButtonFlags">-2033434624</int>
                 <int key="NSButtonFlags2">160</int>
-                <object class="NSCustomResource" key="NSNormalImage">
+                <object class="NSCustomResource" key="NSNormalImage" id="572236182">
                   <string key="NSClassName">NSImage</string>
                   <string key="NSResourceName">NSActionTemplate</string>
                 </object>
@@ -1211,7 +1211,7 @@
               <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
               <int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
             </object>
-            <object class="NSButton" id="452737441">
+            <object class="NSButton" id="596791097">
               <reference key="NSNextResponder" ref="159388527"/>
               <int key="NSvFlags">265</int>
               <string key="NSFrame">{{289, 385}, {136, 28}}</string>
@@ -1219,13 +1219,13 @@
               <reference key="NSWindow"/>
               <string key="NSReuseIdentifierKey">_NS:610</string>
               <bool key="NSEnabled">YES</bool>
-              <object class="NSButtonCell" key="NSCell" id="588816265">
+              <object class="NSButtonCell" key="NSCell" id="569483168">
                 <int key="NSCellFlags">67108864</int>
                 <int key="NSCellFlags2">134348800</int>
                 <string key="NSContents">Select Current Game</string>
                 <reference key="NSSupport" ref="26"/>
                 <string key="NSCellIdentifier">_NS:610</string>
-                <reference key="NSControlView" ref="452737441"/>
+                <reference key="NSControlView" ref="596791097"/>
                 <int key="NSButtonFlags">-2038284288</int>
                 <int key="NSButtonFlags2">129</int>
                 <string key="NSAlternateContents"/>
@@ -1235,6 +1235,71 @@
               </object>
               <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
             </object>
+            <object class="NSPopUpButton" id="355681810">
+              <reference key="NSNextResponder" ref="159388527"/>
+              <int key="NSvFlags">289</int>
+              <string key="NSFrame">{{424.9296875, 7}, {106, 26}}</string>
+              <reference key="NSSuperview" ref="159388527"/>
+              <reference key="NSWindow"/>
+              <bool key="NSEnabled">YES</bool>
+              <object class="NSPopUpButtonCell" key="NSCell" id="498976264">
+                <int key="NSCellFlags">-2076180416</int>
+                <int key="NSCellFlags2">2048</int>
+                <reference key="NSSupport" ref="664632427"/>
+                <reference key="NSControlView" ref="355681810"/>
+                <int key="NSButtonFlags">109199360</int>
+                <int key="NSButtonFlags2">129</int>
+                <string key="NSAlternateContents"/>
+                <string key="NSKeyEquivalent"/>
+                <int key="NSPeriodicDelay">400</int>
+                <int key="NSPeriodicInterval">75</int>
+                <object class="NSMenuItem" key="NSMenuItem" id="81599289">
+                  <reference key="NSMenu" ref="1002292140"/>
+                  <bool key="NSIsHidden">YES</bool>
+                  <string key="NSTitle">Options</string>
+                  <string key="NSKeyEquiv"/>
+                  <int key="NSKeyEquivModMask">1048576</int>
+                  <int key="NSMnemonicLoc">2147483647</int>
+                  <reference key="NSImage" ref="572236182"/>
+                  <object class="NSCustomResource" key="NSOnImage" id="453982226">
+                    <string key="NSClassName">NSImage</string>
+                    <string key="NSResourceName">NSMenuCheckmark</string>
+                  </object>
+                  <object class="NSCustomResource" key="NSMixedImage" id="580858291">
+                    <string key="NSClassName">NSImage</string>
+                    <string key="NSResourceName">NSMenuMixedState</string>
+                  </object>
+                  <string key="NSAction">_popUpItemAction:</string>
+                  <reference key="NSTarget" ref="498976264"/>
+                </object>
+                <bool key="NSMenuItemRespectAlignment">YES</bool>
+                <object class="NSMenu" key="NSMenu" id="1002292140">
+                  <string key="NSTitle">OtherViews</string>
+                  <object class="NSMutableArray" key="NSMenuItems">
+                    <bool key="EncodedWithXMLCoder">YES</bool>
+                    <reference ref="81599289"/>
+                    <object class="NSMenuItem" id="266223943">
+                      <reference key="NSMenu" ref="1002292140"/>
+                      <string key="NSTitle">Ignore Compatibility Check</string>
+                      <string key="NSKeyEquiv"/>
+                      <int key="NSMnemonicLoc">2147483647</int>
+                      <reference key="NSOnImage" ref="453982226"/>
+                      <reference key="NSMixedImage" ref="580858291"/>
+                      <string key="NSAction">_popUpItemAction:</string>
+                      <reference key="NSTarget" ref="498976264"/>
+                    </object>
+                  </object>
+                  <reference key="NSMenuFont" ref="664632427"/>
+                </object>
+                <int key="NSSelectedIndex">1</int>
+                <bool key="NSPullDown">YES</bool>
+                <int key="NSPreferredEdge">1</int>
+                <bool key="NSUsesItemFromMenu">YES</bool>
+                <bool key="NSAltersState">YES</bool>
+                <int key="NSArrowPosition">2</int>
+              </object>
+              <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+            </object>
           </object>
           <string key="NSFrameSize">{640, 480}</string>
           <reference key="NSSuperview"/>
@@ -1412,7 +1477,7 @@
               <int key="NSCellFlags">69206017</int>
               <int key="NSCellFlags2">272633856</int>
               <string key="NSContents"/>
-              <object class="NSFont" key="NSSupport" id="807098755">
+              <object class="NSFont" key="NSSupport" id="776530226">
                 <string key="NSName">LucidaGrande-Bold</string>
                 <double key="NSSize">13</double>
                 <int key="NSfFlags">16</int>
@@ -1479,7 +1544,7 @@
               </object>
               <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
             </object>
-            <object class="NSTextField" id="592038969">
+            <object class="NSTextField" id="189498816">
               <reference key="NSNextResponder" ref="365324939"/>
               <int key="NSvFlags">268</int>
               <string key="NSFrame">{{17, 148}, {446, 17}}</string>
@@ -1487,21 +1552,21 @@
               <reference key="NSWindow"/>
               <string key="NSReuseIdentifierKey">_NS:4068</string>
               <bool key="NSEnabled">YES</bool>
-              <object class="NSTextFieldCell" key="NSCell" id="554881025">
+              <object class="NSTextFieldCell" key="NSCell" id="392419426">
                 <int key="NSCellFlags">70254657</int>
                 <int key="NSCellFlags2">272634880</int>
                 <string key="NSContents"/>
-                <reference key="NSSupport" ref="807098755"/>
+                <reference key="NSSupport" ref="776530226"/>
                 <string key="NSPlaceholderString">Major String</string>
                 <string key="NSCellIdentifier">_NS:4068</string>
-                <reference key="NSControlView" ref="592038969"/>
+                <reference key="NSControlView" ref="189498816"/>
                 <reference key="NSBackgroundColor" ref="971658850"/>
                 <reference key="NSTextColor" ref="127174373"/>
               </object>
               <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
               <int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
             </object>
-            <object class="NSTextField" id="317389191">
+            <object class="NSTextField" id="459532452">
               <reference key="NSNextResponder" ref="365324939"/>
               <int key="NSvFlags">268</int>
               <string key="NSFrame">{{17, 44}, {446, 96}}</string>
@@ -1509,14 +1574,14 @@
               <reference key="NSWindow"/>
               <string key="NSReuseIdentifierKey">_NS:4068</string>
               <bool key="NSEnabled">YES</bool>
-              <object class="NSTextFieldCell" key="NSCell" id="367699872">
+              <object class="NSTextFieldCell" key="NSCell" id="813451440">
                 <int key="NSCellFlags">69206017</int>
                 <int key="NSCellFlags2">272764928</int>
                 <string key="NSContents"/>
                 <reference key="NSSupport" ref="26"/>
                 <string key="NSPlaceholderString">Minor String</string>
                 <string key="NSCellIdentifier">_NS:4068</string>
-                <reference key="NSControlView" ref="317389191"/>
+                <reference key="NSControlView" ref="459532452"/>
                 <reference key="NSBackgroundColor" ref="971658850"/>
                 <reference key="NSTextColor" ref="127174373"/>
               </object>
@@ -2046,17 +2111,17 @@
           <object class="IBActionConnection" key="connection">
             <string key="label">selectCurrentGame:</string>
             <reference key="source" ref="1001"/>
-            <reference key="destination" ref="452737441"/>
+            <reference key="destination" ref="596791097"/>
           </object>
           <int key="connectionID">196</int>
         </object>
         <object class="IBConnectionRecord">
           <object class="IBBindingConnection" key="connection">
             <string key="label">enabled: isCurrentGameFound</string>
-            <reference key="source" ref="452737441"/>
+            <reference key="source" ref="596791097"/>
             <reference key="destination" ref="1001"/>
             <object class="NSNibBindingConnector" key="connector">
-              <reference key="NSSource" ref="452737441"/>
+              <reference key="NSSource" ref="596791097"/>
               <reference key="NSDestination" ref="1001"/>
               <string key="NSLabel">enabled: isCurrentGameFound</string>
               <string key="NSBinding">enabled</string>
@@ -2066,156 +2131,6 @@
           </object>
           <int key="connectionID">197</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBBindingConnection" key="connection">
-            <string key="label">enabled: isCurrentGameFound</string>
-            <reference key="source" ref="54016211"/>
-            <reference key="destination" ref="1001"/>
-            <object class="NSNibBindingConnector" key="connector" id="313878496">
-              <reference key="NSSource" ref="54016211"/>
-              <reference key="NSDestination" ref="1001"/>
-              <string key="NSLabel">enabled: isCurrentGameFound</string>
-              <string key="NSBinding">enabled</string>
-              <string key="NSKeyPath">isCurrentGameFound</string>
-              <int key="NSNibBindingConnectorVersion">2</int>
-            </object>
-          </object>
-          <int key="connectionID">198</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBBindingConnection" key="connection">
-            <string key="label">enabled: isCurrentGameFound</string>
-            <reference key="source" ref="555551858"/>
-            <reference key="destination" ref="1001"/>
-            <object class="NSNibBindingConnector" key="connector" id="502434702">
-              <reference key="NSSource" ref="555551858"/>
-              <reference key="NSDestination" ref="1001"/>
-              <string key="NSLabel">enabled: isCurrentGameFound</string>
-              <string key="NSBinding">enabled</string>
-              <string key="NSKeyPath">isCurrentGameFound</string>
-              <int key="NSNibBindingConnectorVersion">2</int>
-            </object>
-          </object>
-          <int key="connectionID">199</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBBindingConnection" key="connection">
-            <string key="label">enabled: isCurrentGameFound</string>
-            <reference key="source" ref="275077974"/>
-            <reference key="destination" ref="1001"/>
-            <object class="NSNibBindingConnector" key="connector" id="99861556">
-              <reference key="NSSource" ref="275077974"/>
-              <reference key="NSDestination" ref="1001"/>
-              <string key="NSLabel">enabled: isCurrentGameFound</string>
-              <string key="NSBinding">enabled</string>
-              <string key="NSKeyPath">isCurrentGameFound</string>
-              <int key="NSNibBindingConnectorVersion">2</int>
-            </object>
-          </object>
-          <int key="connectionID">200</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBBindingConnection" key="connection">
-            <string key="label">enabled2: isSelectedGameTheCurrentGame</string>
-            <reference key="source" ref="275077974"/>
-            <reference key="destination" ref="1001"/>
-            <object class="NSNibBindingConnector" key="connector">
-              <reference key="NSSource" ref="275077974"/>
-              <reference key="NSDestination" ref="1001"/>
-              <string key="NSLabel">enabled2: isSelectedGameTheCurrentGame</string>
-              <string key="NSBinding">enabled2</string>
-              <string key="NSKeyPath">isSelectedGameTheCurrentGame</string>
-              <object class="NSDictionary" key="NSOptions">
-                <bool key="EncodedWithXMLCoder">YES</bool>
-                <object class="NSArray" key="dict.sortedKeys">
-                  <bool key="EncodedWithXMLCoder">YES</bool>
-                  <string>NSMultipleValuesPlaceholder</string>
-                  <string>NSNoSelectionPlaceholder</string>
-                  <string>NSNotApplicablePlaceholder</string>
-                  <string>NSNullPlaceholder</string>
-                </object>
-                <object class="NSMutableArray" key="dict.values">
-                  <bool key="EncodedWithXMLCoder">YES</bool>
-                  <integer value="-1"/>
-                  <integer value="-1"/>
-                  <integer value="-1"/>
-                  <integer value="-1"/>
-                </object>
-              </object>
-              <reference key="NSPreviousConnector" ref="99861556"/>
-              <int key="NSNibBindingConnectorVersion">2</int>
-            </object>
-          </object>
-          <int key="connectionID">201</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBBindingConnection" key="connection">
-            <string key="label">enabled2: isSelectedGameTheCurrentGame</string>
-            <reference key="source" ref="555551858"/>
-            <reference key="destination" ref="1001"/>
-            <object class="NSNibBindingConnector" key="connector">
-              <reference key="NSSource" ref="555551858"/>
-              <reference key="NSDestination" ref="1001"/>
-              <string key="NSLabel">enabled2: isSelectedGameTheCurrentGame</string>
-              <string key="NSBinding">enabled2</string>
-              <string key="NSKeyPath">isSelectedGameTheCurrentGame</string>
-              <object class="NSDictionary" key="NSOptions">
-                <bool key="EncodedWithXMLCoder">YES</bool>
-                <object class="NSArray" key="dict.sortedKeys">
-                  <bool key="EncodedWithXMLCoder">YES</bool>
-                  <string>NSMultipleValuesPlaceholder</string>
-                  <string>NSNoSelectionPlaceholder</string>
-                  <string>NSNotApplicablePlaceholder</string>
-                  <string>NSNullPlaceholder</string>
-                </object>
-                <object class="NSMutableArray" key="dict.values">
-                  <bool key="EncodedWithXMLCoder">YES</bool>
-                  <integer value="-1"/>
-                  <integer value="-1"/>
-                  <integer value="-1"/>
-                  <integer value="-1"/>
-                </object>
-              </object>
-              <reference key="NSPreviousConnector" ref="502434702"/>
-              <int key="NSNibBindingConnectorVersion">2</int>
-            </object>
-          </object>
-          <int key="connectionID">202</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBBindingConnection" key="connection">
-            <string key="label">enabled2: isSelectedGameTheCurrentGame</string>
-            <reference key="source" ref="54016211"/>
-            <reference key="destination" ref="1001"/>
-            <object class="NSNibBindingConnector" key="connector">
-              <reference key="NSSource" ref="54016211"/>
-              <reference key="NSDestination" ref="1001"/>
-              <string key="NSLabel">enabled2: isSelectedGameTheCurrentGame</string>
-              <string key="NSBinding">enabled2</string>
-              <string key="NSKeyPath">isSelectedGameTheCurrentGame</string>
-              <object class="NSDictionary" key="NSOptions">
-                <bool key="EncodedWithXMLCoder">YES</bool>
-                <object class="NSArray" key="dict.sortedKeys">
-                  <bool key="EncodedWithXMLCoder">YES</bool>
-                  <string>NSMultipleValuesPlaceholder</string>
-                  <string>NSNoSelectionPlaceholder</string>
-                  <string>NSNotApplicablePlaceholder</string>
-                  <string>NSNullPlaceholder</string>
-                </object>
-                <object class="NSMutableArray" key="dict.values">
-                  <bool key="EncodedWithXMLCoder">YES</bool>
-                  <integer value="-1"/>
-                  <integer value="-1"/>
-                  <integer value="-1"/>
-                  <integer value="-1"/>
-                </object>
-              </object>
-              <reference key="NSPreviousConnector" ref="313878496"/>
-              <int key="NSNibBindingConnectorVersion">2</int>
-            </object>
-          </object>
-          <int key="connectionID">203</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
             <string key="label">errorSheet</string>
@@ -2235,10 +2150,10 @@
         <object class="IBConnectionRecord">
           <object class="IBBindingConnection" key="connection">
             <string key="label">value: errorMajorString</string>
-            <reference key="source" ref="554881025"/>
+            <reference key="source" ref="392419426"/>
             <reference key="destination" ref="1001"/>
             <object class="NSNibBindingConnector" key="connector">
-              <reference key="NSSource" ref="554881025"/>
+              <reference key="NSSource" ref="392419426"/>
               <reference key="NSDestination" ref="1001"/>
               <string key="NSLabel">value: errorMajorString</string>
               <string key="NSBinding">value</string>
@@ -2251,10 +2166,10 @@
         <object class="IBConnectionRecord">
           <object class="IBBindingConnection" key="connection">
             <string key="label">value: errorMajorString</string>
-            <reference key="source" ref="592038969"/>
+            <reference key="source" ref="189498816"/>
             <reference key="destination" ref="1001"/>
             <object class="NSNibBindingConnector" key="connector">
-              <reference key="NSSource" ref="592038969"/>
+              <reference key="NSSource" ref="189498816"/>
               <reference key="NSDestination" ref="1001"/>
               <string key="NSLabel">value: errorMajorString</string>
               <string key="NSBinding">value</string>
@@ -2267,10 +2182,10 @@
         <object class="IBConnectionRecord">
           <object class="IBBindingConnection" key="connection">
             <string key="label">value: errorMinorString</string>
-            <reference key="source" ref="317389191"/>
+            <reference key="source" ref="459532452"/>
             <reference key="destination" ref="1001"/>
             <object class="NSNibBindingConnector" key="connector">
-              <reference key="NSSource" ref="317389191"/>
+              <reference key="NSSource" ref="459532452"/>
               <reference key="NSDestination" ref="1001"/>
               <string key="NSLabel">value: errorMinorString</string>
               <string key="NSBinding">value</string>
@@ -2285,7 +2200,7 @@
             <string key="label">predicate: filterPredicate</string>
             <reference key="source" ref="102526555"/>
             <reference key="destination" ref="841849309"/>
-            <object class="NSNibBindingConnector" key="connector" id="67055941">
+            <object class="NSNibBindingConnector" key="connector" id="482735668">
               <reference key="NSSource" ref="102526555"/>
               <reference key="NSDestination" ref="841849309"/>
               <string key="NSLabel">predicate: filterPredicate</string>
@@ -2314,7 +2229,7 @@
             <string key="label">predicate2: filterPredicate</string>
             <reference key="source" ref="102526555"/>
             <reference key="destination" ref="841849309"/>
-            <object class="NSNibBindingConnector" key="connector" id="81001349">
+            <object class="NSNibBindingConnector" key="connector" id="220853107">
               <reference key="NSSource" ref="102526555"/>
               <reference key="NSDestination" ref="841849309"/>
               <string key="NSLabel">predicate2: filterPredicate</string>
@@ -2333,7 +2248,7 @@
                   <string>serial CONTAINS[cd] $value</string>
                 </object>
               </object>
-              <reference key="NSPreviousConnector" ref="67055941"/>
+              <reference key="NSPreviousConnector" ref="482735668"/>
               <int key="NSNibBindingConnectorVersion">2</int>
             </object>
           </object>
@@ -2363,7 +2278,7 @@
                   <string>crcString CONTAINS[cd] $value</string>
                 </object>
               </object>
-              <reference key="NSPreviousConnector" ref="81001349"/>
+              <reference key="NSPreviousConnector" ref="220853107"/>
               <int key="NSNibBindingConnectorVersion">2</int>
             </object>
           </object>
@@ -2373,17 +2288,17 @@
           <object class="IBOutletConnection" key="connection">
             <string key="label">selectCurrentGameButton</string>
             <reference key="source" ref="1001"/>
-            <reference key="destination" ref="452737441"/>
+            <reference key="destination" ref="596791097"/>
           </object>
           <int key="connectionID">229</int>
         </object>
         <object class="IBConnectionRecord">
           <object class="IBBindingConnection" key="connection">
             <string key="label">value: currentGameSerial</string>
-            <reference key="source" ref="43717111"/>
+            <reference key="source" ref="3598026"/>
             <reference key="destination" ref="1001"/>
             <object class="NSNibBindingConnector" key="connector">
-              <reference key="NSSource" ref="43717111"/>
+              <reference key="NSSource" ref="3598026"/>
               <reference key="NSDestination" ref="1001"/>
               <string key="NSLabel">value: currentGameSerial</string>
               <string key="NSBinding">value</string>
@@ -2396,10 +2311,10 @@
         <object class="IBConnectionRecord">
           <object class="IBBindingConnection" key="connection">
             <string key="label">value: currentGameCRCString</string>
-            <reference key="source" ref="932095923"/>
+            <reference key="source" ref="981990192"/>
             <reference key="destination" ref="1001"/>
             <object class="NSNibBindingConnector" key="connector">
-              <reference key="NSSource" ref="932095923"/>
+              <reference key="NSSource" ref="981990192"/>
               <reference key="NSDestination" ref="1001"/>
               <string key="NSLabel">value: currentGameCRCString</string>
               <string key="NSBinding">value</string>
@@ -2409,6 +2324,121 @@
           </object>
           <int key="connectionID">241</int>
         </object>
+        <object class="IBConnectionRecord">
+          <object class="IBBindingConnection" key="connection">
+            <string key="label">value: isCompatibilityCheckIgnored</string>
+            <reference key="source" ref="266223943"/>
+            <reference key="destination" ref="1001"/>
+            <object class="NSNibBindingConnector" key="connector">
+              <reference key="NSSource" ref="266223943"/>
+              <reference key="NSDestination" ref="1001"/>
+              <string key="NSLabel">value: isCompatibilityCheckIgnored</string>
+              <string key="NSBinding">value</string>
+              <string key="NSKeyPath">isCompatibilityCheckIgnored</string>
+              <int key="NSNibBindingConnectorVersion">2</int>
+            </object>
+          </object>
+          <int key="connectionID">278</int>
+        </object>
+        <object class="IBConnectionRecord">
+          <object class="IBBindingConnection" key="connection">
+            <string key="label">enabled: isSelectedGameTheCurrentGame</string>
+            <reference key="source" ref="275077974"/>
+            <reference key="destination" ref="1001"/>
+            <object class="NSNibBindingConnector" key="connector">
+              <reference key="NSSource" ref="275077974"/>
+              <reference key="NSDestination" ref="1001"/>
+              <string key="NSLabel">enabled: isSelectedGameTheCurrentGame</string>
+              <string key="NSBinding">enabled</string>
+              <string key="NSKeyPath">isSelectedGameTheCurrentGame</string>
+              <object class="NSDictionary" key="NSOptions">
+                <bool key="EncodedWithXMLCoder">YES</bool>
+                <object class="NSArray" key="dict.sortedKeys">
+                  <bool key="EncodedWithXMLCoder">YES</bool>
+                  <string>NSMultipleValuesPlaceholder</string>
+                  <string>NSNoSelectionPlaceholder</string>
+                  <string>NSNotApplicablePlaceholder</string>
+                  <string>NSNullPlaceholder</string>
+                </object>
+                <object class="NSMutableArray" key="dict.values">
+                  <bool key="EncodedWithXMLCoder">YES</bool>
+                  <integer value="-1"/>
+                  <integer value="-1"/>
+                  <integer value="-1"/>
+                  <integer value="-1"/>
+                </object>
+              </object>
+              <int key="NSNibBindingConnectorVersion">2</int>
+            </object>
+          </object>
+          <int key="connectionID">279</int>
+        </object>
+        <object class="IBConnectionRecord">
+          <object class="IBBindingConnection" key="connection">
+            <string key="label">enabled: isSelectedGameTheCurrentGame</string>
+            <reference key="source" ref="555551858"/>
+            <reference key="destination" ref="1001"/>
+            <object class="NSNibBindingConnector" key="connector">
+              <reference key="NSSource" ref="555551858"/>
+              <reference key="NSDestination" ref="1001"/>
+              <string key="NSLabel">enabled: isSelectedGameTheCurrentGame</string>
+              <string key="NSBinding">enabled</string>
+              <string key="NSKeyPath">isSelectedGameTheCurrentGame</string>
+              <object class="NSDictionary" key="NSOptions">
+                <bool key="EncodedWithXMLCoder">YES</bool>
+                <object class="NSArray" key="dict.sortedKeys">
+                  <bool key="EncodedWithXMLCoder">YES</bool>
+                  <string>NSMultipleValuesPlaceholder</string>
+                  <string>NSNoSelectionPlaceholder</string>
+                  <string>NSNotApplicablePlaceholder</string>
+                  <string>NSNullPlaceholder</string>
+                </object>
+                <object class="NSMutableArray" key="dict.values">
+                  <bool key="EncodedWithXMLCoder">YES</bool>
+                  <integer value="-1"/>
+                  <integer value="-1"/>
+                  <integer value="-1"/>
+                  <integer value="-1"/>
+                </object>
+              </object>
+              <int key="NSNibBindingConnectorVersion">2</int>
+            </object>
+          </object>
+          <int key="connectionID">280</int>
+        </object>
+        <object class="IBConnectionRecord">
+          <object class="IBBindingConnection" key="connection">
+            <string key="label">enabled: isSelectedGameTheCurrentGame</string>
+            <reference key="source" ref="54016211"/>
+            <reference key="destination" ref="1001"/>
+            <object class="NSNibBindingConnector" key="connector">
+              <reference key="NSSource" ref="54016211"/>
+              <reference key="NSDestination" ref="1001"/>
+              <string key="NSLabel">enabled: isSelectedGameTheCurrentGame</string>
+              <string key="NSBinding">enabled</string>
+              <string key="NSKeyPath">isSelectedGameTheCurrentGame</string>
+              <object class="NSDictionary" key="NSOptions">
+                <bool key="EncodedWithXMLCoder">YES</bool>
+                <object class="NSArray" key="dict.sortedKeys">
+                  <bool key="EncodedWithXMLCoder">YES</bool>
+                  <string>NSMultipleValuesPlaceholder</string>
+                  <string>NSNoSelectionPlaceholder</string>
+                  <string>NSNotApplicablePlaceholder</string>
+                  <string>NSNullPlaceholder</string>
+                </object>
+                <object class="NSMutableArray" key="dict.values">
+                  <bool key="EncodedWithXMLCoder">YES</bool>
+                  <integer value="-1"/>
+                  <integer value="-1"/>
+                  <integer value="-1"/>
+                  <integer value="-1"/>
+                </object>
+              </object>
+              <int key="NSNibBindingConnectorVersion">2</int>
+            </object>
+          </object>
+          <int key="connectionID">281</int>
+        </object>
       </object>
       <object class="IBMutableOrderedSet" key="objectRecords">
         <object class="NSArray" key="orderedObjects">
@@ -2466,12 +2496,13 @@
               <reference ref="149114225"/>
               <reference ref="127406377"/>
               <reference ref="776191727"/>
-              <reference ref="172165376"/>
-              <reference ref="452737441"/>
-              <reference ref="877276886"/>
-              <reference ref="268359891"/>
-              <reference ref="932095923"/>
-              <reference ref="43717111"/>
+              <reference ref="705145350"/>
+              <reference ref="596791097"/>
+              <reference ref="364388804"/>
+              <reference ref="909659489"/>
+              <reference ref="981990192"/>
+              <reference ref="3598026"/>
+              <reference ref="355681810"/>
             </object>
             <reference key="parent" ref="1004174432"/>
           </object>
@@ -2674,9 +2705,9 @@
             <reference key="object" ref="365324939"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="592038969"/>
+              <reference ref="189498816"/>
               <reference ref="994434912"/>
-              <reference ref="317389191"/>
+              <reference ref="459532452"/>
             </object>
             <reference key="parent" ref="935559108"/>
           </object>
@@ -3033,115 +3064,153 @@
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">187</int>
-            <reference key="object" ref="172165376"/>
+            <reference key="object" ref="705145350"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="517968163"/>
+              <reference ref="294310296"/>
             </object>
             <reference key="parent" ref="159388527"/>
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">188</int>
-            <reference key="object" ref="517968163"/>
-            <reference key="parent" ref="172165376"/>
+            <reference key="object" ref="294310296"/>
+            <reference key="parent" ref="705145350"/>
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">190</int>
-            <reference key="object" ref="452737441"/>
+            <reference key="object" ref="596791097"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="588816265"/>
+              <reference ref="569483168"/>
             </object>
             <reference key="parent" ref="159388527"/>
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">191</int>
-            <reference key="object" ref="588816265"/>
-            <reference key="parent" ref="452737441"/>
+            <reference key="object" ref="569483168"/>
+            <reference key="parent" ref="596791097"/>
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">210</int>
-            <reference key="object" ref="592038969"/>
+            <reference key="object" ref="189498816"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="554881025"/>
+              <reference ref="392419426"/>
             </object>
             <reference key="parent" ref="365324939"/>
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">211</int>
-            <reference key="object" ref="554881025"/>
-            <reference key="parent" ref="592038969"/>
+            <reference key="object" ref="392419426"/>
+            <reference key="parent" ref="189498816"/>
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">213</int>
-            <reference key="object" ref="317389191"/>
+            <reference key="object" ref="459532452"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="367699872"/>
+              <reference ref="813451440"/>
             </object>
             <reference key="parent" ref="365324939"/>
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">214</int>
-            <reference key="object" ref="367699872"/>
-            <reference key="parent" ref="317389191"/>
+            <reference key="object" ref="813451440"/>
+            <reference key="parent" ref="459532452"/>
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">230</int>
-            <reference key="object" ref="268359891"/>
+            <reference key="object" ref="909659489"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="243984579"/>
+              <reference ref="999454646"/>
             </object>
             <reference key="parent" ref="159388527"/>
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">231</int>
-            <reference key="object" ref="243984579"/>
-            <reference key="parent" ref="268359891"/>
+            <reference key="object" ref="999454646"/>
+            <reference key="parent" ref="909659489"/>
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">232</int>
-            <reference key="object" ref="877276886"/>
+            <reference key="object" ref="364388804"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="840761679"/>
+              <reference ref="405398834"/>
             </object>
             <reference key="parent" ref="159388527"/>
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">233</int>
-            <reference key="object" ref="840761679"/>
-            <reference key="parent" ref="877276886"/>
+            <reference key="object" ref="405398834"/>
+            <reference key="parent" ref="364388804"/>
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">234</int>
-            <reference key="object" ref="932095923"/>
+            <reference key="object" ref="981990192"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="945509678"/>
+              <reference ref="952567138"/>
             </object>
             <reference key="parent" ref="159388527"/>
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">235</int>
-            <reference key="object" ref="43717111"/>
+            <reference key="object" ref="3598026"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="866854571"/>
+              <reference ref="290099627"/>
             </object>
             <reference key="parent" ref="159388527"/>
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">236</int>
-            <reference key="object" ref="866854571"/>
-            <reference key="parent" ref="43717111"/>
+            <reference key="object" ref="290099627"/>
+            <reference key="parent" ref="3598026"/>
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">237</int>
-            <reference key="object" ref="945509678"/>
-            <reference key="parent" ref="932095923"/>
+            <reference key="object" ref="952567138"/>
+            <reference key="parent" ref="981990192"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">270</int>
+            <reference key="object" ref="355681810"/>
+            <object class="NSMutableArray" key="children">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <reference ref="498976264"/>
+            </object>
+            <reference key="parent" ref="159388527"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">271</int>
+            <reference key="object" ref="498976264"/>
+            <object class="NSMutableArray" key="children">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <reference ref="1002292140"/>
+            </object>
+            <reference key="parent" ref="355681810"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">272</int>
+            <reference key="object" ref="1002292140"/>
+            <object class="NSMutableArray" key="children">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <reference ref="266223943"/>
+              <reference ref="81599289"/>
+            </object>
+            <reference key="parent" ref="498976264"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">275</int>
+            <reference key="object" ref="266223943"/>
+            <reference key="parent" ref="1002292140"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">277</int>
+            <reference key="object" ref="81599289"/>
+            <reference key="parent" ref="1002292140"/>
           </object>
         </object>
       </object>
@@ -3212,6 +3281,14 @@
           <string>25.IBPluginDependency</string>
           <string>26.IBPluginDependency</string>
           <string>27.IBPluginDependency</string>
+          <string>270.IBPluginDependency</string>
+          <string>270.IBViewBoundsToFrameTransform</string>
+          <string>271.IBPluginDependency</string>
+          <string>272.IBEditorWindowLastContentRect</string>
+          <string>272.IBPluginDependency</string>
+          <string>275.IBAttributePlaceholdersKey</string>
+          <string>275.IBPluginDependency</string>
+          <string>277.IBPluginDependency</string>
           <string>28.IBPluginDependency</string>
           <string>3.IBEditorWindowLastContentRect</string>
           <string>3.IBPluginDependency</string>
@@ -3377,6 +3454,23 @@
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <object class="NSAffineTransform">
+            <bytes key="NSTransformStruct">P4AAAL+AAABD0YAAwcgAAA</bytes>
+          </object>
+          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <string>{{916, 204}, {251, 43}}</string>
+          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <object class="NSMutableDictionary">
+            <string key="NS.key.0">ToolTip</string>
+            <object class="IBToolTipAttribute" key="NS.object.0">
+              <string key="name">ToolTip</string>
+              <reference key="object" ref="266223943"/>
+              <string key="toolTip">Renders NDS shadow polygons. Disabling this option may cause some shadows to disappear. Low performance impact.</string>
+            </object>
+          </object>
+          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>{{502, 214}, {640, 480}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>{{502, 214}, {640, 480}}</string>
@@ -3499,7 +3593,7 @@
         </object>
       </object>
       <nil key="sourceID"/>
-      <int key="maxID">241</int>
+      <int key="maxID">281</int>
     </object>
     <object class="IBClassDescriber" key="IBDocument.Classes">
       <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
@@ -3659,11 +3753,15 @@
       <object class="NSArray" key="dict.sortedKeys">
         <bool key="EncodedWithXMLCoder">YES</bool>
         <string>NSActionTemplate</string>
+        <string>NSMenuCheckmark</string>
+        <string>NSMenuMixedState</string>
         <string>NSSwitch</string>
       </object>
       <object class="NSMutableArray" key="dict.values">
         <bool key="EncodedWithXMLCoder">YES</bool>
         <string>{14, 14}</string>
+        <string>{11, 11}</string>
+        <string>{10, 3}</string>
         <string>{15, 15}</string>
       </object>
     </object>
diff --git a/desmume/src/frontend/cocoa/userinterface/CheatDatabaseWindowController.h b/desmume/src/frontend/cocoa/userinterface/CheatDatabaseWindowController.h
index e8f1622a4..80e0c6156 100644
--- a/desmume/src/frontend/cocoa/userinterface/CheatDatabaseWindowController.h
+++ b/desmume/src/frontend/cocoa/userinterface/CheatDatabaseWindowController.h
@@ -48,6 +48,8 @@
 	NSString *currentGameIndexString;
 	NSString *currentGameSerial;
 	NSUInteger currentGameCRC;
+	BOOL isCompatibilityCheckIgnored;
+	BOOL isOptionWarningSilenced;
 	
 	NSString *errorMajorString;
 	NSString *errorMinorString;
@@ -76,6 +78,8 @@
 @property (retain, nonatomic) NSString *currentGameSerial;
 @property (assign, nonatomic) NSUInteger currentGameCRC;
 @property (readonly, nonatomic) NSString *currentGameCRCString;
+@property (assign, nonatomic) BOOL isCompatibilityCheckIgnored;
+@property (assign) BOOL isOptionWarningSilenced;
 
 @property (assign) NSString *errorMajorString;
 @property (assign) NSString *errorMinorString;
diff --git a/desmume/src/frontend/cocoa/userinterface/CheatDatabaseWindowController.mm b/desmume/src/frontend/cocoa/userinterface/CheatDatabaseWindowController.mm
index 2ec9cb352..c71e759b0 100644
--- a/desmume/src/frontend/cocoa/userinterface/CheatDatabaseWindowController.mm
+++ b/desmume/src/frontend/cocoa/userinterface/CheatDatabaseWindowController.mm
@@ -46,6 +46,8 @@ NSMutableArray *cheatDatabaseWindowList = nil;
 @dynamic currentGameSerial;
 @synthesize currentGameCRC;
 @dynamic currentGameCRCString;
+@dynamic isCompatibilityCheckIgnored;
+@synthesize isOptionWarningSilenced;
 
 @synthesize errorMajorString;
 @synthesize errorMinorString;
@@ -71,6 +73,8 @@ NSMutableArray *cheatDatabaseWindowList = nil;
 	currentGameTableRowIndex = NSNotFound;
 	currentGameSerial = nil;
 	currentGameCRC = 0;
+	isCompatibilityCheckIgnored = NO;
+	isOptionWarningSilenced = NO;
 	errorMajorString = @"No error has occurred!";
 	errorMinorString = @"This is just a placeholder message for initialization purposes.";
 	
@@ -237,6 +241,7 @@ NSMutableArray *cheatDatabaseWindowList = nil;
 								   [NSDate date], @"AddedDate",
 								   [[self window] stringWithSavedFrame], @"WindowFrame",
 								   [NSNumber numberWithFloat:[[[splitView subviews] objectAtIndex:0] frame].size.height], @"WindowSplitViewDividerPosition",
+								   [NSNumber numberWithBool:[self isCompatibilityCheckIgnored]], @"OptionIgnoreCompatibilityCheck",
 								   nil];
 	
 	// ...and then add the newest recent item, ensuring that it is always last in the list.
@@ -337,7 +342,7 @@ NSMutableArray *cheatDatabaseWindowList = nil;
 	
 	if ( (delegate != nil) && (cheatManager != nil) && ([selectedGame serial] != nil) )
 	{
-		showWillAddColumn = ([[selectedGame serial] isEqualToString:currentGameSerial]) && ([selectedGame crc] == currentGameCRC);
+		showWillAddColumn = ( [self isCompatibilityCheckIgnored] || (([[selectedGame serial] isEqualToString:currentGameSerial]) && ([selectedGame crc] == currentGameCRC)) );
 	}
 	
 	NSTableColumn *willAddColumn = [entryOutline tableColumnWithIdentifier:@"willAdd"];
@@ -524,6 +529,30 @@ NSMutableArray *cheatDatabaseWindowList = nil;
 	return @"---";
 }
 
+- (BOOL) isCompatibilityCheckIgnored
+{
+	return isCompatibilityCheckIgnored;
+}
+
+- (void) setIsCompatibilityCheckIgnored:(BOOL)theState
+{
+	isCompatibilityCheckIgnored = theState;
+	
+	if (![self isOptionWarningSilenced] && theState)
+	{
+		NSAlert *criticalErrorAlert = [[[NSAlert alloc] init] autorelease];
+		[criticalErrorAlert setAlertStyle:ALERTSTYLE_CRITICAL];
+		[criticalErrorAlert setMessageText:@"Using an incompatible cheat may ruin your game."];
+		[criticalErrorAlert setInformativeText:@"Cheats are normally restricted to the current game \
+for compatibility reasons. By choosing to ignore the compatibility check, you can add any cheat to \
+any game that you want, but you must also assume the risk of an incompatible cheat ruining your game \
+session or corrupting your game's save data."];
+		[criticalErrorAlert runModal];
+	}
+	
+	[self validateWillAddColumn];
+}
+
 #pragma mark -
 #pragma mark IBActions
 
@@ -620,11 +649,6 @@ NSMutableArray *cheatDatabaseWindowList = nil;
 		return;
 	}
 	
-	if ( ([self currentGameSerial] == nil) || ([self currentGameCRC] == 0) )
-	{
-		return;
-	}
-	
 	NSMutableArray *entryTree = [entryListController content];
 	if (entryTree == nil)
 	{
@@ -634,7 +658,7 @@ NSMutableArray *cheatDatabaseWindowList = nil;
 	NSInteger selectedIndex = [gameTable selectedRow];
 	CocoaDSCheatDBGame *selectedGame = (CocoaDSCheatDBGame *)[[gameListController arrangedObjects] objectAtIndex:selectedIndex];
 	
-	if ( (![[selectedGame serial] isEqualToString:[self currentGameSerial]]) || ([selectedGame crc] != [self currentGameCRC]) )
+	if ( ![self isCompatibilityCheckIgnored] && ((![[selectedGame serial] isEqualToString:[self currentGameSerial]]) || ([selectedGame crc] != [self currentGameCRC])) )
 	{
 		return;
 	}
@@ -725,6 +749,7 @@ NSMutableArray *cheatDatabaseWindowList = nil;
 				NSMutableDictionary *newRecentItem = [NSMutableDictionary dictionaryWithDictionary:recentItem];
 				[newRecentItem setObject:[[self window] stringWithSavedFrame] forKey:@"WindowFrame"];
 				[newRecentItem setObject:[NSNumber numberWithFloat:[[[splitView subviews] objectAtIndex:0] frame].size.height] forKey:@"WindowSplitViewDividerPosition"];
+				[newRecentItem setObject:[NSNumber numberWithBool:[self isCompatibilityCheckIgnored]] forKey:@"OptionIgnoreCompatibilityCheck"];
 				
 				[dbRecentsList addObject:newRecentItem];
 			}
diff --git a/desmume/src/frontend/cocoa/userinterface/EmuControllerDelegate.mm b/desmume/src/frontend/cocoa/userinterface/EmuControllerDelegate.mm
index 9a0b82b18..2fe9e93c5 100644
--- a/desmume/src/frontend/cocoa/userinterface/EmuControllerDelegate.mm
+++ b/desmume/src/frontend/cocoa/userinterface/EmuControllerDelegate.mm
@@ -854,6 +854,14 @@
 	
 	if (recentItem != nil)
 	{
+		NSNumber *compatibilityCheckNumber = (NSNumber *)[recentItem objectForKey:@"OptionIgnoreCompatibilityCheck"];
+		if (compatibilityCheckNumber != nil)
+		{
+			[newWindowController setIsOptionWarningSilenced:YES];
+			[newWindowController setIsCompatibilityCheckIgnored:[compatibilityCheckNumber boolValue]];
+			[newWindowController setIsOptionWarningSilenced:NO];
+		}
+		
 		// Set up the window properties.
 		NSString *windowFrameString = (NSString *)[recentItem objectForKey:@"WindowFrame"];
 		if (windowFrameString != nil)