Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use official names for GameCube controller sticks #3033

Merged
merged 1 commit into from
Sep 13, 2015
Merged

Use official names for GameCube controller sticks #3033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Data/Sys/GameSettings/GAFE01.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,23 +167,23 @@ $NES Balloon Fight - P2 Infinite Lives (donny2112)
$NES Clu Clu Land - P1 Infinite Lives (donny2112)
01527EEE 08000000
01659020 00000009
$NES Clu Clu Land - Max out Clock (C-stick Right) (donny2112)
$NES Clu Clu Land - Max out Clock (C Stick Right) (donny2112)
01523F59 08000000
BD2F5408 00010000
03658FCE 00000999
00000000 40000000
$NES Clu Clu Land D - P1 Infinite Lives (donny2112)
01527EEE 08000000
01659020 00000009
$NES Clu Clu Land D - Max out Clock (C-stick Right) (donny2112)
$NES Clu Clu Land D - Max out Clock (C Stick Right) (donny2112)
01526C12 08000000
BD2F5408 00010000
03658FC6 00000999
00000000 40000000
$NES Donkey Kong - P1 Infinite Lives (donny2112)
01523F81 08000000
01658FF5 00000009
$NES Donkey Kong - Jump to get Hammer (Hold A+C-stick Right) (donny2112)
$NES Donkey Kong - Jump to get Hammer (Hold A + C Stick Right) (donny2112)
015246D9 08000000
BD2F5408 00810000
01659040 00000001
Expand Down Expand Up @@ -237,7 +237,7 @@ $NES Legend of Zelda - Have Magical Shield (donny2112)
$NES Legend of Zelda - Max Hearts/Invincibility (donny2112)
01521605 08000000
0165960F 000000FF
$NES Legend of Zelda - Freeze Enemies (C-stick Left) (donny2112)
$NES Legend of Zelda - Freeze Enemies (C Stick Left) (donny2112)
01527C62 08000000
BD2F5408 00020000
0165960C 00000001
Expand Down
4 changes: 2 additions & 2 deletions Data/Sys/GameSettings/GALE01r0.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,10 +319,10 @@ C225910C 00000025
C022C9E8 00000000

# Gameplay Codes
$Normal C-Stick Functionality in Singleplayer Modes [Zauron]
$Normal C Stick Functionality in Singleplayer Modes [Zauron]
0416AB64 60000000

$Normal C-Stick Functionality in Develop Mode [Magus, Achilles]
$Normal C Stick Functionality in Develop Mode [Magus, Achilles]
*Does not work with Nana
0406AD38 38000000
04030024 38000000
Expand Down
4 changes: 2 additions & 2 deletions Data/Sys/GameSettings/GALE01r1.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ $Spoof Controller Plugins (P4) [Achilles]
04375F24 38000001

# Gameplay Codes
$Normal C-Stick Functionality in Singleplayer Modes [Zauron, Standardtoaster]
$Normal C Stick Functionality in Singleplayer Modes [Zauron, Standardtoaster]
0416B18C 60000000

$Normal C-Stick Functionality in Develop Mode [Magus, Achilles]
$Normal C Stick Functionality in Develop Mode [Magus, Achilles]
*Does not work with Nana
0406AE48 38000000
040300A4 38000000
Expand Down
16 changes: 8 additions & 8 deletions Data/Sys/GameSettings/GALE01r2.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $Boot to Character Select [Dan Salvato]
$Debug Menu
0422D638 38000006

$C-Stick in Single Player [Zauron]
$C Stick in Single Player [Zauron]
0416B480 60000000

$Disable Peach's Castle Bullets [Zauron]
Expand Down Expand Up @@ -144,11 +144,11 @@ $True Special Message Delete [JMC47]
[Gecko]
# General Codes
$Netplay Community Settings
*Boot to CSS, unlock everything, 4 stock 8 min friendly fire on, trophy messages off,
*L+R+A+Start during stage load returns to CSS, name tags don't reset on close or exit,
*L-cancel % on results screen, normal c-stick functionality in 1P modes,
*Stage striking, A+B salty runback, unrestricted pause camera, c-stick pause camera translation,
*Normal c-stick functionality in develop mode, debug menu access and set to English,
*Boot to CSS, unlock everything, 4 stock 8 minute friendly fire on, trophy messages off,
*L+R+A+Start during stage load returns to CSS, name tags don't reset on close or exit,
*L-cancel % on results screen, normal C Stick functionality in 1P modes,
*Stage striking, A+B salty runback, unrestricted pause camera, C Stick pause camera translation,
*Normal C Stick functionality in develop mode, debug menu access and set to English,
*Universal debug menu control, leaving debug menu loads CSS, 20XXTE neutral spawns
0445BF28 FFFFFFFF
0445BF2C FFFFFFFF
Expand Down Expand Up @@ -543,10 +543,10 @@ C223C5A0 0000000F
60000000 00000000

