Actually make each bind unique.

libretro · Dec 25, 2023 · 24655a1 · 24655a1
1 parent 4229354
commit 24655a1
Showing 1 changed file with 30 additions and 30 deletions.
diff --git a/config.def.keybinds.h b/config.def.keybinds.h
@@ -18,35 +18,35 @@
 #ifndef __CONFIG_DEF_KEYBINDS_H
 #define __CONFIG_DEF_KEYBINDS_H
 
-#define JOYPAD_LOGICAL_ENTRY(note) {\
+#define JOYPAD_LOGICAL_ENTRY(index) {\
         NULL, NULL,\
         AXIS_NONE, AXIS_NONE, AXIS_NONE,\
         MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LOGICAL, RETROK_UNKNOWN,\
-        RARCH_EXTRA_CORE_COMMAND_START, NO_BTN, NO_BTN, 0,\
+        RARCH_EXTRA_CORE_COMMAND_START + (index), NO_BTN, NO_BTN, 0,\
         true\
     }
-#define JOYPAD_LOGICAL_ENTRY_TEN(note) \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY()
-#define JOYPAD_LOGICAL_ENTRY_HUNDRED(note) \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN()
+#define JOYPAD_LOGICAL_ENTRY_TEN(base) \
+    JOYPAD_LOGICAL_ENTRY(base), \
+    JOYPAD_LOGICAL_ENTRY(base + 1), \
+    JOYPAD_LOGICAL_ENTRY(base + 2), \
+    JOYPAD_LOGICAL_ENTRY(base + 3), \
+    JOYPAD_LOGICAL_ENTRY(base + 4), \
+    JOYPAD_LOGICAL_ENTRY(base + 5), \
+    JOYPAD_LOGICAL_ENTRY(base + 6), \
+    JOYPAD_LOGICAL_ENTRY(base + 7), \
+    JOYPAD_LOGICAL_ENTRY(base + 8), \
+    JOYPAD_LOGICAL_ENTRY(base + 9)
+#define JOYPAD_LOGICAL_ENTRY_HUNDRED(base) \
+    JOYPAD_LOGICAL_ENTRY_TEN(base), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 10), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 20), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 30), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 40), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 50), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 60), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 70), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 80), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 90)
 
 #ifndef IS_SALAMANDER
 
@@ -1959,9 +1959,9 @@ static const struct retro_keybind retro_keybinds_1[] = {
    },
 
    /* 128 Logical extra joypad buttons. */
-   JOYPAD_LOGICAL_ENTRY_HUNDRED(0 - 99),
-   JOYPAD_LOGICAL_ENTRY_TEN(100 - 109),
-   JOYPAD_LOGICAL_ENTRY_TEN(110 - 119),
+   JOYPAD_LOGICAL_ENTRY_HUNDRED(0),
+   JOYPAD_LOGICAL_ENTRY_TEN(100),
+   JOYPAD_LOGICAL_ENTRY_TEN(110),
    JOYPAD_LOGICAL_ENTRY(120),
    JOYPAD_LOGICAL_ENTRY(121),
    JOYPAD_LOGICAL_ENTRY(122),
@@ -2248,9 +2248,9 @@ static const struct retro_keybind retro_keybinds_rest[] = {
    },
 
    /* 128 Logical extra joypad buttons. */
-   JOYPAD_LOGICAL_ENTRY_HUNDRED(0 - 99),
-   JOYPAD_LOGICAL_ENTRY_TEN(100 - 109),
-   JOYPAD_LOGICAL_ENTRY_TEN(110 - 119),
+   JOYPAD_LOGICAL_ENTRY_HUNDRED(0),
+   JOYPAD_LOGICAL_ENTRY_TEN(100),
+   JOYPAD_LOGICAL_ENTRY_TEN(110),
    JOYPAD_LOGICAL_ENTRY(120),
    JOYPAD_LOGICAL_ENTRY(121),
    JOYPAD_LOGICAL_ENTRY(122),