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

Fix some inconsistent spelling in a Ram Watch and Search context menus, and some slight formatting cleanup on hex editor

This commit is contained in:
adelikat 2014-03-01 15:21:17 +00:00
parent 0a0f144aa8
commit 827e2c44f8
3 changed files with 34 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
View File

@ -69,12 +69,10 @@ namespace BizHawk.Client.EmuHawk
{ {
return _addressHighlighted; return _addressHighlighted;
} }
else
{
return null; // Negative = no address highlighted return null; // Negative = no address highlighted
} }
} }
}
private Watch.WatchSize WatchSize private Watch.WatchSize WatchSize
{ {
@ -263,15 +261,14 @@ namespace BizHawk.Client.EmuHawk
{ {
return '.'; return '.';
} }
else if (val >= 0x80)
if (val >= 0x80)
{ {
return '.'; return '.';
} }
else
{
return (char)val; return (char)val;
} }
}
private static int? GetDomainInt(string name) private static int? GetDomainInt(string name)
{ {
@ -329,12 +326,10 @@ namespace BizHawk.Client.EmuHawk
var stream = file.GetStream(); var stream = file.GetStream();
return Util.ReadAllBytes(stream); return Util.ReadAllBytes(stream);
} }
else
{
return File.ReadAllBytes(path); return File.ReadAllBytes(path);
} }
} }
}
private static int GetNumDigits(int i) private static int GetNumDigits(int i)
{ {
@ -384,19 +379,19 @@ namespace BizHawk.Client.EmuHawk
{ {
return true; return true;
} }
else if (key >= 'a' && key <= 'f') // A-F
if (key >= 'a' && key <= 'f') // A-F
{ {
return true; return true;
} }
else if (key >= 'A' && key <= 'F') // A-F
if (key >= 'A' && key <= 'F') // A-F
{ {
return true; return true;
} }
else
{
return false; return false;
} }
}
private void HexEditor_Load(object sender, EventArgs e) private void HexEditor_Load(object sender, EventArgs e)
{ {
@ -638,8 +633,7 @@ namespace BizHawk.Client.EmuHawk
private Point GetPromptPoint() private Point GetPromptPoint()
{ {
return PointToScreen( return PointToScreen(
new Point(MemoryViewerBox.Location.X + 30, MemoryViewerBox.Location.Y + 30) new Point(MemoryViewerBox.Location.X + 30, MemoryViewerBox.Location.Y + 30));
);
} }
private void ClearNibbles() private void ClearNibbles()
@ -772,8 +766,7 @@ namespace BizHawk.Client.EmuHawk
{ {
// TODO: can't unfreeze address 0?? // TODO: can't unfreeze address 0??
Global.CheatList.RemoveRange( Global.CheatList.RemoveRange(
Global.CheatList.Where(x => x.Contains(address)).ToList() Global.CheatList.Where(x => x.Contains(address)).ToList());
);
} }
MemoryViewerBox.Refresh(); MemoryViewerBox.Refresh();
@ -820,11 +813,9 @@ namespace BizHawk.Client.EmuHawk
return "Binary (*" + extension + ")|*" + extension + "|All Files|*.*"; return "Binary (*" + extension + ")|*" + extension + "|All Files|*.*";
} }
else
{
return "Binary (*.bin)|*.bin|All Files|*.*"; return "Binary (*.bin)|*.bin|All Files|*.*";
} }
}
private string GetBinarySaveFileFromUser() private string GetBinarySaveFileFromUser()
{ {
@ -1044,22 +1035,19 @@ namespace BizHawk.Client.EmuHawk
case 1: case 1:
_domain.PokeByte( _domain.PokeByte(
address, address,
(byte)(_domain.PeekByte(address) + 1) (byte)(_domain.PeekByte(address) + 1));
);
break; break;
case 2: case 2:
_domain.PokeWord( _domain.PokeWord(
address, address,
(ushort)(_domain.PeekWord(address, _bigEndian) + 1), (ushort)(_domain.PeekWord(address, _bigEndian) + 1),
_bigEndian _bigEndian);
);
break; break;
case 4: case 4:
_domain.PokeDWord( _domain.PokeDWord(
address, address,
_domain.PeekDWord(address, _bigEndian) + 1, _domain.PeekDWord(address, _bigEndian) + 1,
_bigEndian _bigEndian);
);
break; break;
} }
} }
@ -1080,22 +1068,19 @@ namespace BizHawk.Client.EmuHawk
case 1: case 1:
_domain.PokeByte( _domain.PokeByte(
address, address,
(byte)(_domain.PeekByte(address) - 1) (byte)(_domain.PeekByte(address) - 1));
);
break; break;
case 2: case 2:
_domain.PokeWord( _domain.PokeWord(
address, address,
(ushort)(_domain.PeekWord(address, _bigEndian) - 1), (ushort)(_domain.PeekWord(address, _bigEndian) - 1),
_bigEndian _bigEndian);
);
break; break;
case 4: case 4:
_domain.PokeDWord( _domain.PokeDWord(
address, address,
_domain.PeekDWord(address, _bigEndian) - 1, _domain.PeekDWord(address, _bigEndian) - 1,
_bigEndian _bigEndian);
);
break; break;
} }
} }
@ -1107,11 +1092,9 @@ namespace BizHawk.Client.EmuHawk
{ {
return string.Format(_digitFormatString, MakeValue(address)).Trim(); return string.Format(_digitFormatString, MakeValue(address)).Trim();
} }
else
{
return string.Empty; return string.Empty;
} }
}
private string GetFindValues() private string GetFindValues()
{ {
@ -1120,11 +1103,9 @@ namespace BizHawk.Client.EmuHawk
var values = ValueString(HighlightedAddress.Value); var values = ValueString(HighlightedAddress.Value);
return _secondaryHighlightedAddresses.Aggregate(values, (current, x) => current + ValueString(x)); return _secondaryHighlightedAddresses.Aggregate(values, (current, x) => current + ValueString(x));
} }
else
{
return string.Empty; return string.Empty;
} }
}
private void HighlightSecondaries(string value, int found) private void HighlightSecondaries(string value, int found)
{ {
@ -1359,8 +1340,7 @@ namespace BizHawk.Client.EmuHawk
} }
_secondaryHighlightedAddresses.ForEach(addr => _secondaryHighlightedAddresses.ForEach(addr =>
GlobalWin.Tools.RamWatch.AddWatch(MakeWatch(addr)) GlobalWin.Tools.RamWatch.AddWatch(MakeWatch(addr)));
);
} }
private void FreezeAddressMenuItem_Click(object sender, EventArgs e) private void FreezeAddressMenuItem_Click(object sender, EventArgs e)
@ -1424,8 +1404,7 @@ namespace BizHawk.Client.EmuHawk
(Watch.WatchSize)_dataSize, (Watch.WatchSize)_dataSize,
Watch.DisplayType.Hex, Watch.DisplayType.Hex,
string.Empty, string.Empty,
_bigEndian _bigEndian));
));
poke.SetWatch(watches); poke.SetWatch(watches);
poke.ShowHawkDialog(); poke.ShowHawkDialog();

