diff --git a/Assets/gamedb/gamedb_Odyssey2.txt b/Assets/gamedb/gamedb_Odyssey2.txt index f8a1adbf05..bdc60043f5 100644 --- a/Assets/gamedb/gamedb_Odyssey2.txt +++ b/Assets/gamedb/gamedb_Odyssey2.txt @@ -16,6 +16,8 @@ SHA1:85A44A99B254D92A7433EE46E4CAA91483D7FEA2 D Go Sub 2 O2 US SHA1:2B34EF0E1A8C0371F00A33D6950E0807F3CB886E D Happy Emu O2 US SHA1:03C846187581A44CE4F7B056C05186520C2DB1B4 D Happy Bird O2 US SHA1:42AD0C57BD16B7F24C242F60B5C0E9988D8DFBA8 D Kill The Attacking Aliens O2 US +SHA1:BFAB5BECBF17AF0A304A50C81B04999D9830D817 D Pong O2 EU + diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs b/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs index 98d4d2b0a0..6ed083d8a2 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs @@ -100,7 +100,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk else { is_pal = true; - pic_height = 288; + pic_height = 240; _frameHz = 50; ppu = new PAL_PPU(); } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/PPU.cs b/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/PPU.cs index 97360f0636..7eb4afb191 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/PPU.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/PPU.cs @@ -248,7 +248,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk { VDC_collision = value; - Console.WriteLine("VDC_collide: " + value + " " + Core.cpu.TotalExecutedCycles); + //Console.WriteLine("VDC_collide: " + value + " " + Core.cpu.TotalExecutedCycles); } else if (addr == 0xA3) { @@ -387,7 +387,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk if (is_pal) { LINE_MAX = 312; - LINE_VBL = 288; + LINE_VBL = 240; } else { @@ -984,7 +984,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk 0xFFC00000, // red 0xFF94309F, // violet 0xFF77670B, // yellow - 0xFF676767, // grey + 0xFFBCBCBC, // light grey 0xFF676767, // grey 0xFF3595FF, // light blue 0xFF56FF69, // light green