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

Atari7800Hawk: More mappers and bug fixes 

-Adds support for F18 and rampage
-Adds support for games needing cart RAM
-Fixes various bugs
This commit is contained in:
alyosha-tas 2017-07-22 12:28:23 -04:00 committed by GitHub
parent f6b8d2b8e3
commit 1dc60e9274
4 changed files with 89 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs
View File

@ -27,6 +27,10 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
public byte p1_fire_2x;
public byte p2_fire_2x;
public byte con_state;
public bool left_toggle;
public bool right_toggle;
public bool left_was_pressed;
public bool right_was_pressed;
// there are 4 maria cycles in a CPU cycle (fast access, both NTSC and PAL)
// if the 6532 or TIA are accessed (PC goes to one of those addresses) the next access will be slower by 1/2 a CPU cycle
@ -171,12 +175,34 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
if (controller.IsPressed("Right Difficulty"))
{
result |= (1 << 7);
if (!right_was_pressed)
{
right_toggle = !right_toggle;
}
right_was_pressed = true;
result |= (byte)((right_toggle ? 1 : 0) << 7);
}
else
{
right_was_pressed = false;
result |= (byte)((right_toggle ? 1 : 0) << 7);
}
if (controller.IsPressed("Left Difficulty"))
{
result |= (1 << 6);
if (!left_was_pressed)
{
left_toggle = !left_toggle;
}
left_was_pressed = true;
result |= (byte)((left_toggle ? 1 : 0) << 6);
}
else
{
left_was_pressed = false;
result |= (byte)((left_toggle ? 1 : 0) << 6);
}
if (!controller.IsPressed("Pause"))
{
result |= (1 << 3);

8
BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IStatable.cs
View File

@ -79,8 +79,14 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
ser.Sync("slow_access", ref slow_access);
ser.Sync("small flag", ref small_flag);
ser.Sync("pal kara", ref PAL_Kara);
ser.Sync("Cart RAM", ref cart_RAM);
ser.Sync("pokey", ref pokey);
ser.Sync("left_toggle", ref left_toggle);
ser.Sync("right_toggle", ref right_toggle);
ser.Sync("left_was_pressed", ref left_was_pressed);
ser.Sync("right_was_pressed", ref right_was_pressed);
ser.EndSection();
ser.EndSection();
}
}
}

38
BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs
View File

@ -39,6 +39,8 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
public MapperBase mapper;
public bool small_flag = false;
public bool PAL_Kara = false;
public int cart_RAM = 0;
public bool pokey = false;
private readonly ITraceable _tracer;
@ -117,7 +119,35 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
s_mapper = dict["board"];
}
else
{
throw new Exception("No Board selected for this game");
}
// check if the game uses pokey or RAM
if (dict.ContainsKey("RAM"))
{
int.TryParse(dict["RAM"], out cart_RAM);
Console.WriteLine(cart_RAM);
}
if (dict.ContainsKey("Pokey"))
{
bool.TryParse(dict["Pokey"], out pokey);
}
// some games will not function with the high score bios
// if such a game is being played, tell the user and disable it
if (dict.ContainsKey("No_HS"))
{
bool no_hs;
bool.TryParse(dict["No_HS"], out no_hs);
if (no_hs)
{
Console.WriteLine("This game is incompatible with the High Score BIOS, disabling it");
highscoreBios = null;
}
}
}
else if (is_header)
{
@ -244,6 +274,14 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
{
mapper = new MapperSGE();
}
if (m == "3")
{
mapper = new MapperF18();
}
if (m == "4")
{
mapper = new MapperRampage();
}
mapper.Core = this;
}

31
BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Maria.cs
View File

@ -85,6 +85,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
public bool current_DLL_H8;
public bool overrun_dma;
public bool global_write_mode;
public int header_counter;
public int[] header_counter_max = new int [2];
@ -96,7 +97,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
public void RunFrame()
{
scanline = 0;
global_write_mode = false;
Core.Maria_regs[8] = 0x80; // indicates VBlank state
// we start off in VBlank for 20 scanlines
@ -324,7 +325,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
{
// we are in 5 Byte header mode (i.e. using the character map)
GFX_Objects[GFX_index, header_counter].write_mode = temp.Bit(7);
global_write_mode = temp.Bit(7);
GFX_Objects[GFX_index, header_counter].ind_mode = temp.Bit(5);
header_pointer++;
temp = (byte)(ReadMemory((ushort)(current_DLL_addr + header_pointer)));
@ -372,7 +373,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
DMA_phase_next = DMA_GRAPHICS;
GFX_Objects[GFX_index, header_counter].write_mode = false;
GFX_Objects[GFX_index, header_counter].write_mode = global_write_mode;
GFX_Objects[GFX_index, header_counter].ind_mode = false;
@ -461,7 +462,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
if (((current_DLL_H16 && addr_t.Bit(12)) || (current_DLL_H8 && addr_t.Bit(11))) && (addr_t >= 0x8000))
{
GFX_Objects[GFX_index, header_counter].obj[i] = 0;
GFX_Objects[GFX_index, header_counter].obj[i] = 0;
graphics_read_time -= 3;
}
else
@ -552,7 +553,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
if (disp_mode == 0)
{
local_width = GFX_Objects[local_GFX_index, i].width;
for (int j = 0; j < local_width; j++)
{
for (int k = 3; k >= 0; k--)
@ -593,7 +594,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
else if (disp_mode == 2) // note: 1 is not used
{
local_width = GFX_Objects[local_GFX_index, i].width;
for (int j = 0; j < local_width; j++)
{
for (int k = 7; k >= 0; k--)
@ -643,12 +644,12 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
else
{
local_width = GFX_Objects[local_GFX_index, i].width;
for (int j = 0; j < local_width; j++)
{
for (int k = 7; k >= 0; k--)
for (int k = 3; k >= 0; k--)
{
index = local_start * 2 + j * 8 + (7 - k);
index = local_start * 2 + j * 4 + (3 - k);
if (index > 511)
{
@ -661,18 +662,18 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
int temp_color = color;
// this is now the color index (0-3) we choose from the palette
if (k >= 6)
if (k >= 3)
{
color = ((color >> 7) & 0x1);
temp_color = (local_palette & 4) + ((temp_color >> 2) & 3);
}
else if (k >= 4)
else if (k >= 2)
{
color = ((color >> 6) & 0x1);
temp_color = (local_palette & 4) + ((temp_color >> 2) & 3);
}
else if (k >= 2)
else if (k >= 1)
{
color = ((color >> 5) & 0x1);
temp_color = (local_palette & 4) + (temp_color & 3);
@ -685,7 +686,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
if (color != 0) // transparent
{
color = (temp_color << 2) + color;
color = (temp_color << 2) + 2;
color = Core.Maria_regs[color];
@ -701,7 +702,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
if (disp_mode == 0)
{
local_width = GFX_Objects[local_GFX_index, i].width;
for (int j = 0; j < local_width; j++)
{
for (int k = 7; k >= 0; k--)
@ -752,7 +753,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
// here the palette is determined by palette bit 2 only
// hence only palette 0 or 4 is available
local_palette = GFX_Objects[local_GFX_index, i].palette & 0x4;
int temp_c0 = GFX_Objects[local_GFX_index, i].palette & 0x1;
int temp_c1 = GFX_Objects[local_GFX_index, i].palette & 0x2;