commit fa7726b57dc98b936b4bfaa873013f286f50148a
Author: Jonathan Dowland <jon+github@alcopop.org>
AuthorDate: Mon Aug 15 17:33:14 2016 +0100
Commit: Jonathan Dowland <jon+github@alcopop.org>
CommitDate: Mon Aug 15 17:33:14 2016 +0100
Adjust SFC30 controller defaults to be consistent
Ensure the button bindings for SFC30 controllers is consistent with
other controllers.
---
src/setup/joystick.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/setup/joystick.c b/src/setup/joystick.c
index cf3baa17..58bd3c95 100644
--- a/src/setup/joystick.c
+++ b/src/setup/joystick.c
@@ -344,14 +344,16 @@ static const joystick_config_t nes30_pro_controller[] =
// http://www.8bitdo.com/sfc30/ or http://www.8bitdo.com/snes30/
static const joystick_config_t sfc30_controller[] =
{
- {"joystick_strafe_axis", 0},
+ {"joystick_x_axis", 0},
{"joystick_y_axis", 1},
- {"joystick_x_axis", CREATE_BUTTON_AXIS(4,0)}, // Y-A
- {"joyb_use", 6}, // L
- {"joyb_fire", 7}, // R
- {"joyb_prevweapon", 3}, // X
- {"joyb_nextweapon", 1}, // B
+ {"joyb_fire", 4}, // Y
+ {"joyb_speed", 1}, // B
+ {"joyb_jump", 3}, // X
+ {"joyb_use", 0}, // A
+ {"joyb_strafeleft", 6}, // L
+ {"joyb_straferight", 7}, // R
{"joyb_menu_activate", 11}, // Start
+ {"joyb_toggle_automap", 10}, // Select
{NULL, 0},
};