Remove explicit scancode from menu items

src/Dodge/Menu.hs

@@ -31,7 +31,6 @@ splashMenu =
 
 splashMenuOptions :: [MenuOption]
 splashMenuOptions =
-    basicKeyOptions
         [ Toggle ( loadSaveSlot (SaveSlotNum 0)) displaycontinue
         , Toggle id (\u -> MODString $ show $ u ^? uvScreenLayers . _head . scSelPos . _Just)
         , Toggle id (\u -> MODString $ shortShow $ u ^. uvWorld . input . mousePos)
@@ -55,7 +54,6 @@ pauseMenu = slTitleOptionsEff "PAUSED" pauseMenuOptions unpause
 
 pauseMenuOptions :: [MenuOption]
 pauseMenuOptions =
-    basicKeyOptions
         [ Toggle popScreen (opText "CONTINUE")
         , Toggle (startNewGameInSlot 0) (opText "NEW GAME")
         , Toggle reloadLevelStart (opText "RESTART")
@@ -84,7 +82,7 @@ seedStartMenu str = slTitleOptionsEff str seedStartOptions popScreen
 
 seedStartOptions :: [MenuOption]
 seedStartOptions =
-    [ Toggle (uvIOEffects .~ trySeedFromClipboard) (const $ MODString "PASTE NUMBER FROM CLIPBOARD") ScancodeA
+    [ Toggle (uvIOEffects .~ trySeedFromClipboard) (const $ MODString "PASTE NUMBER FROM CLIPBOARD")
     --    , Toggle ScancodeI (return . Just . loadSaveSlot LevelStartSlot) (const "INSERT NUMBER")
     ]
 
@@ -106,11 +104,11 @@ optionMenu = slTitleOptionsEff "OPTIONS" optionsOptions popScreen
 
 optionsOptions :: [MenuOption]
 optionsOptions =
-    basicKeyOptions
         [ makeSubmenuOption soundMenu $ MODString "VOLUME"
         , makeSubmenuOption graphicsMenu $ MODString "GRAPHICS"
         , makeSubmenuOption gameplayMenu $ MODString "GAMEPLAY"
         , makeSubmenuOption debugMenu $ MODString "DEBUG OPTIONS"
+        , Toggle popScreen $ const $ MODString "BACK"
         ]
 
 debugMenu :: ScreenLayer
@@ -121,12 +119,9 @@ debugMenu =
 
 debugMenuOptions :: [MenuOption]
 debugMenuOptions =
-    zipWith
-        ($)
         (map f [minBound ..] ++ [makeEnumOption debug_view_clip_bounds "SHOW ROOM CLIP" id])
-        $ map Scancode [4 ..]
   where
-    f :: DebugBool -> Scancode -> MenuOption
+    f :: DebugBool -> MenuOption
     f bd =
         Toggle
             (uvConfig . debug_booleans . at bd %~ toggleJust)
@@ -156,13 +151,9 @@ gameplayMenu =
 
 gameplayMenuOptions :: [MenuOption]
 gameplayMenuOptions =
-    basicKeyOptions
         [ makeBoolOption gameplay_rotate_to_wall "ROTATE TO WALL"
         ]
 
-basicKeyOptions :: [Scancode -> c] -> [c]
-basicKeyOptions xs = zipWith ($) xs $ map Scancode [4 ..]
-
 soundMenu :: ScreenLayer
 soundMenu =
     slTitleOptions
@@ -178,9 +169,7 @@ soundMenuOptions =
   where
     theoption scod1 stype scod2 str voltype =
         Toggle2
-            scod1
             (change dec stype)
-            scod2
             (change inc stype)
             (\w -> MODStringOption str (leftPad 2 '.' $ show (round $ 10 * voltype (_uvConfig w) :: Int)))
     change g vt uv = uv & uvConfig . vt %~ g
@@ -197,7 +186,6 @@ graphicsMenu = slTitleOptions "OPTIONS:GRAPHICS" graphicsMenuOptions
 
 graphicsMenuOptions :: [MenuOption]
 graphicsMenuOptions =
-    basicKeyOptions
         [ makeEnumOption graphics_resolution_factor "RESOLUTION" (uvIOEffects .~ updateFramebufferSize)
         , makeBoolOption graphics_wall_textured "WALL TEXTURES"
         , makeBoolOption graphics_object_shadows "OBJECT SHADOWS"