Skip to content

Commit 6a0fe16

Browse files
AsnivorAsnivor
authored
Merge pull request #1 from TASVideos/master
update fork
2 parents 1bd535c + b6934ed commit 6a0fe16

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+7234
-14204
lines changed

‎Assets/NES/Palettes/FCEUX.pal renamed to ‎Assets/NES/Palettes/FCEUX (2.2.0).pal

192 Bytes
Binary file not shown.

‎Assets/gamedb/gamedb_sega_gg.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ B19256C6716147A9744F5BD528F14450 Magic Knight Rayearth 2 - Making of Magic Knig
231231
846D48D0F4024C8094117599D0E1EEF1 Magic Knight Rayearth (J) GG SRAM=8192 Japan
232232
E496FF2196C372F4D6111538950D25CA Magical Puzzle Popils (W) (En,Ja) GG Puzzle SRAM=8192 World
233233
3AF0C6DDF5F00A493E1F159FCEDC0933 Magical Taruruuto-kun (J) GG Japan
234-
B0C35BC53AB7C184D34E5624F69AAD24 The Majors Pro Baseball (U) GG Sports;Baseball SRAM=128;GGLink USA
234+
B0C35BC53AB7C184D34E5624F69AAD24 The Majors Pro Baseball (U) GG Sports;Baseball SRAM=128;GGLink;EEPROM USA
235235
A15C5219F766D516D1B8D9A09B9A2BB4 Mappy (J) GG Japan
236236
B83F36FD113A8F75F1A29652ACB641FC Marble Madness (UE) GG Arcade USA;Europe
237237
BA846684A66E90372C3C234955EE28BC Marko's Magic Football (E) (En,Fr,De,Es) GG Europe
@@ -461,9 +461,9 @@ A23E89266DDAD3C856E7401D04A49C6C Woody Pop (W) (Rev 1) GG World
461461
13F72ACFEA47587F9AA9F655BF98653C World Class Leader Board Golf (UE) GG Sports;Golf USA;Europe
462462
D95D381C6AFFB8345EE5457655E393D1 World Cup USA 94 (UE) (En,Fr,De,Es,It,Nl,Pt,Sv) GG Sports;Soccer USA;Europe
463463
D8939B64458FAF174CDC1241F777CB59 World Derby (J) GG GGLink Japan
464-
E7EABBFC7A1F1339C4720249AEA92A32 World Series Baseball '95 (U) GG Sports;Baseball SRAM=128;GGLink USA
465-
59359FC38865CFF00C90D6EB148DDC2F World Series Baseball (U) GG Sports;Baseball SRAM=128;GGLink USA
466-
05CAC33029F0CAAC27774504C1AA8597 World Series Baseball (U) (Rev 1) GG Sports;Baseball SRAM=128;GGLink USA
464+
E7EABBFC7A1F1339C4720249AEA92A32 World Series Baseball '95 (U) GG Sports;Baseball SRAM=128;GGLink;EEPROM USA
465+
59359FC38865CFF00C90D6EB148DDC2F World Series Baseball (U) GG Sports;Baseball SRAM=128;GGLink;EEPROM USA
466+
05CAC33029F0CAAC27774504C1AA8597 World Series Baseball (U) (Rev 1) GG Sports;Baseball SRAM=128;GGLink;EEPROM USA
467467
D810E851AD60ED5BA50B6246C2CE12F2 WWF Raw (UE) GG Sports;Wrestling USA;Europe
468468
571AC03B80E3075C699CD583BF8651FD X-Men - Gamemaster's Legacy (UE) GG Marvel USA;Europe
469469
CA15F2BA2507EBD836C42D9D10231EB1 X-Men - Mojo World (UE) GG Marvel USA;Europe

