From 5916d00047f82fc87ee4cf56e5d81405ade5f8f1 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Wed, 17 Mar 2010 19:25:33 +0000
Subject: [PATCH] win32: add menu items for obj display toggle

---
 desmume/src/windows/main.cpp     |  26 ++++++++++++++++++++++++++
 desmume/src/windows/resource.h   |   6 +++++-
 desmume/src/windows/resources.rc | Bin 908720 -> 910160 bytes
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index 7158e96e5..c84e78c9d 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -4745,6 +4745,19 @@ DOKEYDOWN:
 			WritePrivateProfileInt("Display","SubGpu",CommonSettings.showGpu.sub?1:0,IniName);
 			return 0;
 
+		case IDM_MOBJ:
+			if(MainScreen.gpu->dispOBJ)
+			{
+				GPU_remove(MainScreen.gpu, 4);
+				MainWindow->checkMenu(IDM_MOBJ, false);
+			}
+			else
+			{
+				GPU_addBack(MainScreen.gpu, 4);
+				MainWindow->checkMenu(IDM_MOBJ, true);
+			}
+			return 0;
+
 		case IDM_MBG0 : 
 			if(MainScreen.gpu->dispBG[0])
 			{
@@ -4793,6 +4806,19 @@ DOKEYDOWN:
 				MainWindow->checkMenu(IDM_MBG3, true);
 			}
 			return 0;
+
+		case IDM_SOBJ:
+			if(SubScreen.gpu->dispOBJ)
+			{
+				GPU_remove(SubScreen.gpu, 4);
+				MainWindow->checkMenu(IDM_SOBJ, false);
+			}
+			else
+			{
+				GPU_addBack(SubScreen.gpu, 4);
+				MainWindow->checkMenu(IDM_SOBJ, true);
+			}
+			return 0;
 		case IDM_SBG0 : 
 			if(SubScreen.gpu->dispBG[0])
 			{
diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h
index d923e7201..e59116f75 100644
--- a/desmume/src/windows/resource.h
+++ b/desmume/src/windows/resource.h
@@ -812,6 +812,10 @@
 #define ID_DISPLAYMETHOD_DIRECTDRAWHW   40071
 #define ID_DISPLAYMETHOD_DIRECTDRAWSW   40072
 #define ID_HOTKEYS_TITLE                40073
+#define ID_VIEWLAYERS_SUBOBJ            40074
+#define ID_VIEWLAYERS_MAINOBJ           40075
+#define IDM_MOBJ                        40076
+#define IDM_SOBJ                        40077
 #define IDC_LABEL_UP                    50000
 #define IDC_LABEL_RIGHT                 50001
 #define IDC_LABEL_LEFT                  50002
@@ -909,7 +913,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        121
-#define _APS_NEXT_COMMAND_VALUE         40074
+#define _APS_NEXT_COMMAND_VALUE         40078
 #define _APS_NEXT_CONTROL_VALUE         1026
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc
index 9e212a64fa26fc43da933bdf6e7263f27d9cf39e..8f6b39666925d61714d946a4e59a5348f9785c90 100644
GIT binary patch
delta 576
zcmdn6+x)^Y^M)42EleI7(-XuwxV8sqFuh_0GpApe&NXfO4Lzn0{?i?va`CYGGdMAL
zO<!2UWDaFI8nZTU=c;E~#WcMkm`P^(10@a)sMN$IT;|g^NOQ0-gY*<OFsV;}pv+;^
z{;ZJ+h?%!PYh-bXgxF|so8=3#jfWnx90<g2<948py39mdw!n<FeSsO<_626_hbBV&
z1oU3ScAZIFb09Wu2m0|H<8%X0UY6+>4zhD>Pq@H7B>=nS)4|>qc*aGPciVy91!B(a
z50tsy<l?mapD#5mgM{sy7hLUcUT|-J^MdD28YFBl`1AgN`81UG7S${>*?wvn?=v$1
DO7*@a

delta 310
zcmca`%zVRc^M)42EleI7(-){QDNOg9%H^<ql?Kx!*69Y3yb9an^qBGjrW?33Ic=X)
z&$NnZx<DM0Q9D~R6A&|RXKQA0ibU3Uhh+{#<8+|Ly6w*%u^b2l>z=M)&dRdA%9M2(
z)QATbtnCjh*tS2gU_UewY{Yh;-FJ|6J6vS{5xD)pORhIiJw@sq?M3RG+l$n>cID#K
z6Tvv$z>k+@`mJ~_p5;b!xqOg~$a%}vp7WM_d(K;)J88%+58+*aWcPHS-8|dBMe$nr
NBI(|qv4;1B830ifajO6T