diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/UxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/UxROM.cs
index 876207f314..84f8f59e6a 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/UxROM.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/UxROM.cs
@@ -31,7 +31,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 				case "NES-UNROM": //mega man
 				case "HVC-UNROM": 
 				case "KONAMI-UNROM":
-					AssertPrg(128); AssertChr(0); AssertVram(8); AssertWram(0);
+					AssertPrg(128); AssertChr(0); AssertVram(8);
+					//AssertWram(0); //JJ - Tobidase Daisakusen Part 2 (J) includes WRAM
 					break;
 
 				case "NES-UOROM": //paperboy 2
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
index eba99d3b96..158758d042 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
@@ -16,8 +16,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 		static readonly bool USE_DATABASE = true;
 
         //Game issues:
-        //JJ - Tobidase Daisakusen Part 2 (J) - same as 3-D World Runner
-        //Castlevania II (U) - Black screen only
         //Zelda II (U) - Black screen only
         //Bard's Tale - The Tales of the Unkown (U) - Black screen only
         //Dragon Warrior (SAROM) - Black screen only
@@ -35,6 +33,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 
 		//Game issues for tester to check off
 		//3-D World Runner - UNROM - weird lines in gameplay (OK i think - should be similar to other emulators now)
+		//JJ - Tobidase Daisakusen Part 2 (J) - same as 3-D World Runner
+
 		public NES()
 		{
 			BootGodDB.Initialize();
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs
index 22852a6dea..5fcbbb68ae 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs
@@ -62,6 +62,7 @@ static string ClassifyTable = @"
 1	256	0	8	8	NES-SNROM; some of blargg's test (cpu tests) [TODO recheck as NROM-HOMEBREW]
 2	128	0	8	0	NES-UNROM; mega man
 2	256	0	8	0	NES-UOROM; paperboy 2
+2	128	0	8	8	HVC-UNROM; JJ - Tobidase Daisakusen Part 2 (J)
 3	32	32	8	0	NES-CNROM; adventure island
 4	128	128	8	0	NES-TSROM; double dragon 2 (should be TL1ROM but maybe this will work)
 4	32	8	8	0	TXROM-HOMEBREW; blargg's mmc3 tests