‎Assets/gamedb/gamedb_sega_sms.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ F2535DF9BDC3A84221303FA62D61AD6E Back to the Future Part II (E) SMS Europe
106106
3D24A52E98E6C85D7C059386451CE749 Back to the Future Part III (E) SMS PAL Europe
107107
8A94DED3D95AA46DAE8800B92E66D3EE Baku Baku (B) SMS Brazil
108108
7A5D3B9963E316CB7F73BBDC2A7311C6 Bank Panic (E) SMS Europe
109-
26DF4404950CB8DA47235833C0C101C6 Bart vs. the Space Mutants (E) SMS Europe
109+
26DF4404950CB8DA47235833C0C101C6 Bart vs. the Space Mutants (E) SMS PAL Europe
110110
CBA2EC2940619956359801618E7AAB17 Bart vs. the World (E) SMS Europe
111111
0069B1BD9C5B6B88ACE6324D7E61539F Basketball Nightmare (E) SMS Sports;Basketball Europe
112112
215876A62D3CA48D28E98CD8A2C70A15 Batman Returns (E) SMS Europe

‎BizHawk.Client.Common/RomLoader.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ public bool LoadRom(string path, CoreComm nextComm, bool forceAccurateCore = fal
470470
System = "PSX"
471471
};
472472
}
473-
else if (ext == ".iso" || ext == ".cue" || ext == ".ccd")
473+
else if (ext == ".iso" || ext == ".cue" || ext == ".ccd" || ext == ".mds")
474474
{
475475
if (file.IsArchive)
476476
{
@@ -494,7 +494,7 @@ public bool LoadRom(string path, CoreComm nextComm, bool forceAccurateCore = fal
494494
throw new InvalidOperationException("\r\n" + discMountJob.OUT_Log);
495495
}
496496

497-
var disc = discMountJob.OUT_Disc;
497+
var disc = discMountJob.OUT_Disc;
498498

499499
// -----------
500500
// TODO - use more sophisticated IDer

‎BizHawk.Client.Common/tools/Cheat.cs

+46-14
Original file line numberDiff line numberDiff line change
@@ -284,29 +284,61 @@ public bool Contains(long addr)
284284
case WatchSize.Byte:
285285
return (byte?)_val;
286286
case WatchSize.Word:
287-
if (addr == _watch.Address)
287+
if (_watch.BigEndian)
288288
{
289+
if (addr == _watch.Address)
290+
{
291+
return (byte)(_val & 0xFF);
292+
}
289293
return (byte)(_val >> 8);
290294
}
291-
292-
return (byte)(_val & 0xFF);
293-
case WatchSize.DWord:
294-
if (addr == _watch.Address)
295+
else
295296
{
296-
return (byte)((_val >> 24) & 0xFF);
297+
if (addr == _watch.Address)
298+
{
299+
return (byte)(_val >> 8);
300+
}
301+
return (byte)(_val & 0xFF);
297302
}
298-
299-
if (addr == _watch.Address + 1)
303+
case WatchSize.DWord:
304+
if (_watch.BigEndian)
300305
{
301-
return (byte)((_val >> 16) & 0xFF);
306+
if (addr == _watch.Address)
307+
{
308+
return (byte)((_val >> 24) & 0xFF);
309+
}
310+
311+
if (addr == _watch.Address + 1)
312+
{
313+
return (byte)((_val >> 16) & 0xFF);
314+
}
315+
316+
if (addr == _watch.Address + 2)
317+
{
318+
return (byte)((_val >> 8) & 0xFF);
319+
}
320+
321+
return (byte)(_val & 0xFF);
302322
}
303-
304-
if (addr == _watch.Address + 2)
323+
else
305324
{
306-
return (byte)((_val >> 8) & 0xFF);
307-
}
325+
if (addr == _watch.Address)
326+
{
327+
return (byte)(_val & 0xFF);
328+
}
329+
330+
if (addr == _watch.Address + 1)
331+
{
332+
return (byte)((_val >> 8) & 0xFF);
333+
}
334+
335+
if (addr == _watch.Address + 2)
336+
{
337+
return (byte)((_val >> 16) & 0xFF);
338+
}
308339

309-
return (byte)(_val & 0xFF);
340+
return (byte)((_val >> 24) & 0xFF);
341+
}
310342
}
311343
}
312344