# Gameplay Codes
$Normal C-Stick Functionality in Singleplayer Modes [Zauron]
$Normal C Stick Functionality in Singleplayer Modes [Zauron]
0416B480 60000000

$Normal C-Stick Functionality in Develop Mode [Magus, Achilles]
$Normal C Stick Functionality in Develop Mode [Magus, Achilles]
*Does not work with Nana
0406AE90 38000000
040300A4 38000000
Expand Down
2 changes: 1 addition & 1 deletion Data/Sys/GameSettings/GALP01.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ C225AEF4 00000025
C022CA40 00000000

# Gameplay Codes
$Normal C-Stick Functionality in Singleplayer Modes [Zauron]
$Normal C Stick Functionality in Singleplayer Modes [Zauron]
0416BE50 60000000

$Skip Result Screen & KO Star Count Equals Placement [Sham Rock]
Expand Down
16 changes: 8 additions & 8 deletions Data/Sys/GameSettings/GAUE08.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,28 +31,28 @@ $No 4th+ Places
$No Top Speed/No Shifting Needed
3A1EA826 00000020
04205CC0 00000000
$C-Stick Sends Car 1 Back To Start
$C Stick Sends Car 1 Back To Start
3A1EA826 00000080
00206704 00000000
$C-Stick Sends Car 2 Back To Start
$C Stick Sends Car 2 Back To Start
3A1EA826 00000080
00207264 00000000
$C-Stick Sends Car 3 Back To Start
$C Stick Sends Car 3 Back To Start
3A1EA826 00000080
00207DC4 00000000
$C-Stick Sends Car 4 Back To Start
$C Stick Sends Car 4 Back To Start
3A1EA826 00000080
00208924 00000000
$C-Stick Sends Car 5 Back To Start
$C Stick Sends Car 5 Back To Start
3A1EA826 00000080
00209484 00000000
$C-Stick Sends Car 6 Back To Start
$C Stick Sends Car 6 Back To Start
3A1EA826 00000080
00209FE4 00000000
$C-Stick Sends Car 7 Back To Start
$C Stick Sends Car 7 Back To Start
3A1EA826 00000080
0020AB44 00000000
$C-Stick Sends All Car Back To Start
$C Stick Sends All Cars Back To Start
7A1EA826 00000080
00000000 80206704
00000000 00070B60
20 changes: 10 additions & 10 deletions Source/Android/app/src/main/res/values-ja/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,20 +94,20 @@
<string name="button_x">Xボタン</string>
<string name="button_y">Yボタン</string>
<string name="button_z">Zボタン</string>
<string name="dpad_up">D-Pad: ↑</string>
<string name="dpad_down">D-Pad: ↓</string>
<string name="dpad_left">D-Pad: ←</string>
<string name="dpad_right">D-Pad: →</string>
<string name="dpad_up">十字キー: ↑</string>
<string name="dpad_down">十字キー: ↓</string>
<string name="dpad_left">十字キー: ←</string>
<string name="dpad_right">十字キー: →</string>
<string name="main_stick_up">コントロールスティック: ↑</string>
<string name="main_stick_down">コントロールスティック: ↓</string>
<string name="main_stick_left">コントロールスティック: ←</string>
<string name="main_stick_right">コントロールスティック: →</string>
<string name="c_stick_up">C-スティック: ↑</string>
<string name="c_stick_down">C-スティック: ↓</string>
<string name="c_stick_left">C-スティック: ←</string>
<string name="c_stick_right">C-スティック: →</string>
<string name="trigger_left">左のトリガー</string>
<string name="trigger_right">右のトリガー</string>
<string name="c_stick_up">Cスティック: ↑</string>
<string name="c_stick_down">Cスティック: ↓</string>
<string name="c_stick_left">Cスティック: ←</string>
<string name="c_stick_right">Cスティック: →</string>
<string name="trigger_left">Lトリガー</string>
<string name="trigger_right">Rトリガー</string>
<!-- Wiimote (+ extension) only buttons -->
<string name="button_one">ボタン1</string>
<string name="button_two">ボタン2</string>
Expand Down
8 changes: 4 additions & 4 deletions Source/Android/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@
<string name="dpad_down">D-Pad Down</string>
<string name="dpad_left">D-Pad Left</string>
<string name="dpad_right">D-Pad Right</string>
<string name="main_stick_up">Main Stick Up</string>
<string name="main_stick_down">Main Stick Down</string>
<string name="main_stick_left">Main Stick Left</string>
<string name="main_stick_right">Main Stick Right</string>
<string name="main_stick_up">Control Stick Up</string>
<string name="main_stick_down">Control Stick Down</string>
<string name="main_stick_left">Control Stick Left</string>
<string name="main_stick_right">Control Stick Right</string>
<string name="c_stick_up">C Stick Up</string>
<string name="c_stick_down">C Stick Down</string>
<string name="c_stick_left">C Stick Left</string>
Expand Down
12 changes: 6 additions & 6 deletions Source/Core/Core/HW/GCPadEmu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ GCPad::GCPad(const unsigned int index) : m_index(index)
m_buttons->controls.emplace_back(new ControlGroup::Input(named_buttons[i]));

