diff --git a/BizHawk.Emulation/Consoles/Calculator/TI83.cs b/BizHawk.Emulation/Consoles/Calculator/TI83.cs index 4316a336a3..b27919e262 100644 --- a/BizHawk.Emulation/Consoles/Calculator/TI83.cs +++ b/BizHawk.Emulation/Consoles/Calculator/TI83.cs @@ -131,8 +131,6 @@ namespace BizHawk.Emulation.Consoles.Calculator else input += "."; if (Controller.IsPressed("SIN")) input += "S"; else input += "."; - if (Controller.IsPressed("APPS")) input += "@"; - else input += "."; input += "|.|"; //TODO: perhaps ON should go here? @@ -242,8 +240,6 @@ namespace BizHawk.Emulation.Consoles.Calculator Controller.ForceButton("COMMA"); if (mnemonic[50] != '.') Controller.ForceButton("SIN"); - if (mnemonic[51] != '.') - Controller.ForceButton("APPS"); } public byte ReadMemory(ushort addr) @@ -598,7 +594,7 @@ namespace BizHawk.Emulation.Consoles.Calculator "CLEAR", "EXP", "DASH", "PARACLOSE", "TAN", "VARS", "PARAOPEN", "COS", "PRGM", "STAT", "COMMA", "SIN", "MATRIX", "X", "STO", "LN", "LOG", "SQUARED", "NEG1", "MATH", "ALPHA", - "GRAPH", "TRACE", "ZOOM", "WINDOW", "Y", "2ND", "MODE", "DEL", "APPS" + "GRAPH", "TRACE", "ZOOM", "WINDOW", "Y", "2ND", "MODE", "DEL" } }; diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index e26b5ae495..de464f1078 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -412,7 +412,6 @@ public TI83ControllerTemplate() { } public bool Enabled; public string COMMA; - public string APPS; public TI83ControllerTemplate(bool defaults) { if (defaults) @@ -468,7 +467,6 @@ DEL = "Delete"; //47 COMMA = "Comma"; //48 SIN = "Period"; //49 - APPS = "Home"; //50 } else { @@ -523,7 +521,6 @@ MODE = ""; DEL = ""; COMMA = ""; - APPS = ""; } } } diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 65faa1379e..33f3907bd9 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -435,7 +435,6 @@ namespace BizHawk.MultiClient TI83Controls.BindMulti("DEL", Global.Config.TI83Controller[0].DEL); TI83Controls.BindMulti("DEL", Global.Config.TI83Controller[0].COMMA); TI83Controls.BindMulti("DEL", Global.Config.TI83Controller[0].SIN); - TI83Controls.BindMulti("DEL", Global.Config.TI83Controller[0].APPS); Global.TI83Controls = TI83Controls; } diff --git a/BizHawk.MultiClient/config/InputConfig.cs b/BizHawk.MultiClient/config/InputConfig.cs index 7c3fa9704b..6b509572bf 100644 --- a/BizHawk.MultiClient/config/InputConfig.cs +++ b/BizHawk.MultiClient/config/InputConfig.cs @@ -10,9 +10,9 @@ using System.Windows.Forms; namespace BizHawk.MultiClient { - //TODO: Multi column for TI83 - //TODO: keep track of size of dynamic inputwidget creation and resize the dialog + groupbox accordingly - //Navigate away from TI83 = crash + //TODO: + //Sizing event should change prevWidth & prevHeight + public partial class InputConfig : Form { @@ -26,7 +26,7 @@ namespace BizHawk.MultiClient public static string[] TI83ControlList = new string[] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".", "ON", "ENTER", "Up", "Down", "Left", "Right", "+", "-", "Multiply", "Divide", "CLEAR", "^", "-", "(", ")", "TAN", "VARS", "COS", "PRGM", "STAT", "Matrix", "X", "STO->", "LN", "LOG", "^2", "^-1", "MATH", "ALPHA", "GRAPH", "TRACE", "ZOOM", "WINDOW", - "Y", "2nd", "MODE", "Del", ",", "SIN", "APPS"}; //TODO: display shift / alpha names too, Also order these in the order + "Y", "2nd", "MODE", "Del", ",", "SIN"}; //TODO: display shift / alpha names too, Also order these like on the calculator private ArrayList Labels; private ArrayList TextBoxes; private string CurSelectConsole; @@ -264,7 +264,6 @@ namespace BizHawk.MultiClient ButtonMappings[47] = Global.Config.TI83Controller[jpad].DEL; ButtonMappings[48] = Global.Config.TI83Controller[jpad].COMMA; ButtonMappings[49] = Global.Config.TI83Controller[jpad].SIN; - ButtonMappings[50] = Global.Config.TI83Controller[jpad].APPS; IDX_CONTROLLERENABLED.Checked = Global.Config.TI83Controller[jpad].Enabled; Changed = true; Labels.Clear(); @@ -472,9 +471,6 @@ namespace BizHawk.MultiClient TempBox = TextBoxes[49] as InputWidget; Global.Config.TI83Controller[0].SIN = AppendButtonMapping(TempBox.Text, Global.Config.TI83Controller[0].SIN); TempBox.Dispose(); - TempBox = TextBoxes[50] as InputWidget; - Global.Config.TI83Controller[0].APPS = AppendButtonMapping(TempBox.Text, Global.Config.TI83Controller[0].APPS); - TempBox.Dispose(); for (int i = 0; i < TI83ControlList.Length; i++) { @@ -482,7 +478,7 @@ namespace BizHawk.MultiClient TempLabel.Dispose(); } IDX_CONTROLLERENABLED.Enabled = true; - + } private void DoGameBoy()