‎BizHawk.Client.DiscoHawk/MainDiscoForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ List<string> validateDrop(IDataObject ido)
111111
foreach (string str in files)
112112
{
113113
string ext = Path.GetExtension(str).ToUpper();
114-
if(!ext.In(new string[]{".CUE",".ISO",".CCD"}))
114+
if(!ext.In(new string[]{".CUE",".ISO",".CCD", ".MDS"}))
115115
{
116116
return new List<string>();
117117
}

‎BizHawk.Client.EmuHawk/FileLoader.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ private string[] KnownRomExtensions
5151
return new[]
5252
{
5353
".NES", ".FDS", ".UNF", ".SMS", ".GG", ".SG", ".GB", ".GBC", ".GBA", ".PCE", ".SGX", ".BIN", ".SMD", ".GEN", ".MD", ".SMC", ".SFC", ".A26", ".A78", ".LNX", ".COL", ".ROM", ".M3U", ".CUE", ".CCD", ".SGB", ".Z64", ".V64", ".N64", ".WS", ".WSC", ".XML", ".DSK", ".DO", ".PO", ".PSF", ".MINIPSF", ".NSF",
54-
".EXE", ".PRG", ".D64", "*G64", ".CRT", ".TAP", ".32X"
54+
".EXE", ".PRG", ".D64", "*G64", ".CRT", ".TAP", ".32X", ".MDS"
5555
};
5656
}
5757

58-
return new[] { ".NES", ".FDS", ".UNF", ".SMS", ".GG", ".SG", ".GB", ".GBC", ".GBA", ".PCE", ".SGX", ".BIN", ".SMD", ".GEN", ".MD", ".SMC", ".SFC", ".A26", ".A78", ".LNX", ".COL", ".ROM", ".M3U", ".CUE", ".CCD", ".SGB", ".Z64", ".V64", ".N64", ".WS", ".WSC", ".XML", ".DSK", ".DO", ".PO", ".PSF", ".MINIPSF", ".NSF", ".32X" };
58+
return new[] { ".NES", ".FDS", ".UNF", ".SMS", ".GG", ".SG", ".GB", ".GBC", ".GBA", ".PCE", ".SGX", ".BIN", ".SMD", ".GEN", ".MD", ".SMC", ".SFC", ".A26", ".A78", ".LNX", ".COL", ".ROM", ".M3U", ".CUE", ".CCD", ".SGB", ".Z64", ".V64", ".N64", ".WS", ".WSC", ".XML", ".DSK", ".DO", ".PO", ".PSF", ".MINIPSF", ".NSF", ".32X", ".MDS" };
5959
}
6060
}
6161