// sticks
groups.emplace_back(m_main_stick = new AnalogStick(_trans("Main Stick"), DEFAULT_PAD_STICK_RADIUS));
groups.emplace_back(m_c_stick = new AnalogStick(_trans("C-Stick"), DEFAULT_PAD_STICK_RADIUS));
groups.emplace_back(m_main_stick = new AnalogStick("Main Stick", _trans("Control Stick"), DEFAULT_PAD_STICK_RADIUS));
groups.emplace_back(m_c_stick = new AnalogStick("C-Stick", _trans("C Stick"), DEFAULT_PAD_STICK_RADIUS));

// triggers
groups.emplace_back(m_triggers = new MixedTriggers(_trans("Triggers")));
Expand Down Expand Up @@ -151,15 +151,15 @@ void GCPad::LoadDefaults(const ControllerInterface& ciface)
set_control(m_dpad, 2, "F"); // Left
set_control(m_dpad, 3, "H"); // Right

// C-Stick
// C Stick
set_control(m_c_stick, 0, "I"); // Up
set_control(m_c_stick, 1, "K"); // Down
set_control(m_c_stick, 2, "J"); // Left
set_control(m_c_stick, 3, "L"); // Right
#ifdef _WIN32
set_control(m_c_stick, 4, "LCONTROL"); // Modifier

// Main Stick
// Control Stick
set_control(m_main_stick, 0, "UP"); // Up
set_control(m_main_stick, 1, "DOWN"); // Down
set_control(m_main_stick, 2, "LEFT"); // Left
Expand All @@ -169,7 +169,7 @@ void GCPad::LoadDefaults(const ControllerInterface& ciface)
#elif __APPLE__
set_control(m_c_stick, 4, "Left Control"); // Modifier

// Main Stick
// Control Stick
set_control(m_main_stick, 0, "Up Arrow"); // Up
set_control(m_main_stick, 1, "Down Arrow"); // Down
set_control(m_main_stick, 2, "Left Arrow"); // Left
Expand All @@ -180,7 +180,7 @@ void GCPad::LoadDefaults(const ControllerInterface& ciface)

set_control(m_c_stick, 4, "Control_L"); // Modifier

// Main Stick
// Control Stick
set_control(m_main_stick, 0, "Up"); // Up
set_control(m_main_stick, 1, "Down"); // Down
set_control(m_main_stick, 2, "Left"); // Left
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinWX/InputConfigDiag.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,7 +946,7 @@ ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow
{
ControlGroupBox* control_group_box = new ControlGroupBox(group.get(), parent, eventsink);
wxStaticBoxSizer *control_group =
new wxStaticBoxSizer(wxVERTICAL, parent, wxGetTranslation(StrToWxStr(group->name)));
new wxStaticBoxSizer(wxVERTICAL, parent, wxGetTranslation(StrToWxStr(group->ui_name)));
control_group->Add(control_group_box);

const size_t grp_size = group->controls.size() + group->settings.size();
Expand Down
6 changes: 5 additions & 1 deletion Source/Core/InputCommon/ControllerEmu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,11 @@ void ControllerEmu::SaveConfig(IniFile::Section *sec, const std::string& base)
}

ControllerEmu::AnalogStick::AnalogStick(const char* const _name, ControlState default_radius)
: ControlGroup(_name, GROUP_TYPE_STICK)
: AnalogStick(_name, _name, GROUP_TYPE_STICK)
{}

ControllerEmu::AnalogStick::AnalogStick(const char* const _name, const char* const _ui_name, ControlState default_radius)
: ControlGroup(_name, _ui_name, GROUP_TYPE_STICK)
{
for (auto& named_direction : named_directions)
controls.emplace_back(new Input(named_direction));
Expand Down
7 changes: 6 additions & 1 deletion Source/Core/InputCommon/ControllerEmu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,17 @@ class ControllerEmu
}
};

ControlGroup(const std::string& _name, const unsigned int _type = GROUP_TYPE_OTHER) : name(_name), type(_type) {}
ControlGroup(const std::string& _name, const unsigned int _type = GROUP_TYPE_OTHER)
: name(_name), ui_name(_name), type(_type) {}
ControlGroup(const std::string& _name, const std::string& _ui_name, const unsigned int _type = GROUP_TYPE_OTHER)
: name(_name), ui_name(_ui_name), type(_type) {}
virtual ~ControlGroup() {}

virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" );
virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" );

const std::string name;
const std::string ui_name;
const unsigned int type;

std::vector<std::unique_ptr<Control>> controls;
Expand All @@ -164,6 +168,7 @@ class ControllerEmu
public:
// The GameCube controller and Wiimote attachments have a different default radius
AnalogStick(const char* const _name, ControlState default_radius);
AnalogStick(const char* const _name, const char* const _ui_name, ControlState default_radius);

void GetState(ControlState* const x, ControlState* const y)
{
Expand Down