fixeight bootfix.. again

finalburnneo · Aug 9, 2021 · edc472e · edc472e
1 parent 49388e2
commit edc472e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 29 deletions.
diff --git a/src/burn/drv/toaplan/d_battleg.cpp b/src/burn/drv/toaplan/d_battleg.cpp
@@ -692,7 +692,8 @@ static UINT16 __fastcall battlegReadWord(UINT32 sekAddress)
 	switch (sekAddress) {
 
 		case 0x21C03C:
-			return (location_test) ? ToaScanlineRegisterLoctest() : ToaScanlineRegister();
+			return ToaScanlineRegister();
+			//return (location_test) ? ToaScanlineRegisterLoctest() : ToaScanlineRegister();
 
 		case 0x300004:
 			return ToaGP9001ReadRAM_Hi(0);

diff --git a/src/burn/drv/toaplan/toaplan.h b/src/burn/drv/toaplan/toaplan.h
@@ -168,7 +168,7 @@ inline static UINT16 ToaScanlineRegister()
 {
 	static INT32 nPreviousScanline;
 	UINT16 nFlags = 0xFE00;
-	INT32 nCurrentScanline = SekCurrentScanline();
+	INT32 nCurrentScanline = (SekCurrentScanline() + 1) % 262;
 
 #if 0
 	// None of the games actually use this
@@ -186,33 +186,7 @@ inline static UINT16 ToaScanlineRegister()
 
 	}
 
-	return nFlags | ((nCurrentScanline > 255) ? 0xff : nCurrentScanline);
-}
-
-inline static UINT16 ToaScanlineRegisterLoctest() // bgaregga location test
-{
-	static INT32 nPreviousScanline;
-	UINT16 nFlags = 0xFE00;
-	INT32 nCurrentScanline = (SekCurrentScanline() + 15) % 262;
-	if (nCurrentScanline > 0xff) nCurrentScanline = 0xff;
-
-#if 0
-	// None of the games actually use this
-	INT32 nCurrentBeamPosition = SekTotalCycles() % nToaCyclesScanline;
-	if (nCurrentBeamPosition < 64) {
-		nFlags &= ~0x4000;
-	}
-#endif
-
-	if (nCurrentScanline != nPreviousScanline) {
-		nPreviousScanline = nCurrentScanline;
-		nFlags &= ~0x8000;
-
-//		bprintf(PRINT_NORMAL, _T("  - line %3i, PC 0x%08X\n"), nCurrentScanline, SekGetPC(-1));
-
-	}
-
-	return nFlags | nCurrentScanline;
+	return nFlags | ((nCurrentScanline > 255) ? 0x1ff : nCurrentScanline);
 }
 
 // toa_extratext.cpp