Colors for Monster Hunter procon.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp

@@ -165,6 +165,7 @@ const std::vector<ProconColors>& OFFICIAL_PROCON_COLORS0(){
     const static std::vector<ProconColors> database{
         {"Procon: Stock Black",                 0x323232, 0x323232, 0x323232, 0xFFFFFF},
         {"Procon: Super Smash Bros. Ultimate",  0xFFFFFF, 0xFFFFFF, 0x2D2D2D, 0xE6E6E6},
+        {"Procon: Monster Hunter Rise",         0x474646, 0x474646, 0x2D2D2D, 0xE7E6E6},
         {"Procon: Zelda Tears of the Kingdom",  0x464646, 0xFFFFFF, 0x2D2D2D, 0xE6E6E6},
 //        {"Procon: Xenoblade Chronicles 2",      0xFFFFFF, 0xFFFFFF, 0x323132, 0xFFFFFF},    //  The actual values. Switch automatically replaces grips with pink.
         {"Procon: Xenoblade Chronicles 2",      0xff3a66, 0xff3a66, 0x323132, 0xFFFFFF},    //  Grip color is a guess.
@@ -214,9 +215,9 @@ const StringSelectDatabase& CONTROLLER_DATABASE(){
 
 const EnumDropdownDatabase<ControllerType>& ControllerSettingsType_Database(){
     static const EnumDropdownDatabase<ControllerType> database({
-        {ControllerType::NintendoSwitch_WirelessProController,  "pro-controller",   "Pro Controller"},
-        {ControllerType::NintendoSwitch_LeftJoycon,             "left-joycon",      "Left Joycon"},
-        {ControllerType::NintendoSwitch_RightJoycon,            "right-joycon",     "Right Joycon"},
+        {ControllerType::NintendoSwitch_WirelessProController,  "pro-controller",   "NS1: Pro Controller"},
+        {ControllerType::NintendoSwitch_LeftJoycon,             "left-joycon",      "NS1: Left Joycon"},
+        {ControllerType::NintendoSwitch_RightJoycon,            "right-joycon",     "NS1: Right Joycon"},
     });
     return database;
 }
@@ -353,7 +354,10 @@ void ControllerSettingsRow::on_config_value_changed(void* object){
 
 ControllerSettingsTable::ControllerSettingsTable()
     : EditableTableOption_t<ControllerSettingsRow>(
-        "<b>Wireless Controller Settings:</b><br>Changes take effect after resetting the device.",
+        "<b>Wireless Controller Settings:</b><br>"
+        "Changes take effect after resetting the device. "
+        "The MAC address is only for informational purposes as reported by the device. "
+        "Changing it will not change the actual address.",
         LockMode::UNLOCK_WHILE_RUNNING,
         true
     )

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp

@@ -23,7 +23,7 @@ const Resolution DEFAULT_RESOLUTION(1920, 1080);
 
 TimingOptions::TimingOptions()
     : GroupOption(
-        "Timing Options",
+        "Controller Timing Options",
         LockMode::UNLOCK_WHILE_RUNNING,
         EnableMode::ALWAYS_ENABLED,
         true
@@ -43,9 +43,11 @@ TimingOptions::TimingOptions()
         0ms, 200ms, "10 ms"
     )
     , SYSBOTBASE(
-        "<b>sys-botbase Timing Variation:</b><br>"
-        "Assume that sys-botbase controllers have a timing variation of no greater than this. "
-        "This is used to adjust button delays to ensure they go through correctly.",
+        "<b>sys-botbase 2 Timing Variation:</b><br>"
+        "Assume that sys-botbase 2 controllers have a timing variation of no greater than this. "
+        "This is used to adjust button delays to ensure they go through correctly.<br>"
+        "sys-botbase 3 does not use this option since it is as stable as a wired microcontroller "
+        "and is therefore categorized accordingly.",
         LockMode::LOCK_WHILE_RUNNING,
         0ms, 200ms, "150 ms"
     )