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

Mapper 46 - fix gamedb entry, put in high bits

This commit is contained in:
adelikat 2012-03-09 03:24:05 +00:00
parent 5655262df6
commit f9e43cf3d7
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper046.cs
View File

@ -8,7 +8,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
class Mapper046 : NES.NESBoardBase class Mapper046 : NES.NESBoardBase
{ {
//Rumblestation 15-in-1 (Unl).nes //Rumblestation 15-in-1 (Unl).nes
//TODO: WHy does the gamedb entry fail?
/* /*
Regs at $6000-7FFF means no PRG-RAM. Regs at $6000-7FFF means no PRG-RAM.
@ -43,8 +42,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
{ {
if (addr < 0x2000) if (addr < 0x2000)
{ {
//TODO: High bits return VROM[addr + (((chr_bank_8k_H << 3) + chr_bank_8k_L) * 0x2000)];
return VROM[addr + (chr_bank_8k_L * 0x2000)];
} }
else return base.ReadPPU(addr); else return base.ReadPPU(addr);
} }
@ -52,7 +50,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
public override byte ReadPRG(int addr) public override byte ReadPRG(int addr)
{ {
//TODO: High bits //TODO: High bits
return ROM[addr + (prg_bank_32k_L * 0x8000)]; return ROM[addr + ((prg_bank_32k_H << 1) + prg_bank_32k_L * 0x8000)];
} }
public override bool Configure(NES.EDetectionOrigin origin) public override bool Configure(NES.EDetectionOrigin origin)
@ -60,7 +58,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
//configure //configure
switch (Cart.board_type) switch (Cart.board_type)
{ {
case "MAPPER046": case "Mapper046":
break; break;
default: default:
return false; return false;

2
BizHawk.MultiClient/output/gamedb.txt
View File

@ -94,7 +94,7 @@ sha1:536D623BA02A622BDE8E2D7D514AE9785B5E0357 H Punch Out!! Kirby (Hack) (U) NES
sha1:334DCB823B480957057C2B4C72686BE26823C12A V Fighting Hero (Unl) NES board=Mapper193;PRG=128;CHR=256;WRAM=8 sha1:334DCB823B480957057C2B4C72686BE26823C12A V Fighting Hero (Unl) NES board=Mapper193;PRG=128;CHR=256;WRAM=8
sha1:D09EF8127C64CBE817B45DF33C4D43E7B441E381 Final Fantasy V (Unl) NES board=Mapper164;PRG=512;CHR=0;WRAM=8;PRAM=8 sha1:D09EF8127C64CBE817B45DF33C4D43E7B441E381 Final Fantasy V (Unl) NES board=Mapper164;PRG=512;CHR=0;WRAM=8;PRAM=8
sha1:92D9695FEB774F60965A8303CFE3E6AAEE7B7B62 Magic Dragon (Unl) NES board=Mapper107;PRG=128;CHR=64;WRAM=8;PAD_H=1 sha1:92D9695FEB774F60965A8303CFE3E6AAEE7B7B62 Magic Dragon (Unl) NES board=Mapper107;PRG=128;CHR=64;WRAM=8;PAD_H=1
sha1:E2F19D010DE7FED40C2591C3966BA5A137935249 15-in-1 (Unl) NES board=Mapper046;PRG=128;CHR=64;WRAM=0 sha1:6DF9AECF5787C0833B0F05A9A83D0E58A6153977 Rumblestation 15-in-1 (Unl) NES board=Mapper046;PRG=1024;CHR=1024;WRAM=0
#include gamedb_neshomebrew.txt #include gamedb_neshomebrew.txt
#include gamedb_user.txt #include gamedb_user.txt