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 9e212a64f..8f6b39666 100644 Binary files a/desmume/src/windows/resources.rc and b/desmume/src/windows/resources.rc differ