4
BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
View File

@ -1398,12 +1398,12 @@ namespace BizHawk.Client.EmuHawk
if (allCheats) if (allCheats)
{ {
FreezeContextMenuItem.Text = "&Unfreeze address"; FreezeContextMenuItem.Text = "&Unfreeze Address";
FreezeContextMenuItem.Image = Properties.Resources.Unfreeze; FreezeContextMenuItem.Image = Properties.Resources.Unfreeze;
} }
else else
{ {
FreezeContextMenuItem.Text = "&Freeze address"; FreezeContextMenuItem.Text = "&Freeze Address";
FreezeContextMenuItem.Image = Properties.Resources.Freeze; FreezeContextMenuItem.Image = Properties.Resources.Freeze;
} }
} }

4
BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
View File

@ -1024,12 +1024,12 @@ namespace BizHawk.Client.EmuHawk
if (allCheats) if (allCheats)
{ {
FreezeContextMenuItem.Text = "&Unfreeze address"; FreezeContextMenuItem.Text = "&Unfreeze Address";
FreezeContextMenuItem.Image = Properties.Resources.Unfreeze; FreezeContextMenuItem.Image = Properties.Resources.Unfreeze;
} }
else else
{ {
FreezeContextMenuItem.Text = "&Freeze address"; FreezeContextMenuItem.Text = "&Freeze Address";
FreezeContextMenuItem.Image = Properties.Resources.Freeze; FreezeContextMenuItem.Image = Properties.Resources.Freeze;
} }