ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change OSD Messages and PanicAlerts to Say "Wii Remote" Instead of "Wiimote"

This commit is contained in:
Pringo 2016-10-28 14:02:58 -07:00
parent 4bd5674b85
commit 15a41a5d83
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp
View File

@ -46,13 +46,13 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305_emu::CWII_IPC_HLE_Device_usb_oh1_57e_305_emu
BackUpBTInfoSection(&sysconf);
}
// Activate only first Wiimote by default
// Activate only first Wii Remote by default
_conf_pads BT_DINF;
SetUsbPointer(this);
if (!sysconf.GetArrayData("BT.DINF", (u8*)&BT_DINF, sizeof(_conf_pads)))
{
PanicAlertT("Trying to read from invalid SYSCONF\nWiimote bt ids are not available");
PanicAlertT("Trying to read from invalid SYSCONF\nWii Remote bt ids are not available");
}
else
{
@ -1906,7 +1906,7 @@ CWII_IPC_HLE_WiiMote* CWII_IPC_HLE_Device_usb_oh1_57e_305_emu::AccessWiiMote(u16
}
ERROR_LOG(WII_IPC_WIIMOTE, "Can't find Wiimote by connection handle %02x", _ConnectionHandle);
PanicAlertT("Can't find Wiimote by connection handle %02x", _ConnectionHandle);
PanicAlertT("Can't find Wii Remote by connection handle %02x", _ConnectionHandle);
return nullptr;
}
@ -1917,7 +1917,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305_emu::DisplayDisconnectMessage(const int
// mean
// and display things like "Wiimote %i disconnected due to inactivity!" etc.
Core::DisplayMessage(
StringFromFormat("Wiimote %i disconnected by emulated software", wiimoteNumber), 3000);
StringFromFormat("Wii Remote %i disconnected by emulated software", wiimoteNumber), 3000);
}
void CWII_IPC_HLE_Device_usb_oh1_57e_305_emu::LOG_LinkKey(const u8* _pLinkKey)

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.cpp
View File

@ -223,14 +223,14 @@ IPCCommandResult CWII_IPC_HLE_Device_usb_oh1_57e_305_real::IOCtlV(u32 command_ad
if (cmd_buffer.Parameter == USBV0_IOCTL_INTRMSG &&
m_sync_button_state == SyncButtonState::Pressed)
{
Core::DisplayMessage("Scanning for Wiimotes", 2000);
Core::DisplayMessage("Scanning for Wii Remotes", 2000);
FakeSyncButtonPressedEvent(*buffer);
return GetNoReply();
}
if (cmd_buffer.Parameter == USBV0_IOCTL_INTRMSG &&
m_sync_button_state == SyncButtonState::LongPressed)
{
Core::DisplayMessage("Reset saved Wiimote pairings", 2000);
Core::DisplayMessage("Reset saved Wii Remote pairings", 2000);
FakeSyncButtonHeldEvent(*buffer);
return GetNoReply();
}

2
Source/Core/DolphinWX/Main.cpp
View File

@ -487,7 +487,7 @@ void Host_SetWiiMoteConnectionState(int _State)
event.SetString(_("Connecting..."));
break;
case 2:
event.SetString(_("Wiimote Connected"));
event.SetString(_("Wii Remote Connected"));
break;
}
// Update field 1 or 2