[controller] Move healing/mana to L1/R1

This is more like the original PSX port, and maps better to devices with
only one set of triggers.

Packaging/OpenDingux/devilutionx-retrofw.man.txt

@@ -10,10 +10,10 @@ Controls:
 - B: Select spell, cancel while in main menu
 - X: pickup gold, potions & equipment from ground, open chests and doors that are nearby, use item when in inventory (useful to read books etc.)
 - Y: cast spell, go to previous screen when talking to people and in shops, delete character while in main menu
-- R1: inventory
-- L1: character
-- Select + R1: Drink health potion
-- Select + R2: Drink mana potion
+- R1: Drink health potion
+- L1: Drink mana potion
+- Select + R1: inventory
+- Select + R2: character
 - Select + D-pad: Move map/cursor
 - Select + A: Left click
 - Select + Y: Quest log

Packaging/OpenDingux/readme.gcw0.txt

@@ -14,10 +14,10 @@ Controls:
 - B: Select spell, cancel while in main menu
 - X: pickup gold, potions & equipment from ground, open chests and doors that are nearby, use item when in inventory (useful to read books etc.)
 - Y: cast spell, go to previous screen when talking to people and in shops, delete character while in main menu
-- R1: inventory
-- L1: character
-- R2: drink mana potion
-- L2: drink health potion
+- R1: drink mana potion
+- L1: drink health potion
+- R2: inventory
+- L2: character
 - Left analog click: map
 - Right analog click: left mouse click
 - Select: quest log

Packaging/switch/readme-switch.md

@@ -14,10 +14,10 @@
 - X : pickup gold, potions & equipment from ground, open chests and doors that are nearby, use item when in inventory (useful to read books etc.)
 - Y : cast spell, go to previous screen when talking to people and in shops, delete character while in main menu
 - B : Select spell, cancel while in main menu
-- R : inventory
-- L : character
-- ZR : drink mana potion
-- ZL : drink health potion
+- R : drink mana potion
+- L : drink health potion
+- ZR : inventory
+- ZL : character
 - Minus + Y : quest log
 - Right analog click : left mouse click
 - Left analog click : automap

README.md

@@ -244,10 +244,10 @@ Default controller mappings (A/B/X/Y as in Nintendo layout, so the rightmost but
 - B: Select spell, cancel while in main menu
 - X: pickup gold, potions & equipment from ground, open chests and doors that are nearby, use item when in inventory (useful to read books etc.)
 - Y: cast spell, go to previous screen when talking to people and in shops, delete character while in main menu
-- R1: inventory
-- L1: character sheet
-- R2: use mana potion from belt
-- L2: use health item from belt
+- R1: use mana potion from belt
+- L1: use health item from belt
+- R2: inventory
+- L2: character sheet
 - Left analog click: toggle automap
 - Right analog click: left mouse click
 - Select: quest log

SourceX/controls/game_controls.cpp

@@ -52,11 +52,11 @@ bool GetGameAction(const SDL_Event &event, GameAction *action)
 			return true;
 		case ControllerButton::AXIS_TRIGGERLEFT: // ZL (aka L2)
 			if (!ctrl_event.up)
-				*action = GameAction(GameActionType::USE_HEALTH_POTION);
+				*action = GameAction(GameActionType::TOGGLE_CHARACTER_INFO);
 			return true;
 		case ControllerButton::AXIS_TRIGGERRIGHT: // ZR (aka R2)
 			if (!ctrl_event.up)
-				*action = GameAction(GameActionType::USE_MANA_POTION);
+				*action = GameAction(GameActionType::TOGGLE_INVENTORY);
 			return true;
 		case ControllerButton::BUTTON_B: // Right button
 			if (!ctrl_event.up)
@@ -76,11 +76,11 @@ bool GetGameAction(const SDL_Event &event, GameAction *action)
 			return true;
 		case ControllerButton::BUTTON_LEFTSHOULDER:
 			if (!stextflag && !ctrl_event.up)
-				*action = GameAction(GameActionType::TOGGLE_CHARACTER_INFO);
+				*action = GameAction(GameActionType::USE_HEALTH_POTION);
 			return true;
 		case ControllerButton::BUTTON_RIGHTSHOULDER:
 			if (!stextflag && !ctrl_event.up)
-				*action = GameAction(GameActionType::TOGGLE_INVENTORY);
+				*action = GameAction(GameActionType::USE_MANA_POTION);
 			return true;
 		case ControllerButton::BUTTON_DPAD_UP:
 		case ControllerButton::BUTTON_DPAD_DOWN: