Merge pull request RetroBat-Official#305 from Tartifless/master

Fix melonds fullscreen hotkey

Author: getupor

system/resources/inputmapping/fbneo.yml

@@ -9703,4 +9703,218 @@ revx:
   Gun X: mouseaxis 0
   Gun Y: mouseaxis 1
   Service: rightstick
-#midway d_yunit
+narc:
+  players: 2
+  Coin: back
+  Start: start
+  Up: dpup
+  Down: dpdown
+  Left: dpleft
+  Right: dpright
+  Button 1: a
+  Button 2: b
+  Button 3: y
+  Button 4: x
+  Service Mode: rightstick
+mkla:
+  players: 2
+  Coin: back
+  Start: start
+  Up: dpup
+  Down: dpdown
+  Left: dpleft
+  Right: dpright
+  Button 1: b
+  Button 2: y
+  Button 3: rightshoulder
+  Button 4: a
+  Button 5: x
+  Button 6: leftshoulder
+  Service: rightstick
+mkprot:
+  players: 2
+  Coin: back
+  Start: start
+  Up: dpup
+  Down: dpdown
+  Left: dpleft
+  Right: dpright
+  Button 1: b
+  Button 2: y
+  Button 3: rightshoulder
+  Button 4: a
+  Button 5: x
+  Button 6: leftshoulder
+  Service: rightstick
+mkyturbo:
+  players: 2
+  Coin: back
+  Start: start
+  Up: dpup
+  Down: dpdown
+  Left: dpleft
+  Right: dpright
+  Button 1: b
+  Button 2: y
+  Button 3: rightshoulder
+  Button 4: a
+  Button 5: x
+  Button 6: leftshoulder
+  Service: rightstick
+mkrep:
+  players: 2
+  Coin: back
+  Start: start
+  Up: dpup
+  Down: dpdown
+  Left: dpleft
+  Right: dpright
+  Button 1: b
+  Button 2: y
+  Button 3: rightshoulder
+  Button 4: a
+  Button 5: x
+  Button 6: leftshoulder
+  Service: rightstick
+mknifty:
+  players: 2
+  Coin: back
+  Start: start
+  Up: dpup
+  Down: dpdown
+  Left: dpleft
+  Right: dpright
+  Button 1: b
+  Button 2: y
+  Button 3: rightshoulder
+  Button 4: a
+  Button 5: x
+  Button 6: leftshoulder
+  Service: rightstick
+mkyawdim:
+  players: 2
+  Coin: back
+  Start: start
+  Up: dpup
+  Down: dpdown
+  Left: dpleft
+  Right: dpright
+  Button 1: b
+  Button 2: y
+  Button 3: rightshoulder
+  Button 4: a
+  Button 5: x
+  Button 6: leftshoulder
+  Service: rightstick
+trog:
+  players: 4
+  Start: start
+  Up: dpup
+  Down: dpdown
+  Left: dpleft
+  Right: dpright
+  Button 1: a
+  Service: rightstick
+mazebl:
+  players: 4
+  Start: start
+  Up: dpup
+  Down: dpdown
+  Left: dpleft
+  Right: dpright
+  Button 1: a
+  Service: rightstick
+smashtv:
+  players: 2
+  Coin: back
+  Start: start
+  Stick Up: dpup
+  Stick Down: dpdown
+  Stick Left: dpleft
+  Stick Right: dpright
+  Fire Up: righty_up
+  Fire Down: righty_down
+  Fire Left: rightx_left
+  Fire Right: rightx_right
+  Service: rightstick
+shimpact:
+  players: 4
+  Coin: back
+  Start: start
+  Up: dpup
+  Down: dpdown
+  Left: dpleft
+  Right: dpright
+  Button 1: a
+  Service: rightstick
+hiimpact:
+  players: 4
+  Coin: back
+  Start: start
+  Up: dpup
+  Down: dpdown
+  Left: dpleft
+  Right: dpright
+  Button 1: a
+  Service: rightstick
+strkforc:
+  players: 4
+  Coin: back
+  Start: start
+  Up: dpup
+  Down: dpdown
+  Left: dpleft
+  Right: dpright
+  Button 1: x
+  Button 2: a
+  Button 3: b
+  Service: rightstick
+totcarn:
+  players: 2
+  Coin: back
+  Start: start
+  Left Stick Up: lefty_up
+  Left Stick Down: lefty_down
+  Left Stick Left: leftx_left
+  Left Stick Right: leftx_right
+  Right Stick Up: righty_up
+  Right Stick Down: righty_down
+  Right Stick Left: rightx_left
+  Right Stick Right: rightx_right
+  Button 1: a
+  Service: rightstick
+term2:
+  players: 2
+  Coin: back
+  Start: start
+  Gun X: mouseaxis 0
+  Gun Y: mouseaxis 1
+  Button 1: a
+  Button 2: x
+  Service: rightstick
+1942:
+  players: 2
+  Coin 1: back
+  Coin 2: back
+  Start 1: start
+  Start 2: start
+  Up (Cocktail): dpup
+  Down (Cocktail): dpdown
+  Left (Cocktail): dpleft
+  Right (Cocktail): dpright
+  Fire 1 (Cocktail): x
+  Fire 2 (Cocktail): a
+  Service: leftstick
+1943:
+  players: 2
+  Coin 1: back
+  Coin 2: back
+  Start 1: start
+  Start 2: start
+  Up: dpup
+  Down: dpdown
+  Left: dpleft
+  Right: dpright
+  Fire 1: x
+  Fire 2: a
+#pre90s d_4enraya

system/templates/emulationstation/es_padtokey.cfg

@@ -233,7 +233,7 @@
         <input name="hotkey b" code="KEY_F10"/>
         <input name="hotkey left" code="KEY_F11"/>
         <input name="hotkey right" code="KEY_F12"/>
-        <input name="hotkey l1" code="KEY_F9"/>
+        <input name="hotkey l1" code="KEY_TAB"/>
     </app>
     <app name="mGBA">
         <input name="hotkey start" key="(%{KILL})"/>
@@ -273,7 +273,7 @@
         <input name="hotkey start" key="(%{KILL})"/>
     </app>
     <app name="PhoenixEmuProject">
-        <input name="hotkey start" key="(%{KILL})"/>
+        <input name="hotkey start" key="(%{CLOSE})"/>
     </app>
     <app name="pico8">
         <input name="hotkey start" key="(%{KILL})"/>

system/templates/emulationstation/es_systems.cfg

@@ -341,7 +341,7 @@
           <core incompatible_extensions=".neo">fbneo</core>
           <core incompatible_extensions=".neo">fbalpha</core>
           <core incompatible_extensions=".neo">fbalpha2012_neogeo</core>
-          <core incompatible_extensions=".zip,.wad,.7z">geolith</core>
+          <core incompatible_extensions=".wad,.7z">geolith</core>
         </cores>
       </emulator>
       <emulator incompatible_extensions=".neo" name="raine"/>