‎BizHawk.Client.EmuHawk/MainForm.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -2077,13 +2077,13 @@ public static string RomFilter
20772077
if (VersionInfo.DeveloperBuild)
20782078
{
20792079
return FormatFilter(
2080-
"Rom Files", "*.nes;*.fds;*.unf;*.sms;*.gg;*.sg;*.pce;*.sgx;*.bin;*.smd;*.rom;*.a26;*.a78;*.lnx;*.m3u;*.cue;*.ccd;*.exe;*.gb;*.gbc;*.gba;*.gen;*.md;*.32x;*.col;*.int;*.smc;*.sfc;*.prg;*.d64;*.g64;*.crt;*.tap;*.sgb;*.xml;*.z64;*.v64;*.n64;*.ws;*.wsc;*.dsk;*.do;*.po;*.vb;*.ngp;*.ngc;*.psf;*.minipsf;*.nsf;%ARCH%",
2080+
"Rom Files", "*.nes;*.fds;*.unf;*.sms;*.gg;*.sg;*.pce;*.sgx;*.bin;*.smd;*.rom;*.a26;*.a78;*.lnx;*.m3u;*.cue;*.ccd;*.mds;*.exe;*.gb;*.gbc;*.gba;*.gen;*.md;*.32x;*.col;*.int;*.smc;*.sfc;*.prg;*.d64;*.g64;*.crt;*.tap;*.sgb;*.xml;*.z64;*.v64;*.n64;*.ws;*.wsc;*.dsk;*.do;*.po;*.vb;*.ngp;*.ngc;*.psf;*.minipsf;*.nsf;%ARCH%",
20812081
"Music Files", "*.psf;*.minipsf;*.sid;*.nsf",
2082-
"Disc Images", "*.cue;*.ccd;*.m3u",
2082+
"Disc Images", "*.cue;*.ccd;*.mds;*.m3u",
20832083
"NES", "*.nes;*.fds;*.unf;*.nsf;%ARCH%",
20842084
"Super NES", "*.smc;*.sfc;*.xml;%ARCH%",
20852085
"Master System", "*.sms;*.gg;*.sg;%ARCH%",
2086-
"PC Engine", "*.pce;*.sgx;*.cue;*.ccd;%ARCH%",
2086+
"PC Engine", "*.pce;*.sgx;*.cue;*.ccd;*.mds;%ARCH%",
20872087
"TI-83", "*.rom;%ARCH%",
20882088
"Archive Files", "%ARCH%",
20892089
"Savestate", "*.state",
@@ -2095,7 +2095,7 @@ public static string RomFilter
20952095
"Gameboy Advance", "*.gba;%ARCH%",
20962096
"Colecovision", "*.col;%ARCH%",
20972097
"Intellivision", "*.int;*.bin;*.rom;%ARCH%",
2098-
"PlayStation", "*.cue;*.ccd;*.m3u",
2098+
"PlayStation", "*.cue;*.ccd;*.mds;*.m3u",
20992099
"PSX Executables (experimental)", "*.exe",
21002100
"PSF Playstation Sound File", "*.psf;*.minipsf",
21012101
"Commodore 64", "*.prg; *.d64, *.g64; *.crt; *.tap;%ARCH%",
@@ -2109,17 +2109,17 @@ public static string RomFilter
21092109
}
21102110

21112111
return FormatFilter(
2112-
"Rom Files", "*.nes;*.fds;*.unf;*.sms;*.gg;*.sg;*.gb;*.gbc;*.gba;*.pce;*.sgx;*.bin;*.smd;*.gen;*.md;*.32x;*.smc;*.sfc;*.a26;*.a78;*.lnx;*.col;*.int;*.rom;*.m3u;*.cue;*.ccd;*.sgb;*.z64;*.v64;*.n64;*.ws;*.wsc;*.xml;*.dsk;*.do;*.po;*.psf;*.ngp;*.ngc;*.prg;*.d64;*.g64;*.minipsf;*.nsf;%ARCH%",
2113-
"Disc Images", "*.cue;*.ccd;*.m3u",
2112+
"Rom Files", "*.nes;*.fds;*.unf;*.sms;*.gg;*.sg;*.gb;*.gbc;*.gba;*.pce;*.sgx;*.bin;*.smd;*.gen;*.md;*.32x;*.smc;*.sfc;*.a26;*.a78;*.lnx;*.col;*.int;*.rom;*.m3u;*.cue;*.ccd;*.mds;*.sgb;*.z64;*.v64;*.n64;*.ws;*.wsc;*.xml;*.dsk;*.do;*.po;*.psf;*.ngp;*.ngc;*.prg;*.d64;*.g64;*.minipsf;*.nsf;%ARCH%",
2113+
"Disc Images", "*.cue;*.ccd;*.mds;*.m3u",
21142114
"NES", "*.nes;*.fds;*.unf;*.nsf;%ARCH%",
21152115
"Super NES", "*.smc;*.sfc;*.xml;%ARCH%",
2116-
"PlayStation", "*.cue;*.ccd;*.m3u",
2116+
"PlayStation", "*.cue;*.ccd;*.mds;*.m3u",
21172117
"PSF Playstation Sound File", "*.psf;*.minipsf",
21182118
"Nintendo 64", "*.z64;*.v64;*.n64",
21192119
"Gameboy", "*.gb;*.gbc;*.sgb;%ARCH%",
21202120
"Gameboy Advance", "*.gba;%ARCH%",
21212121
"Master System", "*.sms;*.gg;*.sg;%ARCH%",
2122-
"PC Engine", "*.pce;*.sgx;*.cue;*.ccd;%ARCH%",
2122+
"PC Engine", "*.pce;*.sgx;*.cue;*.ccd;*.mds;%ARCH%",
21232123
"Atari 2600", "*.a26;%ARCH%",
21242124
"Atari 7800", "*.a78;%ARCH%",
21252125
"Atari Lynx", "*.lnx;%ARCH%",

‎BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs

+11-2
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,16 @@ private string GenerateMemoryViewString(bool forWindow)
526526
{
527527
if (_addr + j + DataSize <= _domain.Size)
528528
{
529-
rowStr.AppendFormat(_digitFormatString, MakeValue(_addr + j));
529+
int t_val = 0;
530+
int t_next = 0;
531+
532+
for (int k = 0; k < DataSize; k++)
533+
{
534+
t_next = MakeValue(1, _addr + j + k);
535+
t_val += (t_next << ((DataSize - k - 1) * 8));
536+
}
537+
538+
rowStr.AppendFormat(_digitFormatString, t_val);
530539
}
531540
else
532541
{
@@ -569,7 +578,7 @@ private int MakeValue(int dataSize, long address)
569578
{
570579
if (Global.CheatList.IsActive(_domain, address))
571580
{
572-
return Global.CheatList.GetCheatValue(_domain, address, (WatchSize)DataSize ).Value;
581+
return Global.CheatList.GetCheatValue(_domain, address, (WatchSize)dataSize ).Value;
573582
}
574583

575584
switch (dataSize)

‎BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj

+10-6
Original file line numberDiff line numberDiff line change
@@ -1071,6 +1071,8 @@
10711071
<Compile Include="Consoles\Sega\Saturn\LibSaturnus.cs" />
10721072
<Compile Include="Consoles\Sega\Saturn\Saturnus.cs" />
10731073
<Compile Include="Consoles\Sega\Saturn\SaturnusControllerDeck.cs" />
1074+
<Compile Include="Consoles\Sega\SMS\EEPROM.93c46.cs" />
1075+
<Compile Include="Consoles\Sega\SMS\MemoryMap.EEPROM.cs" />
10741076
<Compile Include="Consoles\Sega\SMS\SMS.cs" />
10751077
<Compile Include="Consoles\Sega\SMS\SMS.ICodeDataLogger.cs">
10761078
<DependentUpon>SMS.cs</DependentUpon>
@@ -1186,12 +1188,14 @@
11861188
<Compile Include="CPUs\Z80-GB\Registers.cs" />
11871189
<Compile Include="CPUs\Z80-GB\Tables.cs" />
11881190
<Compile Include="CPUs\Z80-GB\Z80.cs" />
1189-
<Compile Include="CPUs\Z80\Disassembler.cs" />
1190-
<Compile Include="CPUs\Z80\Execute.cs" />
1191-
<Compile Include="CPUs\Z80\Interrupts.cs" />
1192-
<Compile Include="CPUs\Z80\Registers.cs" />
1193-
<Compile Include="CPUs\Z80\Tables.cs" />
1194-
<Compile Include="CPUs\Z80\Z80A.cs" />
1191+
<Compile Include="CPUs\Z80A\NewDisassembler.cs" />
1192+
<Compile Include="CPUs\Z80A\Execute.cs" />
1193+
<Compile Include="CPUs\Z80A\Interrupts.cs" />
1194+
<Compile Include="CPUs\Z80A\Registers.cs" />
1195+
<Compile Include="CPUs\Z80A\Operations.cs" />
1196+
<Compile Include="CPUs\Z80A\Tables_Direct.cs" />
1197+
<Compile Include="CPUs\Z80A\Tables_Indirect.cs" />
1198+
<Compile Include="CPUs\Z80A\Z80A.cs" />
11951199
<Compile Include="Properties\Resources.Designer.cs">
11961200
<AutoGen>True</AutoGen>
11971201
<DesignTime>True</DesignTime>

0 commit comments

Comments
 (0)