diff --git a/desmume/src/frontend/windows/resource.h b/desmume/src/frontend/windows/resource.h index c444c4d28..e7d0b1eec 100644 --- a/desmume/src/frontend/windows/resource.h +++ b/desmume/src/frontend/windows/resource.h @@ -921,7 +921,6 @@ #define ID_LCDS_SUBGPU 40061 #define IDM_CHEATS_DISABLE 40062 #define IDM_CHEATS_SEARCH 40063 -#define ID_RAMSEARCH_CAPTIONTEXT 40064 #define IDM_LOCKDOWN 40066 #define IDM_SHOWTOOLBAR 40069 #define ID_CONFIG_DISPLAYMETHOD 40070 diff --git a/desmume/src/frontend/windows/resources.rc b/desmume/src/frontend/windows/resources.rc index ee12d2e5b..ebfabfc56 100644 --- a/desmume/src/frontend/windows/resources.rc +++ b/desmume/src/frontend/windows/resources.rc @@ -2121,16 +2121,11 @@ BEGIN IDM_FILE_STOPAVI "Stop AVI" IDM_FILE_STOPWAV "Stop WAV" IDM_FILE_RECORDAVI "Record AVI" -END - -STRINGTABLE -BEGIN IDM_FILE_RECORDWAV "Record WAV" END STRINGTABLE BEGIN - ID_RAMSEARCH_CAPTIONTEXT " RAM Search" ID_HOTKEYS_TITLE "Hotkey Configuration" END @@ -2139,47 +2134,23 @@ BEGIN ID_LABEL_HK1 "Open ROM" ID_LABEL_HK2 "Reset" ID_LABEL_HK3 "Pause" + ID_LABEL_HK3b "CPU mode" + ID_LABEL_HK3c "Increase JIT block size" + ID_LABEL_HK3d "Decrease JIT block size" ID_LABEL_HK4 "Frame Advance" ID_LABEL_HK5 "Fast Forward" ID_LABEL_HK6 "Fast Forward Toggle" ID_LABEL_HK7 "Increase Speed" ID_LABEL_HK8 "Decrease Speed" + ID_LABEL_HK8b "Limit Framerate Toggle" ID_LABEL_HK9 "Microphone" ID_LABEL_HK10 "Auto-Hold" ID_LABEL_HK11 "Auto-Hold Clear" ID_LABEL_HK12 "Toggle Rasterizer" ID_LABEL_HK13 "Save Screenshot as" + ID_LABEL_HK13b "Quick Screenshot" ID_LABEL_HK14 "Record WAV" ID_LABEL_HK15 "Record AVI" -END - -STRINGTABLE -BEGIN - ID_LABEL_HK8b "Limit Framerate Toggle" -END - -STRINGTABLE -BEGIN - ID_LABEL_HK48 "Turbo A" - ID_LABEL_HK49 "Turbo Y" - ID_LABEL_HK50 "Turbo X" - ID_LABEL_HK51 "Turbo R" - ID_LABEL_HK52 "Turbo L" - ID_LABEL_HK53 "Reload ROM" - ID_LABEL_HK13b "Quick Screenshot" - ID_LABEL_HK54 "Search Cheats" - ID_LABEL_HK55 "Increase Pressure" - ID_LABEL_HK56 "Decrease Pressure" - ID_LABEL_HK57 "Rotation 0" - ID_LABEL_HK58 "Rotation 90" - ID_LABEL_HK59 "Rotation 180" - ID_LABEL_HK60 "Rotation 270" - ID_LABEL_HK61 "Toggle Stylus Jitter" - ID_LABEL_HK62 "Toggle Cursor" -END - -STRINGTABLE -BEGIN ID_LABEL_HK16 "Toggle Frame Display" ID_LABEL_HK17 "Toggle FPS Display" ID_LABEL_HK18 "Toggle Input Display" @@ -2196,10 +2167,6 @@ BEGIN ID_LABEL_HK29 "Stylus Auto-Hold" ID_LABEL_HK30 "LCDs layout mode" ID_LABEL_HK31 "LCDs swap" -END - -STRINGTABLE -BEGIN ID_LABEL_HK32 "Increase Volume" ID_LABEL_HK33 "Decrease Volume" ID_LABEL_HK34 "Save to Slot " @@ -2216,21 +2183,21 @@ BEGIN ID_LABEL_HK45 "Turbo Select" ID_LABEL_HK46 "Turbo Start" ID_LABEL_HK47 "Turbo B" -END - -STRINGTABLE -BEGIN - ID_LABEL_HK3b "CPU mode" - ID_LABEL_HK3c "Increase JIT block size" -END - -STRINGTABLE -BEGIN - ID_LABEL_HK3d "Decrease JIT block size" -END - -STRINGTABLE -BEGIN + ID_LABEL_HK48 "Turbo A" + ID_LABEL_HK49 "Turbo Y" + ID_LABEL_HK50 "Turbo X" + ID_LABEL_HK51 "Turbo R" + ID_LABEL_HK52 "Turbo L" + ID_LABEL_HK53 "Reload ROM" + ID_LABEL_HK54 "Search Cheats" + ID_LABEL_HK55 "Increase Pressure" + ID_LABEL_HK56 "Decrease Pressure" + ID_LABEL_HK57 "Rotation 0" + ID_LABEL_HK58 "Rotation 90" + ID_LABEL_HK59 "Rotation 180" + ID_LABEL_HK60 "Rotation 270" + ID_LABEL_HK61 "Toggle Stylus Jitter" + ID_LABEL_HK62 "Toggle Cursor" ID_LABEL_HK63 "List Cheats" ID_LABEL_HK64 "Toggle Cheats" ID_LABEL_HK65 "Toggle Main GPU"